зеркало из https://github.com/mozilla/gecko-dev.git
get rid of nsString2
This commit is contained in:
Родитель
6b325a5196
Коммит
8f3473e855
|
@ -1156,7 +1156,7 @@ nsresult nsMsgComposeSendListener::OnStopSending(const char *aMsgID, nsresult aS
|
|||
PRUnichar *fieldsFCC = nsnull;
|
||||
if (NS_SUCCEEDED(compFields->GetFcc(&fieldsFCC)))
|
||||
{
|
||||
nsString2 compString("nocopy://");
|
||||
nsString compString("nocopy://");
|
||||
if (fieldsFCC && *fieldsFCC)
|
||||
{
|
||||
if (compString == fieldsFCC)
|
||||
|
|
|
@ -284,7 +284,7 @@ GetIMessageFromURI(const PRUnichar *msgURI)
|
|||
{
|
||||
nsresult rv;
|
||||
nsIRDFResource *myRDFNode = nsnull;
|
||||
nsString2 convertString(msgURI);
|
||||
nsString convertString(msgURI);
|
||||
char *tmpURI = nsnull;
|
||||
nsIMessage *returnMessage;
|
||||
|
||||
|
@ -457,6 +457,6 @@ HackUpAURIToPlayWith(void)
|
|||
NS_IF_RELEASE(enumerator);
|
||||
char *tURI;
|
||||
myRDFNode->GetValue(&tURI);
|
||||
nsString2 workURI(tURI);
|
||||
nsString workURI(tURI);
|
||||
return workURI.ToNewUnicode();
|
||||
}
|
||||
|
|
|
@ -1311,7 +1311,7 @@ PRUint32 i;
|
|||
m_attachments[i].m_content_id = mime_gen_content_id(locCount+1, nsnull);
|
||||
else
|
||||
{
|
||||
nsString2 tEmail(myEmail);
|
||||
nsString tEmail(myEmail);
|
||||
m_attachments[i].m_content_id = mime_gen_content_id(locCount+1, tEmail.GetBuffer());
|
||||
}
|
||||
|
||||
|
@ -1345,7 +1345,7 @@ PRUint32 i;
|
|||
//
|
||||
if (m_attachments[i].m_content_id)
|
||||
{
|
||||
nsString2 newSpec("cid:");
|
||||
nsString newSpec("cid:");
|
||||
|
||||
newSpec.Append(m_attachments[i].m_content_id);
|
||||
if (anchor)
|
||||
|
|
|
@ -811,7 +811,7 @@ NS_IMETHODIMP nsMsgLocalMailFolder::GetPrettyName(PRUnichar ** prettyName)
|
|||
if (mDepth == 1) {
|
||||
// Depth == 1 means we are on the mail server level
|
||||
// override the name here to say "Local Mail"
|
||||
nsString2 localMailStr("Local Mail");
|
||||
nsString localMailStr("Local Mail");
|
||||
*prettyName = localMailStr.ToNewUnicode();
|
||||
if(!(*prettyName))
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
@ -1108,7 +1108,7 @@ nsMsgLocalMailFolder::FindSubFolder(const char *subFolderName, nsIFolder **aFold
|
|||
if(NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
nsString2 uri(eOneByte);
|
||||
nsCString uri;
|
||||
uri.Append(mURI);
|
||||
uri.Append('/');
|
||||
|
||||
|
@ -1324,7 +1324,7 @@ nsMsgLocalMailFolder::CopyMessages(nsIMsgFolder* srcFolder, nsISupportsArray*
|
|||
if (NS_FAILED(rv)) return rv;
|
||||
char *uri = nsnull;
|
||||
rv = srcFolder->GetURI(&uri);
|
||||
nsString2 protocolType(uri, eOneByte);
|
||||
nsCString protocolType(uri);
|
||||
PR_FREEIF(uri);
|
||||
protocolType.SetLength(protocolType.FindChar(':'));
|
||||
|
||||
|
@ -1556,7 +1556,7 @@ NS_IMETHODIMP nsMsgLocalMailFolder::BeginCopy(nsIMessage *message)
|
|||
}
|
||||
if (mCopyState->m_dummyEnvelopeNeeded)
|
||||
{
|
||||
nsString2 result("", eOneByte);
|
||||
nsCString result;
|
||||
char timeBuffer[128];
|
||||
PRExplodedTime now;
|
||||
PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &now);
|
||||
|
|
|
@ -83,7 +83,7 @@ nsLocalMoveCopyMsgTxn::Init(nsIMsgFolder* srcFolder, nsIMsgFolder* dstFolder,
|
|||
char *uri = nsnull;
|
||||
if (!srcFolder) return rv;
|
||||
rv = srcFolder->GetURI(&uri);
|
||||
nsString2 protocolType(uri, eOneByte);
|
||||
nsCString protocolType(uri);
|
||||
PR_FREEIF(uri);
|
||||
protocolType.SetLength(protocolType.FindChar(':'));
|
||||
if (protocolType.EqualsIgnoreCase("imap"))
|
||||
|
@ -176,7 +176,7 @@ nsLocalMoveCopyMsgTxn::UndoImapDeleteFlag(nsIMsgFolder* folder,
|
|||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
nsCOMPtr<nsIUrlListener> urlListener;
|
||||
nsString2 msgIds("", eOneByte);
|
||||
nsCString msgIds;
|
||||
PRUint32 i, count = keyArray.GetSize();
|
||||
|
||||
urlListener = do_QueryInterface(folder, &rv);
|
||||
|
|
Загрузка…
Ссылка в новой задаче