From e6562edf8ab0e84387258742d4070d35e6844103 Mon Sep 17 00:00:00 2001
From: "mscott%netscape.com"
 <mscott%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 24 Aug 1999 00:59:56 +0000
Subject: [PATCH] nsString updates --> nsString(eOneByte) --> nsCString

git-svn-id: svn://10.0.0.236/trunk@44211 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp          | 13 +++++++------
 .../mailnews/mime/emitters/src/nsMimeXULEmitter.cpp |  2 +-
 mozilla/mailnews/mime/src/nsStreamConverter.cpp     |  5 ++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp b/mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp
index cb13e968473..358de4c9e14 100644
--- a/mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp
+++ b/mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp
@@ -240,9 +240,10 @@ NS_IMETHODIMP nsMsgHdr::GetNumReferences(PRUint16 *result)
 NS_IMETHODIMP nsMsgHdr::GetStringReference(PRInt32 refNum, nsCString &resultReference)
 {
 	nsresult err = NS_OK;
-	nsAutoString	allReferences (eOneByte);
+	nsAutoString	allReferences;
 	m_mdb->RowCellColumnTonsString(GetMDBRow(), m_mdb->m_referencesColumnToken, allReferences);
-	const char *startNextRef = allReferences.GetBuffer();
+	nsCAutoString cStr(allReferences);
+	const char *startNextRef = cStr.GetBuffer();
 	PRInt32 refIndex;
 	for (refIndex = 0; refIndex <= refNum && startNextRef; refIndex++)
 	{
@@ -307,7 +308,7 @@ NS_IMETHODIMP nsMsgHdr::SetRecipientsArray(const char *names, const char *addres
 	nsresult ret;
 	const char *curName = names;
 	const char *curAddress = addresses;
-	nsAutoString	allRecipients (eOneByte);
+	nsCAutoString	allRecipients;
 
 	for (PRUint32 i = 0; i < numAddresses; i++)
 	{
@@ -329,7 +330,7 @@ NS_IMETHODIMP nsMsgHdr::SetRecipientsArray(const char *names, const char *addres
 		curName += strlen(curName) + 1;
 		curAddress += strlen(curAddress) + 1;
 	}
-	ret = SetRecipients(allRecipients.GetBuffer(), PR_TRUE);
+	ret = SetRecipients(allRecipients, PR_TRUE);
 	return ret;
 }
 
@@ -344,7 +345,7 @@ NS_IMETHODIMP nsMsgHdr::SetCCListArray(const char *names, const char *addresses,
 	nsresult ret;
 	const char *curName = names;
 	const char *curAddress = addresses;
-	nsAutoString	allRecipients(eOneByte);
+	nsCAutoString	allRecipients;
 
 	for (PRUint32 i = 0; i < numAddresses; i++)
 	{
@@ -369,7 +370,7 @@ NS_IMETHODIMP nsMsgHdr::SetCCListArray(const char *names, const char *addresses,
 		curName += strlen(curName) + 1;
 		curAddress += strlen(curAddress) + 1;
 	}
-	ret = SetCCList(allRecipients.GetBuffer());
+	ret = SetCCList(allRecipients);
 	return ret;
 }
 
diff --git a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp
index 55735fe6f7f..44366aa5016 100644
--- a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp
+++ b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp
@@ -1298,7 +1298,7 @@ nsMimeXULEmitter::BuildListOfStatusProviders()
     return rv;
   
   // go ahead and enumerate through.
-  nsString2 actualProgID("", eOneByte);
+  nsCAutoString actualProgID;
   rv = components->First();
   while (NS_SUCCEEDED(rv) && !components->IsDone()) 
   {
diff --git a/mozilla/mailnews/mime/src/nsStreamConverter.cpp b/mozilla/mailnews/mime/src/nsStreamConverter.cpp
index 9606ed07ac6..47e764b96e9 100644
--- a/mozilla/mailnews/mime/src/nsStreamConverter.cpp
+++ b/mozilla/mailnews/mime/src/nsStreamConverter.cpp
@@ -420,14 +420,13 @@ NS_IMETHODIMP nsStreamConverter::Init(nsIURI *aURI, nsIStreamListener * aOutList
 	if ( (newType != nsMimeOutput::nsMimeMessageDraftOrTemplate) && 
              (newType != nsMimeOutput::nsMimeMessageEditorTemplate) )
 	{
-		nsAutoString progID (eOneByte);
-		progID = "component://netscape/messenger/mimeemitter;type=";
+		nsCAutoString progID = "component://netscape/messenger/mimeemitter;type=";
 		if (mOverrideFormat)
 		progID += mOverrideFormat;
 		else
 		progID += mOutputFormat;
 
-		rv = nsComponentManager::CreateInstance(progID.GetBuffer(), nsnull,
+		rv = nsComponentManager::CreateInstance(progID, nsnull,
 										                         nsIMimeEmitter::GetIID(),
 										                         (void **) getter_AddRefs(mEmitter));
 		if ((NS_FAILED(rv)) || (!mEmitter))