nsString updates --> nsString(eOneByte) --> nsCString

mailnews/local/src/nsLocalMailFolder.cpp

@@ -227,14 +227,14 @@ nsresult nsMsgLocalMailFolder::AddSubfolder(nsAutoString name, nsIMsgFolder **ch
   
 	if(NS_FAILED(rv)) return rv;
 
-	nsAutoString uri (eOneByte);
+	nsCAutoString uri;
 	uri.Append(mURI);
 	uri.Append('/');
 
 	uri.Append(name);
 
 	nsCOMPtr<nsIRDFResource> res;
-	rv = rdf->GetResource(uri.GetBuffer(), getter_AddRefs(res));
+	rv = rdf->GetResource(uri, getter_AddRefs(res));
 	if (NS_FAILED(rv))
 		return rv;
 
@@ -493,8 +493,8 @@ NS_IMETHODIMP nsMsgLocalMailFolder::BuildFolderURL(char **url)
 	rv = pathSpec->GetFileSpec(&path);
 	if (NS_FAILED(rv)) return rv;
 
-	nsAutoString tmpPath((nsFilePath)path, eOneByte);
-	*url = PR_smprintf("%s%s", urlScheme, tmpPath.GetBuffer());
+	nsCAutoString tmpPath((nsFilePath)path);
+	*url = PR_smprintf("%s%s", urlScheme, (const char *) tmpPath);
 	return NS_OK;
 
 }

mailnews/local/src/nsLocalMessage.cpp

@@ -67,10 +67,10 @@ nsresult nsLocalMessage::GetFolderFromURI(nsIMsgFolder **folder)
 	if(NS_SUCCEEDED( rv = QueryInterface(nsIRDFResource::GetIID(), getter_AddRefs(resource))))
 	{
 		resource->GetValue( getter_Copies(uri) );
-		nsString messageFolderURIStr;
+		nsCAutoString messageFolderURIStr;
 		nsMsgKey key;
 		nsParseLocalMessageURI(uri, messageFolderURIStr, &key);
-		nsString folderOnly, folderURIStr;
+		nsCAutoString folderOnly, folderURIStr;
 
 		if (messageFolderURIStr.Find(kMailboxMessageRootURI) != ((PRInt32)-1))
 		{
@@ -78,7 +78,7 @@ nsresult nsLocalMessage::GetFolderFromURI(nsIMsgFolder **folder)
 			folderURIStr = kMailboxRootURI;
 			folderURIStr+= folderOnly;
 			nsCOMPtr<nsIRDFResource> folderResource;
-			char *folderURI = folderURIStr.ToNewCString();
+			const char *folderURI = folderURIStr.GetBuffer();
 
 			NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); 
 			if (NS_SUCCEEDED(rv))   // always check this before proceeding 
@@ -89,9 +89,6 @@ nsresult nsLocalMessage::GetFolderFromURI(nsIMsgFolder **folder)
 					rv = NS_SUCCEEDED(folderResource->QueryInterface(nsIMsgFolder::GetIID(), (void**)folder));
 				}
 			}
-
-
-			delete[] folderURI;
 		}
 
 	}

mailnews/local/src/nsLocalUtils.cpp

@@ -211,20 +211,20 @@ nsLocalURI2Path(const char* rootURI, const char* uriStr,
  * message key number in key
  */
 nsresult nsParseLocalMessageURI(const char* uri,
-                                nsString& folderURI,
+                                nsCString& folderURI,
                                 PRUint32 *key)
 {
 	if(!key)
 		return NS_ERROR_NULL_POINTER;
 
-	nsAutoString uriStr = uri;
+	nsCAutoString uriStr = uri;
 	PRInt32 keySeparator = uriStr.FindChar('#');
 	if(keySeparator != -1)
 	{
 		nsAutoString folderPath;
 		uriStr.Left(folderURI, keySeparator);
 
-		nsAutoString keyStr;
+		nsCAutoString keyStr;
 		uriStr.Right(keyStr, uriStr.Length() - (keySeparator + 1));
 		PRInt32 errorCode;
 		*key = keyStr.ToInteger(&errorCode);

mailnews/local/src/nsLocalUtils.h

@@ -29,7 +29,7 @@ nsresult
 nsLocalURI2Path(const char* rootURI, const char* uriStr, nsFileSpec& pathResult);
 
 nsresult
-nsParseLocalMessageURI(const char* uri, nsString& folderURI, PRUint32 *key);
+nsParseLocalMessageURI(const char* uri, nsCString& folderURI, PRUint32 *key);
 
 nsresult nsBuildLocalMessageURI(const char* baseURI, PRUint32 key, char** uri);
 

mailnews/local/src/nsParseMailbox.cpp

@@ -139,8 +139,8 @@ NS_IMETHODIMP nsMsgMailboxParser::OnStopRequest(nsIChannel * /* aChannel */, nsI
 	if (m_mailDB)
 	{
 		nsMsgKeyArray	keys;
-		nsAutoString	author (eOneByte);
-		nsAutoString	subject (eOneByte);
+		nsCAutoString	author;
+		nsCAutoString	subject;
 
 //		m_mailDB->PrePopulate();
 		m_mailDB->ListAllKeys(keys);
@@ -1681,7 +1681,7 @@ NS_IMETHODIMP nsParseNewMailState::ApplyFilterHit(nsIMsgFilter *filter, PRBool *
 	{
 		nsIMsgDBHdr	*msgHdr = m_newMsgHdr;
 		PRUint32 msgFlags;
-		nsString trashNameVal(eOneByte);
+		nsCAutoString trashNameVal;
 
 		msgHdr->GetFlags(&msgFlags);
 
@@ -1699,8 +1699,7 @@ NS_IMETHODIMP nsParseNewMailState::ApplyFilterHit(nsIMsgFilter *filter, PRBool *
 				// so we use an nsString from above.
 				PRUnichar *folderName = nsnull;
 				rv = trash->GetName(&folderName);
-				// ### woa, is this right?. will the eOneByte nsString do the right unichar conversion?.
-				trashNameVal = folderName;
+				trashNameVal = nsCAutoString(folderName);
 				PR_FREEIF(folderName);
 				value = (void *) trashNameVal.GetBuffer();
 			}