From 77ff640a95af23092df4b3667b9ead488521ee72 Mon Sep 17 00:00:00 2001
From: "scc%netscape.com"
 <scc%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 23 Apr 2000 10:58:27 +0000
Subject: [PATCH] making string conversions explicit

git-svn-id: svn://10.0.0.236/trunk@66918 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/db/msgdb/src/nsDBFolderInfo.cpp |  2 +-
 mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp |  2 +-
 mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp  | 14 +++++++-------
 mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp       |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mozilla/mailnews/db/msgdb/src/nsDBFolderInfo.cpp b/mozilla/mailnews/db/msgdb/src/nsDBFolderInfo.cpp
index 4e54dd9988f..d349b74dfef 100644
--- a/mozilla/mailnews/db/msgdb/src/nsDBFolderInfo.cpp
+++ b/mozilla/mailnews/db/msgdb/src/nsDBFolderInfo.cpp
@@ -747,7 +747,7 @@ nsresult	nsDBFolderInfo::SetUint32PropertyWithToken(mdb_token aProperty, PRUint3
 nsresult	nsDBFolderInfo::SetInt32PropertyWithToken(mdb_token aProperty, PRInt32 propertyValue)
 {
 	nsString propertyStr;
-	propertyStr.Append(propertyValue, 16);
+	propertyStr.AppendInt(propertyValue, 16);
 	return SetPropertyWithToken(aProperty, &propertyStr);
 }
 
diff --git a/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp
index 7991766b5e1..95acae46d5d 100644
--- a/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp
+++ b/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp
@@ -380,7 +380,7 @@ void nsMailDatabase::UpdateFolderFlag(nsIMsgDBHdr *mailHdr, PRBool bSet,
 
 nsresult nsMailDatabase::GetFolderName(nsString &folderName)
 {
-	folderName = *m_folderSpec;
+	folderName.AssignWithConversion(NS_STATIC_CAST(const char*, *m_folderSpec));
 	return NS_OK;
 }
 
diff --git a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
index c6d56bff898..f9474f3c42d 100644
--- a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
+++ b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
@@ -81,7 +81,7 @@ nsresult nsMsgDatabase::GetHdrFromCache(nsMsgKey key, nsIMsgDBHdr* *result)
 	{
 		// it would be nice if we had an nsISupports hash table that hashed 32 bit int's
 		nsCAutoString strKey;
-		strKey.Append(key, 10);
+		strKey.AppendInt(key, 10);
 		nsStringKey hashKey(strKey.GetBuffer());
 		// nsSupportsHashtable does an addref
 		*result = (nsIMsgDBHdr *) m_cachedHeaders->Get(&hashKey);
@@ -104,7 +104,7 @@ nsresult nsMsgDatabase::AddHdrToCache(nsIMsgDBHdr *hdr, nsMsgKey key) // do we w
 				ClearHdrCache();
 			// it would be nice if we had an nsISupports hash table that hashed 32 bit int's
 			nsCAutoString strKey;
-			strKey.Append(key, 10);
+			strKey.AppendInt(key, 10);
 			nsStringKey hashKey(strKey.GetBuffer());
 			m_cachedHeaders->Put(&hashKey, hdr);
 			return NS_OK;
@@ -130,7 +130,7 @@ nsresult nsMsgDatabase::RemoveHdrFromCache(nsIMsgDBHdr *hdr, nsMsgKey key)
 			hdr->GetMessageKey(&key);
 
 		nsCAutoString strKey;
-		strKey.Append(key, 10);
+		strKey.AppendInt(key, 10);
 		nsStringKey hashKey(strKey.GetBuffer());
 		nsIMsgDBHdr *removedHdr = (nsIMsgDBHdr *) m_cachedHeaders->Remove(&hashKey); // does this release, or do I have to?
 	}
@@ -151,7 +151,7 @@ nsresult nsMsgDatabase::GetHdrFromUseCache(nsMsgKey key, nsIMsgDBHdr* *result)
 	{
 		// it would be nice if we had a hash table that hashed 32 bit int's
 		nsCAutoString strKey;
-		strKey.Append(key, 10);
+		strKey.AppendInt(key, 10);
 		nsStringKey hashKey(strKey.GetBuffer());
 		// nsHashtable doesn't do an addref
 		*result = (nsIMsgDBHdr *) m_headersInUse->Get(&hashKey);
@@ -173,7 +173,7 @@ nsresult nsMsgDatabase::AddHdrToUseCache(nsIMsgDBHdr *hdr, nsMsgKey key)
 		nsCOMPtr<nsISupports> supports(do_QueryInterface(hdr));
 		// it would be nice if we had an nsISupports hash table that hashed 32 bit int's
 		nsCAutoString strKey;
-		strKey.Append(key, 10);
+		strKey.AppendInt(key, 10);
 		nsStringKey hashKey(strKey.GetBuffer());
 		m_headersInUse->Put(&hashKey, hdr);
 		NS_ADDREF(hdr);
@@ -202,7 +202,7 @@ nsresult nsMsgDatabase::RemoveHdrFromUseCache(nsIMsgDBHdr *hdr, nsMsgKey key)
 			hdr->GetMessageKey(&key);
 
 		nsCAutoString strKey;
-		strKey.Append(key, 10);
+		strKey.AppendInt(key, 10);
 		nsStringKey hashKey(strKey.GetBuffer());
 		nsIMsgDBHdr *removedHdr = (nsIMsgDBHdr *) m_headersInUse->Remove(&hashKey); 
 	}
@@ -2569,7 +2569,7 @@ nsresult nsMsgDatabase::RowCellColumnToCharPtr(nsIMdbRow *row, mdb_token columnT
 
 /* static */void nsMsgDatabase::YarnTonsString(struct mdbYarn *yarn, nsString *str)
 {
-	str->Assign((const char *) yarn->mYarn_Buf, yarn->mYarn_Fill);
+	str->AssignWithConversion((const char *) yarn->mYarn_Buf, yarn->mYarn_Fill);
 }
 
 /* static */void nsMsgDatabase::YarnTonsCString(struct mdbYarn *yarn, nsCString *str)
diff --git a/mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp b/mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp
index d97863faeb9..3c1fcfb981b 100644
--- a/mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp
+++ b/mozilla/mailnews/db/msgdb/src/nsMsgHdr.cpp
@@ -638,7 +638,7 @@ NS_IMETHODIMP nsMsgHdr::GetAuthorCollationKey(PRUnichar* *resultAuthor)
 	}
 	if (NS_SUCCEEDED(ret))
 	{
-		nsAutoString autoString(name);
+		nsAutoString autoString; autoString.AssignWithConversion(name);
         PRUnichar *uniName = autoString.ToNewUnicode();
 		ret = m_mdb->CreateCollationKey(uniName, resultAuthor);
         Recycle(uniName);