From d2a79904483e915f3e1e2b81d68ad28df1519da1 Mon Sep 17 00:00:00 2001 From: "scc%netscape.com" Date: Tue, 18 Apr 2000 23:53:10 +0000 Subject: [PATCH] making string conversions explicit git-svn-id: svn://10.0.0.236/trunk@66364 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/finger/nsFingerChannel.cpp | 2 +- mozilla/js/src/xpconnect/src/nsScriptError.cpp | 8 ++++---- .../protocol/finger/src/nsFingerChannel.cpp | 2 +- mozilla/xpcom/base/nsConsoleMessage.h | 2 +- .../autocomplete/src/nsAutoComplete.cpp | 2 +- .../xpfe/components/console/nsConsoleMessage.h | 2 +- .../xpfe/components/console/nsScriptError.cpp | 8 ++++---- .../components/directory/nsDirectoryViewer.cpp | 12 ++++++------ .../regviewer/nsRegistryDataSource.cpp | 4 ++-- .../related/src/nsRelatedLinksHandler.cpp | 16 ++++++++-------- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/mozilla/extensions/finger/nsFingerChannel.cpp b/mozilla/extensions/finger/nsFingerChannel.cpp index 9cfb2e1037a..6d0e2743fde 100644 --- a/mozilla/extensions/finger/nsFingerChannel.cpp +++ b/mozilla/extensions/finger/nsFingerChannel.cpp @@ -489,7 +489,7 @@ nsFingerChannel::OnStopRequest(nsIChannel* aChannel, nsISupports* aContext, nsAutoString title; title.AssignWithConversion("Finger information for "); nsXPIDLCString userHost; rv = mUrl->GetPath(getter_Copies(userHost)); - title.Append(userHost); + title.AppendWithConversion(userHost); converter->SetTitle(title.GetUnicode()); converter->PreFormatHTML(PR_TRUE); } diff --git a/mozilla/js/src/xpconnect/src/nsScriptError.cpp b/mozilla/js/src/xpconnect/src/nsScriptError.cpp index bf4e658d53f..2ed9c0fafbf 100644 --- a/mozilla/js/src/xpconnect/src/nsScriptError.cpp +++ b/mozilla/js/src/xpconnect/src/nsScriptError.cpp @@ -91,13 +91,13 @@ nsScriptError::Init(const PRUnichar *message, PRUint32 flags, const char *category) { - mMessage.SetString(message); - mSourceName.SetString(sourceName); + mMessage.Assign(message); + mSourceName.Assign(sourceName); mLineNumber = lineNumber; - mSourceLine.SetString(sourceLine); + mSourceLine.Assign(sourceLine); mColumnNumber = columnNumber; mFlags = flags; - mCategory.SetString(category); + mCategory.Assign(category); return NS_OK; } diff --git a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp index 9cfb2e1037a..6d0e2743fde 100644 --- a/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp +++ b/mozilla/netwerk/protocol/finger/src/nsFingerChannel.cpp @@ -489,7 +489,7 @@ nsFingerChannel::OnStopRequest(nsIChannel* aChannel, nsISupports* aContext, nsAutoString title; title.AssignWithConversion("Finger information for "); nsXPIDLCString userHost; rv = mUrl->GetPath(getter_Copies(userHost)); - title.Append(userHost); + title.AppendWithConversion(userHost); converter->SetTitle(title.GetUnicode()); converter->PreFormatHTML(PR_TRUE); } diff --git a/mozilla/xpcom/base/nsConsoleMessage.h b/mozilla/xpcom/base/nsConsoleMessage.h index d89e15f5b2b..82a75ed8d8c 100644 --- a/mozilla/xpcom/base/nsConsoleMessage.h +++ b/mozilla/xpcom/base/nsConsoleMessage.h @@ -32,7 +32,7 @@ public: virtual ~nsConsoleMessage(); nsConsoleMessage(const PRUnichar *message) { - mMessage.SetString(message); + mMessage.Assign(message); } NS_DECL_ISUPPORTS diff --git a/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp b/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp index 3c4cf379291..5c3e435ec93 100644 --- a/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp +++ b/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp @@ -112,7 +112,7 @@ NS_IMETHODIMP nsAutoCompleteItem::GetClassName(char * *aClassName) } NS_IMETHODIMP nsAutoCompleteItem::SetClassName(const char * aClassName) { - mClassName = aClassName; + mClassName.AssignWithConversion(aClassName); return NS_OK; } diff --git a/mozilla/xpfe/components/console/nsConsoleMessage.h b/mozilla/xpfe/components/console/nsConsoleMessage.h index 4ce5ea40677..5a201ba03df 100644 --- a/mozilla/xpfe/components/console/nsConsoleMessage.h +++ b/mozilla/xpfe/components/console/nsConsoleMessage.h @@ -32,7 +32,7 @@ public: virtual ~nsConsoleMessage(); nsConsoleMessage(const PRUnichar *message) { - mMessage.SetString(message); + mMessage.Assign(message); } NS_DECL_ISUPPORTS diff --git a/mozilla/xpfe/components/console/nsScriptError.cpp b/mozilla/xpfe/components/console/nsScriptError.cpp index 616758091d3..708b270ae5b 100644 --- a/mozilla/xpfe/components/console/nsScriptError.cpp +++ b/mozilla/xpfe/components/console/nsScriptError.cpp @@ -90,13 +90,13 @@ nsScriptError::Init(const PRUnichar *message, PRUint32 flags, const char *category) { - mMessage.SetString(message); - mSourceName.SetString(sourceName); + mMessage.Assign(message); + mSourceName.Assign(sourceName); mLineNumber = lineNumber; - mSourceLine.SetString(sourceLine); + mSourceLine.Assign(sourceLine); mColumnNumber = columnNumber; mFlags = flags; - mCategory.SetString(category); + mCategory.Assign(category); return NS_OK; } diff --git a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp index eccfcfd669c..e56247971f7 100644 --- a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp @@ -262,7 +262,7 @@ nsHTTPIndexParser::Init() rv = gRDF->GetResource(HTTPINDEX_NAMESPACE_URI "loading", &kHTTPIndex_Loading); if (NS_FAILED(rv)) return rv; - rv = gRDF->GetLiteral(nsAutoString("true").GetUnicode(), &kTrueLiteral); + rv = gRDF->GetLiteral(NS_ConvertASCIItoUCS2("true").GetUnicode(), &kTrueLiteral); if (NS_FAILED(rv)) return rv; for (Field* field = gFieldTable; field->mName; ++field) { @@ -508,12 +508,12 @@ nsHTTPIndexParser::ProcessData(nsISupports *context) else if (buf[2] == '1' && buf[3] == ':') { // 101. Human-readable information line. - mComment += (buf + 4); + mComment.AppendWithConversion(buf + 4); } else if (buf[2] == '2' && buf[3] == ':') { // 102. Human-readable information line, HTML. - mComment += (buf + 4); + mComment.AppendWithConversion(buf + 4); } } } @@ -687,7 +687,7 @@ nsHTTPIndexParser::ParseData(const char* aDataStr, nsISupports *context) // Monkey with the nsStr, because we're bold. value.mLength = nsUnescapeCount(value.mStr); - values[i] = value; + values[i].AppendWithConversion(value); Field* field = NS_STATIC_CAST(Field*, mFormat.ElementAt(i)); if (field && field->mProperty == kHTTPIndex_Filename) { @@ -703,7 +703,7 @@ nsHTTPIndexParser::ParseData(const char* aDataStr, nsISupports *context) char* result = nsnull; rv = ioServ->Escape(filename, nsIIOService::url_FileBaseName + nsIIOService::url_Forced, &result); - rv = NS_MakeAbsoluteURI(entryuri, result, realbase); + rv = NS_MakeAbsoluteURI(entryuri, NS_ConvertASCIItoUCS2(result), realbase); CRTFREEIF(result); NS_ASSERTION(NS_SUCCEEDED(rv), "unable make absolute URI"); if (filetype.EqualsIgnoreCase("directory")) @@ -1129,7 +1129,7 @@ nsHTTPIndex::GetTargets(nsIRDFResource *aSource, nsIRDFResource *aProperty, PRBo if (NS_SUCCEEDED(rv = channel->AsyncRead(listener, aSource))) { nsCOMPtr trueLiteral; - gRDF->GetLiteral(nsAutoString("true").GetUnicode(), + gRDF->GetLiteral(NS_ConvertASCIItoUCS2("true").GetUnicode(), getter_AddRefs(trueLiteral)); rv = mInner->Assert(aSource, kNC_loading, trueLiteral, PR_TRUE); } diff --git a/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp b/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp index 8ddc8745be9..8dbb250a4f3 100644 --- a/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp +++ b/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp @@ -217,7 +217,7 @@ nsRegistryDataSource::Init() rv = gRDF->GetResource(NS_REGISTRY_NAMESPACE_URI "subkeys", &kSubkeys); if (NS_FAILED(rv)) return rv; - rv = gRDF->GetLiteral(nsAutoString("[binary data]").GetUnicode(), &kBinaryLiteral); + rv = gRDF->GetLiteral(NS_ConvertASCIItoUCS2("[binary data]").GetUnicode(), &kBinaryLiteral); if (NS_FAILED(rv)) return rv; } @@ -391,7 +391,7 @@ nsRegistryDataSource::GetTarget(nsIRDFResource *aSource, nsIRDFResource *aProper if (NS_FAILED(rv)) return rv; nsCOMPtr literal; - rv = gRDF->GetLiteral(nsAutoString(value).GetUnicode(), getter_AddRefs(literal)); + rv = gRDF->GetLiteral(NS_ConvertASCIItoUCS2(value).GetUnicode(), getter_AddRefs(literal)); if (NS_FAILED(rv)) return rv; return literal->QueryInterface(NS_GET_IID(nsIRDFNode), (void**) _retval); diff --git a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp index 9e20a7fe7e7..4112489bace 100644 --- a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp +++ b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp @@ -205,7 +205,7 @@ RelatedLinksStreamListener::Init() (nsISupports**)&charsetConv); if (NS_SUCCEEDED(rv) && (charsetConv)) { - nsString utf8("UTF-8"); + nsString utf8; utf8.AssignWithConversion("UTF-8"); rv = charsetConv->GetUnicodeDecoder(&utf8, getter_AddRefs(mUnicodeDecoder)); NS_RELEASE(charsetConv); @@ -239,7 +239,7 @@ NS_IMPL_ISUPPORTS(RelatedLinksStreamListener, NS_GET_IID(nsIStreamListener)); NS_IMETHODIMP RelatedLinksStreamListener::OnStartRequest(nsIChannel* channel, nsISupports *ctxt) { - nsAutoString trueStr("true"); + nsAutoString trueStr; trueStr.AssignWithConversion("true"); nsIRDFLiteral *literal = nsnull; nsresult rv; if (NS_SUCCEEDED(rv = gRDFService->GetLiteral(trueStr.GetUnicode(), &literal))) @@ -256,7 +256,7 @@ NS_IMETHODIMP RelatedLinksStreamListener::OnStopRequest(nsIChannel* channel, nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { - nsAutoString trueStr("true"); + nsAutoString trueStr; trueStr.AssignWithConversion("true"); nsIRDFLiteral *literal = nsnull; nsresult rv; if (NS_SUCCEEDED(rv = gRDFService->GetLiteral(trueStr.GetUnicode(), &literal))) @@ -342,7 +342,7 @@ RelatedLinksStreamListener::OnDataAvailable(nsIChannel* channel, nsISupports *ct } else { - mBuffer.Append(buffer, aLength); + mBuffer.AppendWithConversion(buffer, aLength); } delete [] buffer; buffer = nsnull; @@ -356,7 +356,7 @@ RelatedLinksStreamListener::OnDataAvailable(nsIChannel* channel, nsISupports *ct break; } - nsAutoString oneLiner(""); + nsAutoString oneLiner; if (eol >= 0) { mBuffer.Left(oneLiner, eol); @@ -689,14 +689,14 @@ RelatedLinksHandlerImpl::Init() if (NS_SUCCEEDED(rv = prefServ->CopyCharPref("browser.related.provider", &prefVal)) && (prefVal)) { - mRLServerURL = prefVal; + mRLServerURL.AssignWithConversion(prefVal); nsCRT::free(prefVal); prefVal = nsnull; } else { // no preference, so fallback to a well-known URL - mRLServerURL = "http://www-rl.netscape.com/wtgn?"; + mRLServerURL.AssignWithConversion("http://www-rl.netscape.com/wtgn?"); } } } @@ -798,7 +798,7 @@ RelatedLinksHandlerImpl::SetURL(const char* aURL) if (NS_FAILED(rv)) return rv; nsAutoString relatedLinksQueryURL(mRLServerURL); - relatedLinksQueryURL += mRelatedLinksURL; + relatedLinksQueryURL.AppendWithConversion(mRelatedLinksURL); nsCOMPtr url; rv = NS_NewURI(getter_AddRefs(url), relatedLinksQueryURL);