From e1f81c803c2ee9b5fd2c0db24c7fa66dd7201e3b Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Thu, 6 Sep 2007 22:07:01 +0000 Subject: [PATCH] Bug 113243 Get rid of (Compare|Equals)WithConversion r+sr=roc git-svn-id: svn://10.0.0.236/trunk@235296 18797224-902f-48f8-a5cc-f745e15eee43 --- .../suite/browser/src/nsInternetSearchService.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mozilla/suite/browser/src/nsInternetSearchService.cpp b/mozilla/suite/browser/src/nsInternetSearchService.cpp index affe929e101..f156129935e 100755 --- a/mozilla/suite/browser/src/nsInternetSearchService.cpp +++ b/mozilla/suite/browser/src/nsInternetSearchService.cpp @@ -3622,9 +3622,9 @@ InternetSearchDataSource::MapEncoding(const nsString &numericEncoding, if (!numericEncoding.IsEmpty()) { for (PRUint32 i = 0; encodingList[i].numericEncoding != nsnull; i++) { - if (numericEncoding.EqualsWithConversion(encodingList[i].numericEncoding)) + if (numericEncoding.EqualsASCII(encodingList[i].numericEncoding)) { - stringEncoding.AssignWithConversion(encodingList[i].stringEncoding); + stringEncoding.AssignASCII(encodingList[i].stringEncoding); return NS_OK; } } @@ -3935,9 +3935,9 @@ InternetSearchDataSource::DoSearch(nsIRDFResource *source, nsIRDFResource *engin // construct post data to send nsAutoString postStr; - postStr.AssignWithConversion(POSTHEADER_PREFIX); + postStr.AssignASCII(POSTHEADER_PREFIX); postStr.AppendInt(input.Length(), 10); - postStr.AppendWithConversion(POSTHEADER_SUFFIX); + postStr.AppendASCII(POSTHEADER_SUFFIX); postStr += input; nsCOMPtr postDataStream; @@ -4050,10 +4050,10 @@ InternetSearchDataSource::SaveEngineInfoIntoGraph(nsIFile *file, nsIFile *icon, if (NS_FAILED(rv)) return rv; nsAutoString searchURL; - searchURL.AssignWithConversion(kEngineProtocol); + searchURL.AssignASCII(kEngineProtocol); char *uriCescaped = nsEscape(filePath.get(), url_Path); if (!uriCescaped) return(NS_ERROR_NULL_POINTER); - searchURL.AppendWithConversion(uriCescaped); + searchURL.AppendASCII(uriCescaped); nsCRT::free(uriCescaped); if ((extensionOffset = searchURL.RFindChar(PRUnichar('.'))) > 0) @@ -4151,7 +4151,7 @@ InternetSearchDataSource::SaveEngineInfoIntoGraph(nsIFile *file, nsIFile *icon, if (catURI) { nsAutoString catList; - catList.AssignWithConversion(kURINC_SearchCategoryPrefix); + catList.AssignASCII(kURINC_SearchCategoryPrefix); catList.AppendWithConversion(catURI); gRDFService->GetUnicodeResource(catList, getter_AddRefs(catRes)); }