From d3f529a51aa912cb302f3337682aabbc91b2a2f7 Mon Sep 17 00:00:00 2001 From: "scc%mozilla.org" Date: Tue, 6 Mar 2001 20:50:43 +0000 Subject: [PATCH] branch checkins git-svn-id: svn://10.0.0.236/branches/STRING_081_BRANCH@88688 18797224-902f-48f8-a5cc-f745e15eee43 --- .../content/base/src/nsDocumentEncoder.cpp | 3 +- .../base/src/nsHTMLContentSerializer.cpp | 4 +- .../base/src/nsPlainTextSerializer.cpp | 2 +- mozilla/content/xbl/src/nsBindingManager.cpp | 6 +- .../content/xbl/src/nsXBLWindowHandler.cpp | 2 +- mozilla/docshell/base/nsWebShell.cpp | 4 +- mozilla/dom/src/base/nsGlobalWindow.cpp | 2 +- mozilla/editor/base/TextEditorTest.cpp | 4 +- mozilla/editor/base/nsEditor.cpp | 2 +- mozilla/editor/base/nsEditorShell.cpp | 30 ++++---- mozilla/editor/base/nsHTMLEditor.cpp | 2 +- mozilla/editor/composer/src/nsEditorShell.cpp | 30 ++++---- mozilla/editor/libeditor/base/nsEditor.cpp | 2 +- .../editor/libeditor/html/TextEditorTest.cpp | 4 +- .../editor/libeditor/html/nsHTMLEditor.cpp | 2 +- .../powerplant/source/CProfileManager.cpp | 10 +-- .../windowwatcher/src/nsWindowWatcher.cpp | 14 ++-- mozilla/extensions/wallet/src/wallet.cpp | 6 +- .../src/nsHTMLContentSinkStream.cpp | 10 +-- mozilla/htmlparser/src/nsHTMLTokenizer.cpp | 2 +- mozilla/htmlparser/src/nsLoggingSink.cpp | 6 +- .../layout/html/document/src/nsFrameFrame.cpp | 6 +- .../html/forms/src/nsGfxTextControlFrame2.cpp | 2 +- mozilla/layout/xul/base/src/nsBoxObject.cpp | 12 +-- .../base/util/nsMsgIncomingServer.cpp | 4 +- mozilla/modules/libpref/src/nsPref.cpp | 2 +- .../plugin/base/src/nsPluginHostImpl.cpp | 6 +- .../plugin/nglsrc/nsPluginHostImpl.cpp | 6 +- mozilla/netwerk/base/src/nsIOService.cpp | 8 +- .../src/nsHTMLContentSinkStream.cpp | 10 +-- .../parser/htmlparser/src/nsHTMLTokenizer.cpp | 2 +- .../parser/htmlparser/src/nsLoggingSink.cpp | 6 +- mozilla/profile/src/nsProfile.cpp | 2 +- mozilla/profile/src/nsProfileAccess.cpp | 76 +++++++++---------- mozilla/widget/src/mac/nsFilePicker.cpp | 2 +- mozilla/widget/src/mac/nsMimeMapper.cpp | 2 +- 36 files changed, 148 insertions(+), 145 deletions(-) diff --git a/mozilla/content/base/src/nsDocumentEncoder.cpp b/mozilla/content/base/src/nsDocumentEncoder.cpp index 626e284b105..40114f2487a 100644 --- a/mozilla/content/base/src/nsDocumentEncoder.cpp +++ b/mozilla/content/base/src/nsDocumentEncoder.cpp @@ -413,7 +413,8 @@ ConvertAndWrite(nsAReadableString& aString, NS_ENSURE_ARG_POINTER(aEncoder); nsresult rv; PRInt32 charLength, startCharLength; - const PRUnichar* unicodeBuf = (const PRUnichar*)nsPromiseFlatString(aString); + nsPromiseFlatString flat(aString); + const PRUnichar* unicodeBuf = flat.get(); PRInt32 unicodeLength = aString.Length(); PRInt32 startLength = unicodeLength; diff --git a/mozilla/content/base/src/nsHTMLContentSerializer.cpp b/mozilla/content/base/src/nsHTMLContentSerializer.cpp index 38da9acd81a..3846679a538 100644 --- a/mozilla/content/base/src/nsHTMLContentSerializer.cpp +++ b/mozilla/content/base/src/nsHTMLContentSerializer.cpp @@ -719,7 +719,7 @@ nsHTMLContentSerializer::StartIndentation(nsIAtom* aName, { if ((mDoFormat || aHasDirtyAttr) && !mPreLevel && !mColPos) { for (PRInt32 i = mIndent; --i >= 0; ) { - AppendToString(kIndentStr, -1, + AppendToString(kIndentStr.get(), -1, aStr); } } @@ -759,7 +759,7 @@ nsHTMLContentSerializer::EndIndentation(nsIAtom* aName, if ((mDoFormat || aHasDirtyAttr) && !mPreLevel && !mColPos) { for (PRInt32 i = mIndent; --i >= 0; ) { - AppendToString(kIndentStr, -1, + AppendToString(kIndentStr.get(), -1, aStr); } } diff --git a/mozilla/content/base/src/nsPlainTextSerializer.cpp b/mozilla/content/base/src/nsPlainTextSerializer.cpp index c9924cc79fe..0dbf655f8ee 100644 --- a/mozilla/content/base/src/nsPlainTextSerializer.cpp +++ b/mozilla/content/base/src/nsPlainTextSerializer.cpp @@ -1385,7 +1385,7 @@ nsPlainTextSerializer::Write(const nsAReadableString& aString) mEmptyLines=0; mAtFirstColumn = PR_TRUE; bol = newline+1; - if('\r' == aString[newline] && bol < totLen && '\n' == aString[bol]) { + if('\r' == *iter && bol < totLen && '\n' == *++iter) { // There was a CRLF in the input. This used to be illegal and // stripped by the parser. Apparently not anymore. Let's skip // over the LF. diff --git a/mozilla/content/xbl/src/nsBindingManager.cpp b/mozilla/content/xbl/src/nsBindingManager.cpp index a6bcf662d52..baf527c70bf 100644 --- a/mozilla/content/xbl/src/nsBindingManager.cpp +++ b/mozilla/content/xbl/src/nsBindingManager.cpp @@ -160,8 +160,7 @@ nsXBLDocumentInfo::GetPrototypeBinding(const nsAReadableCString& aRef, nsIXBLPro if (!mBindingTable) return NS_OK; - const char* str = nsPromiseFlatCString(aRef); - nsCStringKey key(str); + nsCStringKey key(nsPromiseFlatCString(aRef).get()); *aResult = NS_STATIC_CAST(nsIXBLPrototypeBinding*, mBindingTable->Get(&key)); // Addref happens here. return NS_OK; @@ -173,8 +172,7 @@ nsXBLDocumentInfo::SetPrototypeBinding(const nsAReadableCString& aRef, nsIXBLPro if (!mBindingTable) mBindingTable = new nsSupportsHashtable(); - const char* str = nsPromiseFlatCString(aRef); - nsCStringKey key(str); + nsCStringKey key(nsPromiseFlatCString(aRef).get()); mBindingTable->Put(&key, aBinding); return NS_OK; diff --git a/mozilla/content/xbl/src/nsXBLWindowHandler.cpp b/mozilla/content/xbl/src/nsXBLWindowHandler.cpp index 880ff8b2bf8..63eb42d4a5b 100644 --- a/mozilla/content/xbl/src/nsXBLWindowHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLWindowHandler.cpp @@ -139,7 +139,7 @@ nsXBLSpecialDocInfo::GetHandlers(nsIXBLDocumentInfo* aInfo, root->ChildAt(i, *getter_AddRefs(child)); nsAutoString id; child->GetAttribute(kNameSpaceID_None, nsHTMLAtoms::id, id); - if (id.EqualsWithConversion(nsPromiseFlatCString(aRef))) { + if (id.EqualsWithConversion(nsPromiseFlatCString(aRef).get())) { NS_NewXBLPrototypeBinding(aRef, child, aInfo, getter_AddRefs(binding)); aInfo->SetPrototypeBinding(aRef, binding); break; diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index c15c94503f9..1b065111cc8 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -1211,7 +1211,7 @@ nsWebShell :: IsCommandEnabled ( const nsAReadableString & inCommand, PRBool* ou nsCOMPtr controller; rv = GetControllerForCommand ( inCommand, getter_AddRefs(controller) ); if ( controller ) - rv = controller->IsCommandEnabled(nsPromiseFlatString(inCommand), outEnabled); + rv = controller->IsCommandEnabled(nsPromiseFlatString(inCommand).get(), outEnabled); return rv; } @@ -1225,7 +1225,7 @@ nsWebShell :: DoCommand ( const nsAReadableString & inCommand ) nsCOMPtr controller; rv = GetControllerForCommand ( inCommand, getter_AddRefs(controller) ); if ( controller ) - rv = controller->DoCommand(nsPromiseFlatString(inCommand)); + rv = controller->DoCommand(nsPromiseFlatString(inCommand).get()); return rv; } diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index fcff5e01dba..f25a02aee65 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -1146,7 +1146,7 @@ GlobalWindowImpl::SetTitle(const nsAReadableString& aTitle) if(type == nsIDocShellTreeItem::typeChrome) { nsCOMPtr docShellAsWin(do_QueryInterface(mDocShell)); if(docShellAsWin) { - docShellAsWin->SetTitle(nsPromiseFlatString(mTitle)); + docShellAsWin->SetTitle(nsPromiseFlatString(mTitle).get()); } } } diff --git a/mozilla/editor/base/TextEditorTest.cpp b/mozilla/editor/base/TextEditorTest.cpp index 7ffe8f49391..260cfc955b2 100644 --- a/mozilla/editor/base/TextEditorTest.cpp +++ b/mozilla/editor/base/TextEditorTest.cpp @@ -71,13 +71,13 @@ nsresult TextEditorTest::RunUnitTest(PRInt32 *outNumTests, PRInt32 *outNumTestsF // shouldn't we just bail on error here? // insert some simple text - result = mTextEditor->InsertText(NS_LITERAL_STRING("1234567890abcdefghij1234567890")); + result = mTextEditor->InsertText(NS_LITERAL_STRING("1234567890abcdefghij1234567890").get()); TEST_RESULT(result); (*outNumTests)++; (*outNumTestsFailed) += (NS_FAILED(result) != NS_OK); // insert some more text - result = mTextEditor->InsertText(NS_LITERAL_STRING("Moreover, I am cognizant of the interrelatedness of all communities and states. I cannot sit idly by in Atlanta and not be concerned about what happens in Birmingham. Injustice anywhere is a threat to justice everywhere")); + result = mTextEditor->InsertText(NS_LITERAL_STRING("Moreover, I am cognizant of the interrelatedness of all communities and states. I cannot sit idly by in Atlanta and not be concerned about what happens in Birmingham. Injustice anywhere is a threat to justice everywhere").get()); TEST_RESULT(result); (*outNumTests)++; (*outNumTestsFailed) += (NS_FAILED(result) != NS_OK); diff --git a/mozilla/editor/base/nsEditor.cpp b/mozilla/editor/base/nsEditor.cpp index fef60eda5ac..d366a0afc99 100644 --- a/mozilla/editor/base/nsEditor.cpp +++ b/mozilla/editor/base/nsEditor.cpp @@ -913,7 +913,7 @@ nsEditor::SaveFile(nsIFile *aFileSpec, PRBool aReplaceExisting, if (wrapColumn > 0) flags |= nsIDocumentEncoder::OutputWrap; rv = diskDoc->SaveFile(aFileSpec, aReplaceExisting, aSaveCopy, - aFormat.GetUnicode(), NS_LITERAL_STRING(""), + aFormat.GetUnicode(), NS_LITERAL_STRING("").get(), flags, wrapColumn); if (NS_SUCCEEDED(rv)) DoAfterDocumentSave(); diff --git a/mozilla/editor/base/nsEditorShell.cpp b/mozilla/editor/base/nsEditorShell.cpp index 087aecf9437..e9295ff112b 100644 --- a/mozilla/editor/base/nsEditorShell.cpp +++ b/mozilla/editor/base/nsEditorShell.cpp @@ -1757,9 +1757,9 @@ nsEditorShell::SaveDocument(PRBool aSaveAs, PRBool aSaveCopy, const PRUnichar* a PRUnichar *titleUnicode; nsAutoString captionStr, msgStr1, msgStr2; - GetBundleString(NS_LITERAL_STRING("DocumentTitle"), captionStr); - GetBundleString(NS_LITERAL_STRING("NeedDocTitle"), msgStr1); - GetBundleString(NS_LITERAL_STRING("DocTitleHelp"), msgStr2); + GetBundleString(NS_LITERAL_STRING("DocumentTitle").get(), captionStr); + GetBundleString(NS_LITERAL_STRING("NeedDocTitle").get(), msgStr1); + GetBundleString(NS_LITERAL_STRING("DocTitleHelp").get(), msgStr2); msgStr1 += PRUnichar('\n'); msgStr1 += msgStr2; @@ -1793,9 +1793,9 @@ nsEditorShell::SaveDocument(PRBool aSaveAs, PRBool aSaveCopy, const PRUnichar* a nsAutoString promptString; if (saveAsText) - GetBundleString(NS_LITERAL_STRING("ExportToText"), promptString); + GetBundleString(NS_LITERAL_STRING("ExportToText").get(), promptString); else - GetBundleString(NS_LITERAL_STRING("SaveDocumentAs"), promptString); + GetBundleString(NS_LITERAL_STRING("SaveDocumentAs").get(), promptString); // Initialize nsIFilePicker nsCOMPtr parentWindow(do_QueryReferent(mContentWindow)); @@ -1966,8 +1966,8 @@ nsEditorShell::SaveDocument(PRBool aSaveAs, PRBool aSaveCopy, const PRUnichar* a if (NS_FAILED(res)) { nsAutoString saveDocStr, failedStr; - GetBundleString(NS_LITERAL_STRING("SaveDocument"), saveDocStr); - GetBundleString(NS_LITERAL_STRING("SaveFileFailed"), failedStr); + GetBundleString(NS_LITERAL_STRING("SaveDocument").get(), saveDocStr); + GetBundleString(NS_LITERAL_STRING("SaveFileFailed").get(), failedStr); Alert(saveDocStr, failedStr); } else { // File was saved successfully @@ -2029,7 +2029,7 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *fi nsAutoString HTMLTitle; - GetBundleString(NS_LITERAL_STRING("OpenHTMLFile"), HTMLTitle); + GetBundleString(NS_LITERAL_STRING("OpenHTMLFile").get(), HTMLTitle); // An empty string should just result in "Open" for the dialog nsAutoString title; @@ -2039,7 +2039,7 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *fi } else { nsAutoString imageTitle; - GetBundleString(NS_LITERAL_STRING("SelectImageFile"), imageTitle); + GetBundleString(NS_LITERAL_STRING("SelectImageFile").get(), imageTitle); if (imageTitle.Length() > 0 && imgFilter) title = imageTitle; @@ -2144,7 +2144,7 @@ nsEditorShell::UpdateWindowTitleAndRecentMenu(PRBool aSaveToPrefs) res = GetDocumentTitleString(windowCaption); // If title is empty, use "untitled" if (windowCaption.Length() == 0) - GetBundleString(NS_LITERAL_STRING("untitled"), windowCaption); + GetBundleString(NS_LITERAL_STRING("untitled").get(), windowCaption); // Append just the 'leaf' filename to the Doc. Title for the window caption if (NS_SUCCEEDED(res)) @@ -3001,7 +3001,7 @@ nsEditorShell::ConfirmWithCancel(const nsString& aTitle, const nsString& aQuesti yesStr.Assign(*aYesString); else // We always want a "Yes" string, so supply the default - GetBundleString(NS_LITERAL_STRING("Yes"), yesStr); + GetBundleString(NS_LITERAL_STRING("Yes").get(), yesStr); if (aNoString && aNoString->Length() > 0) { @@ -3016,7 +3016,7 @@ nsEditorShell::ConfirmWithCancel(const nsString& aTitle, const nsString& aQuesti block->SetInt( nsICommonDialogs::eNumberButtons, numberOfButtons ); nsAutoString cancelStr; - GetBundleString(NS_LITERAL_STRING("Cancel"), cancelStr); + GetBundleString(NS_LITERAL_STRING("Cancel").get(), cancelStr); block->SetString( nsICommonDialogs::eDialogTitle, aTitle.GetUnicode() ); //Note: "button0" is always Ok or Yes action, "button1" is Cancel @@ -4537,7 +4537,7 @@ nsEditorShell::InitSpellChecker() nsCOMPtr chromeRegistry = do_GetService(kChromeRegistryCID, &result); if (NS_SUCCEEDED(result) && chromeRegistry) - result = chromeRegistry->GetSelectedLocale(NS_LITERAL_STRING("navigator"), &dictName); + result = chromeRegistry->GetSelectedLocale(NS_LITERAL_STRING("navigator").get(), &dictName); } if (NS_SUCCEEDED(result) && dictName && *dictName) @@ -5190,14 +5190,14 @@ nsresult nsEditorShell::EndPageLoad(nsIDOMWindow *aDOMWindow, NS_ConvertASCIItoUCS2("false") ); nsAutoString doneText; - GetBundleString(NS_LITERAL_STRING("LoadingDone"), doneText); + GetBundleString(NS_LITERAL_STRING("LoadingDone").get(), doneText); SetChromeAttribute(mDocShell, "statusText", "value", doneText); // Display an Alert dialog if the page cannot be edited... if (mCloseWindowWhenLoaded) { nsAutoString alertLabel, alertMessage; - GetBundleString(NS_LITERAL_STRING("Alert"), alertLabel); + GetBundleString(NS_LITERAL_STRING("Alert").get(), alertLabel); nsAutoString stringID; switch (mCantEditReason) diff --git a/mozilla/editor/base/nsHTMLEditor.cpp b/mozilla/editor/base/nsHTMLEditor.cpp index 56738ed5352..4470af1f9f1 100644 --- a/mozilla/editor/base/nsHTMLEditor.cpp +++ b/mozilla/editor/base/nsHTMLEditor.cpp @@ -1771,7 +1771,7 @@ nsHTMLEditor::Indent(const nsString& aIndent) // put a space in it so layout will draw the list item res = selection->Collapse(newBQ,0); if (NS_FAILED(res)) return res; - res = InsertText(NS_LITERAL_STRING(" ")); + res = InsertText(NS_LITERAL_STRING(" ").get()); if (NS_FAILED(res)) return res; // reposition selection to before the space character res = GetStartNodeAndOffset(selection, address_of(node), &offset); diff --git a/mozilla/editor/composer/src/nsEditorShell.cpp b/mozilla/editor/composer/src/nsEditorShell.cpp index 087aecf9437..e9295ff112b 100644 --- a/mozilla/editor/composer/src/nsEditorShell.cpp +++ b/mozilla/editor/composer/src/nsEditorShell.cpp @@ -1757,9 +1757,9 @@ nsEditorShell::SaveDocument(PRBool aSaveAs, PRBool aSaveCopy, const PRUnichar* a PRUnichar *titleUnicode; nsAutoString captionStr, msgStr1, msgStr2; - GetBundleString(NS_LITERAL_STRING("DocumentTitle"), captionStr); - GetBundleString(NS_LITERAL_STRING("NeedDocTitle"), msgStr1); - GetBundleString(NS_LITERAL_STRING("DocTitleHelp"), msgStr2); + GetBundleString(NS_LITERAL_STRING("DocumentTitle").get(), captionStr); + GetBundleString(NS_LITERAL_STRING("NeedDocTitle").get(), msgStr1); + GetBundleString(NS_LITERAL_STRING("DocTitleHelp").get(), msgStr2); msgStr1 += PRUnichar('\n'); msgStr1 += msgStr2; @@ -1793,9 +1793,9 @@ nsEditorShell::SaveDocument(PRBool aSaveAs, PRBool aSaveCopy, const PRUnichar* a nsAutoString promptString; if (saveAsText) - GetBundleString(NS_LITERAL_STRING("ExportToText"), promptString); + GetBundleString(NS_LITERAL_STRING("ExportToText").get(), promptString); else - GetBundleString(NS_LITERAL_STRING("SaveDocumentAs"), promptString); + GetBundleString(NS_LITERAL_STRING("SaveDocumentAs").get(), promptString); // Initialize nsIFilePicker nsCOMPtr parentWindow(do_QueryReferent(mContentWindow)); @@ -1966,8 +1966,8 @@ nsEditorShell::SaveDocument(PRBool aSaveAs, PRBool aSaveCopy, const PRUnichar* a if (NS_FAILED(res)) { nsAutoString saveDocStr, failedStr; - GetBundleString(NS_LITERAL_STRING("SaveDocument"), saveDocStr); - GetBundleString(NS_LITERAL_STRING("SaveFileFailed"), failedStr); + GetBundleString(NS_LITERAL_STRING("SaveDocument").get(), saveDocStr); + GetBundleString(NS_LITERAL_STRING("SaveFileFailed").get(), failedStr); Alert(saveDocStr, failedStr); } else { // File was saved successfully @@ -2029,7 +2029,7 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *fi nsAutoString HTMLTitle; - GetBundleString(NS_LITERAL_STRING("OpenHTMLFile"), HTMLTitle); + GetBundleString(NS_LITERAL_STRING("OpenHTMLFile").get(), HTMLTitle); // An empty string should just result in "Open" for the dialog nsAutoString title; @@ -2039,7 +2039,7 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *fi } else { nsAutoString imageTitle; - GetBundleString(NS_LITERAL_STRING("SelectImageFile"), imageTitle); + GetBundleString(NS_LITERAL_STRING("SelectImageFile").get(), imageTitle); if (imageTitle.Length() > 0 && imgFilter) title = imageTitle; @@ -2144,7 +2144,7 @@ nsEditorShell::UpdateWindowTitleAndRecentMenu(PRBool aSaveToPrefs) res = GetDocumentTitleString(windowCaption); // If title is empty, use "untitled" if (windowCaption.Length() == 0) - GetBundleString(NS_LITERAL_STRING("untitled"), windowCaption); + GetBundleString(NS_LITERAL_STRING("untitled").get(), windowCaption); // Append just the 'leaf' filename to the Doc. Title for the window caption if (NS_SUCCEEDED(res)) @@ -3001,7 +3001,7 @@ nsEditorShell::ConfirmWithCancel(const nsString& aTitle, const nsString& aQuesti yesStr.Assign(*aYesString); else // We always want a "Yes" string, so supply the default - GetBundleString(NS_LITERAL_STRING("Yes"), yesStr); + GetBundleString(NS_LITERAL_STRING("Yes").get(), yesStr); if (aNoString && aNoString->Length() > 0) { @@ -3016,7 +3016,7 @@ nsEditorShell::ConfirmWithCancel(const nsString& aTitle, const nsString& aQuesti block->SetInt( nsICommonDialogs::eNumberButtons, numberOfButtons ); nsAutoString cancelStr; - GetBundleString(NS_LITERAL_STRING("Cancel"), cancelStr); + GetBundleString(NS_LITERAL_STRING("Cancel").get(), cancelStr); block->SetString( nsICommonDialogs::eDialogTitle, aTitle.GetUnicode() ); //Note: "button0" is always Ok or Yes action, "button1" is Cancel @@ -4537,7 +4537,7 @@ nsEditorShell::InitSpellChecker() nsCOMPtr chromeRegistry = do_GetService(kChromeRegistryCID, &result); if (NS_SUCCEEDED(result) && chromeRegistry) - result = chromeRegistry->GetSelectedLocale(NS_LITERAL_STRING("navigator"), &dictName); + result = chromeRegistry->GetSelectedLocale(NS_LITERAL_STRING("navigator").get(), &dictName); } if (NS_SUCCEEDED(result) && dictName && *dictName) @@ -5190,14 +5190,14 @@ nsresult nsEditorShell::EndPageLoad(nsIDOMWindow *aDOMWindow, NS_ConvertASCIItoUCS2("false") ); nsAutoString doneText; - GetBundleString(NS_LITERAL_STRING("LoadingDone"), doneText); + GetBundleString(NS_LITERAL_STRING("LoadingDone").get(), doneText); SetChromeAttribute(mDocShell, "statusText", "value", doneText); // Display an Alert dialog if the page cannot be edited... if (mCloseWindowWhenLoaded) { nsAutoString alertLabel, alertMessage; - GetBundleString(NS_LITERAL_STRING("Alert"), alertLabel); + GetBundleString(NS_LITERAL_STRING("Alert").get(), alertLabel); nsAutoString stringID; switch (mCantEditReason) diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp index fef60eda5ac..d366a0afc99 100644 --- a/mozilla/editor/libeditor/base/nsEditor.cpp +++ b/mozilla/editor/libeditor/base/nsEditor.cpp @@ -913,7 +913,7 @@ nsEditor::SaveFile(nsIFile *aFileSpec, PRBool aReplaceExisting, if (wrapColumn > 0) flags |= nsIDocumentEncoder::OutputWrap; rv = diskDoc->SaveFile(aFileSpec, aReplaceExisting, aSaveCopy, - aFormat.GetUnicode(), NS_LITERAL_STRING(""), + aFormat.GetUnicode(), NS_LITERAL_STRING("").get(), flags, wrapColumn); if (NS_SUCCEEDED(rv)) DoAfterDocumentSave(); diff --git a/mozilla/editor/libeditor/html/TextEditorTest.cpp b/mozilla/editor/libeditor/html/TextEditorTest.cpp index 7ffe8f49391..260cfc955b2 100644 --- a/mozilla/editor/libeditor/html/TextEditorTest.cpp +++ b/mozilla/editor/libeditor/html/TextEditorTest.cpp @@ -71,13 +71,13 @@ nsresult TextEditorTest::RunUnitTest(PRInt32 *outNumTests, PRInt32 *outNumTestsF // shouldn't we just bail on error here? // insert some simple text - result = mTextEditor->InsertText(NS_LITERAL_STRING("1234567890abcdefghij1234567890")); + result = mTextEditor->InsertText(NS_LITERAL_STRING("1234567890abcdefghij1234567890").get()); TEST_RESULT(result); (*outNumTests)++; (*outNumTestsFailed) += (NS_FAILED(result) != NS_OK); // insert some more text - result = mTextEditor->InsertText(NS_LITERAL_STRING("Moreover, I am cognizant of the interrelatedness of all communities and states. I cannot sit idly by in Atlanta and not be concerned about what happens in Birmingham. Injustice anywhere is a threat to justice everywhere")); + result = mTextEditor->InsertText(NS_LITERAL_STRING("Moreover, I am cognizant of the interrelatedness of all communities and states. I cannot sit idly by in Atlanta and not be concerned about what happens in Birmingham. Injustice anywhere is a threat to justice everywhere").get()); TEST_RESULT(result); (*outNumTests)++; (*outNumTestsFailed) += (NS_FAILED(result) != NS_OK); diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp index 56738ed5352..4470af1f9f1 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp @@ -1771,7 +1771,7 @@ nsHTMLEditor::Indent(const nsString& aIndent) // put a space in it so layout will draw the list item res = selection->Collapse(newBQ,0); if (NS_FAILED(res)) return res; - res = InsertText(NS_LITERAL_STRING(" ")); + res = InsertText(NS_LITERAL_STRING(" ").get()); if (NS_FAILED(res)) return res; // reposition selection to before the space character res = GetStartNodeAndOffset(selection, address_of(node), &offset); diff --git a/mozilla/embedding/browser/powerplant/source/CProfileManager.cpp b/mozilla/embedding/browser/powerplant/source/CProfileManager.cpp index d254da14ba5..382a681b0c9 100755 --- a/mozilla/embedding/browser/powerplant/source/CProfileManager.cpp +++ b/mozilla/embedding/browser/powerplant/source/CProfileManager.cpp @@ -81,9 +81,9 @@ void CProfileManager::StartUp() // Make a new default profile NS_NAMED_LITERAL_STRING(newProfileName, "default"); - rv = profileService->CreateNewProfile(newProfileName, nsnull, nsnull, PR_FALSE); + rv = profileService->CreateNewProfile(newProfileName.get(), nsnull, nsnull, PR_FALSE); ThrowIfError_(rv); - rv = profileService->SetCurrentProfile(newProfileName); + rv = profileService->SetCurrentProfile(newProfileName.get()); ThrowIfError_(rv); } else @@ -327,7 +327,7 @@ nsresult CProfileManager::GetShowDialogOnStart(PRBool* showIt) nsRegistryKey profilesTreeKey; rv = registry->GetKey(nsIRegistry::Common, - kRegistryGlobalPrefsSubtreeString, + kRegistryGlobalPrefsSubtreeString.get(), &profilesTreeKey); if (NS_SUCCEEDED(rv)) @@ -355,13 +355,13 @@ nsresult CProfileManager::SetShowDialogOnStart(PRBool showIt) nsRegistryKey profilesTreeKey; rv = registry->GetKey(nsIRegistry::Common, - kRegistryGlobalPrefsSubtreeString, + kRegistryGlobalPrefsSubtreeString.get(), &profilesTreeKey); if (NS_FAILED(rv)) { rv = registry->AddKey(nsIRegistry::Common, - kRegistryGlobalPrefsSubtreeString, + kRegistryGlobalPrefsSubtreeString.get(), &profilesTreeKey); } if (NS_SUCCEEDED(rv)) diff --git a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp index e7519a9aa45..bf3c8cef1d5 100644 --- a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp +++ b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp @@ -613,9 +613,9 @@ nsWindowWatcher::RegisterNotification(nsIObserver *aObserver) nsCOMPtr os(do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv)); if (os) { - rv = os->AddObserver(aObserver, NOTIFICATION_OPENED); + rv = os->AddObserver(aObserver, NOTIFICATION_OPENED.get()); if (NS_SUCCEEDED(rv)) - rv = os->AddObserver(aObserver, NOTIFICATION_CLOSED); + rv = os->AddObserver(aObserver, NOTIFICATION_CLOSED.get()); } return rv; } @@ -631,8 +631,8 @@ nsWindowWatcher::UnregisterNotification(nsIObserver *aObserver) nsCOMPtr os(do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv)); if (os) { - os->RemoveObserver(aObserver, NOTIFICATION_OPENED); - os->RemoveObserver(aObserver, NOTIFICATION_CLOSED); + os->RemoveObserver(aObserver, NOTIFICATION_OPENED.get()); + os->RemoveObserver(aObserver, NOTIFICATION_CLOSED.get()); } return rv; } @@ -700,7 +700,7 @@ nsWindowWatcher::AddWindow(nsIDOMWindow *aWindow) nsCOMPtr os(do_GetService(NS_OBSERVERSERVICE_CONTRACTID, &rv)); if (os) { nsCOMPtr domwin(do_QueryInterface(aWindow)); - rv = os->Notify(domwin, NOTIFICATION_OPENED, 0); + rv = os->Notify(domwin, NOTIFICATION_OPENED.get(), 0); } return rv; @@ -774,11 +774,11 @@ nsresult nsWindowWatcher::RemoveWindow(WindowInfo *inInfo) #ifdef USEWEAKREFS nsCOMPtr domwin(do_QueryReferent(inInfo->mWindow)); if (domwin) - rv = os->Notify(domwin, NOTIFICATION_CLOSED, 0); + rv = os->Notify(domwin, NOTIFICATION_CLOSED.get(), 0); // else bummer. since the window is gone, there's nothing to notify with. #else nsCOMPtr domwin(do_QueryInterface(inInfo->mWindow)); - rv = os->Notify(domwin, NOTIFICATION_CLOSED, 0); + rv = os->Notify(domwin, NOTIFICATION_CLOSED.get(), 0); #endif } diff --git a/mozilla/extensions/wallet/src/wallet.cpp b/mozilla/extensions/wallet/src/wallet.cpp index b3e32e4c3eb..fbecc0dd1b1 100644 --- a/mozilla/extensions/wallet/src/wallet.cpp +++ b/mozilla/extensions/wallet/src/wallet.cpp @@ -1046,7 +1046,7 @@ wallet_WriteToList( break; } } - } else if((mapElementPtr->item1.Compare(item1))==0) { + } else if(Compare(mapElementPtr->item1, item1)==0) { if (DUP_OVERWRITE==placement) { delete mapElement; mapElementPtr->item1 = item1; @@ -1059,7 +1059,7 @@ wallet_WriteToList( added_to_list = PR_TRUE; break; } - } else if((mapElementPtr->item1.Compare(item1))>=0) { + } else if(Compare(mapElementPtr->item1, item1)>=0) { list->InsertElementAt(mapElement, i); added_to_list = PR_TRUE; break; @@ -1093,7 +1093,7 @@ wallet_ReadFromList( PRInt32 count = LIST_COUNT(list); for (PRInt32 i=index; iElementAt(i)); - if((mapElementPtr->item1.Compare(item1))==0) { + if(Compare(mapElementPtr->item1, item1)==0) { if (obscure) { if (NS_FAILED(Wallet_Decrypt(mapElementPtr->item2, item2))) { return PR_FALSE; diff --git a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp index 86c18e25fff..52181f26436 100644 --- a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp +++ b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp @@ -289,7 +289,7 @@ PRInt32 nsHTMLContentSinkStream::Write(const nsAReadableString& aString) { nsresult res; PRUnichar *encodedBuffer = nsnull; - res = mEntityConverter->ConvertToEntities(nsPromiseFlatString(aString), + res = mEntityConverter->ConvertToEntities(nsPromiseFlatString(aString).get(), nsIEntityConverter::html40Latin1, &encodedBuffer); if (NS_SUCCEEDED(res) && encodedBuffer) @@ -328,7 +328,7 @@ PRInt32 nsHTMLContentSinkStream::Write(const nsAReadableString& aString) { // Call the converter to convert to the target charset. // Convert() takes a char* output param even though it's writing unicode. - res = mCharsetEncoder->Convert(nsPromiseFlatString(aString), &encodedBuffer); + res = mCharsetEncoder->Convert(nsPromiseFlatString(aString).get(), &encodedBuffer); if (NS_SUCCEEDED(res) && encodedBuffer) { charsWritten = nsCRT::strlen(encodedBuffer); @@ -339,18 +339,16 @@ PRInt32 nsHTMLContentSinkStream::Write(const nsAReadableString& aString) // If it didn't work, just write the unicode else { - const PRUnichar* unicode = nsPromiseFlatString(aString); charsWritten = aString.Length(); - out.write(unicode, charsWritten); + out.write(nsPromiseFlatString(aString).get(), charsWritten); } } // If we couldn't get an encoder, just write the unicode else { - const PRUnichar* unicode = nsPromiseFlatString(aString); charsWritten = aString.Length(); - out.write(unicode, charsWritten); + out.write(nsPromiseFlatString(aString).get(), charsWritten); } return charsWritten; diff --git a/mozilla/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/htmlparser/src/nsHTMLTokenizer.cpp index 31294b781bb..5ca9f98a74c 100644 --- a/mozilla/htmlparser/src/nsHTMLTokenizer.cpp +++ b/mozilla/htmlparser/src/nsHTMLTokenizer.cpp @@ -580,7 +580,7 @@ nsresult nsHTMLTokenizer::ConsumeAttributes(PRUnichar aChar,CStartToken* aToken, const nsAReadableString& key=theToken->GetKey(); const nsAReadableString& text=theToken->GetValue(); // support XML like syntax to fix bugs like 44186 - if((kForwardSlash==key.CharAt(0)) && (0==text.Length())){ + if((kForwardSlash==key.First()) && (0==text.Length())){ aToken->SetEmpty(PR_TRUE); isUsableAttr=!mDoXMLEmptyTags; } diff --git a/mozilla/htmlparser/src/nsLoggingSink.cpp b/mozilla/htmlparser/src/nsLoggingSink.cpp index 7ea1600cc03..39fcbd13590 100644 --- a/mozilla/htmlparser/src/nsLoggingSink.cpp +++ b/mozilla/htmlparser/src/nsLoggingSink.cpp @@ -708,7 +708,11 @@ nsLoggingSink::LeafNode(const nsIParserNode& aNode) nsresult nsLoggingSink::QuoteText(const nsAReadableString& aValue, nsString& aResult) { aResult.Truncate(); - const PRUnichar* cp = nsPromiseFlatString(aValue); + /* + if you're stepping through the string anyway, why not use iterators instead of forcing the string to copy? + */ + nsPromiseFlatString flat(aValue); + const PRUnichar* cp = flat.get(); const PRUnichar* end = cp + aValue.Length(); while (cp < end) { PRUnichar ch = *cp++; diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index c81833e1ce6..87cc676893a 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -484,7 +484,7 @@ nsHTMLFrameInnerFrame::~nsHTMLFrameInnerFrame() nsCOMPtr hist; webShell->GetSessionHistory(getter_AddRefs(hist)); if (hist) - boxObject->SetPropertyAsSupports(NS_LITERAL_STRING("history"), hist); + boxObject->SetPropertyAsSupports(NS_LITERAL_STRING("history").get(), hist); } } } @@ -908,7 +908,7 @@ static PRBool CheckForBrowser(nsIContent* aContent, nsIBaseWindow* aShell) nsCOMPtr browser(do_QueryInterface(boxObject)); if (browser) { nsCOMPtr supp; - boxObject->GetPropertyAsSupports(NS_LITERAL_STRING("history"), getter_AddRefs(supp)); + boxObject->GetPropertyAsSupports(NS_LITERAL_STRING("history").get(), getter_AddRefs(supp)); if (supp) { nsCOMPtr hist(do_QueryInterface(supp)); if (hist) { @@ -916,7 +916,7 @@ static PRBool CheckForBrowser(nsIContent* aContent, nsIBaseWindow* aShell) webNav->SetSessionHistory(hist); nsCOMPtr histNav(do_QueryInterface(hist)); histNav->Reload(0); - boxObject->RemoveProperty(NS_LITERAL_STRING("history")); + boxObject->RemoveProperty(NS_LITERAL_STRING("history").get()); return PR_FALSE; } } diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp index cd030264d73..77ad1bcb326 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp @@ -409,7 +409,7 @@ nsTextInputListener::Blur (nsIDOMEvent* aEvent) } mFrame->GetText(&blurValue,PR_FALSE); - if (mFocusedValue.Compare(blurValue))//different fire onchange + if (Compare(mFocusedValue, blurValue))//different fire onchange { mFocusedValue = blurValue; mFrame->CallOnChange(); diff --git a/mozilla/layout/xul/base/src/nsBoxObject.cpp b/mozilla/layout/xul/base/src/nsBoxObject.cpp index d0f7bec9a3f..6f7a33e6c15 100644 --- a/mozilla/layout/xul/base/src/nsBoxObject.cpp +++ b/mozilla/layout/xul/base/src/nsBoxObject.cpp @@ -283,16 +283,16 @@ nsBoxObject::GetLookAndFeelMetric(const PRUnichar* aPropertyName, lookAndFeel->GetMetric(nsILookAndFeel::eMetric_ScrollArrowStyle, metricResult); switch (metricResult) { case nsILookAndFeel::eMetric_ScrollArrowStyleBothAtBottom: - *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("doublebottom")); + *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("doublebottom").get()); break; case nsILookAndFeel::eMetric_ScrollArrowStyleBothAtEachEnd: - *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("double")); + *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("double").get()); break; case nsILookAndFeel::eMetric_ScrollArrowStyleBothAtTop: - *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("doubletop")); + *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("doubletop").get()); break; default: - *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("single")); + *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("single").get()); break; } } @@ -300,9 +300,9 @@ nsBoxObject::GetLookAndFeelMetric(const PRUnichar* aPropertyName, PRInt32 metricResult; lookAndFeel->GetMetric(nsILookAndFeel::eMetric_ScrollSliderStyle, metricResult); if ( metricResult == nsILookAndFeel::eMetric_ScrollThumbStyleNormal ) - *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("fixed")); + *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("fixed").get()); else - *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("proportional")); + *aResult = nsXPIDLString::Copy(NS_LITERAL_STRING("proportional").get()); } return NS_OK; } diff --git a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp index f40f41cd5f5..b0b68324738 100644 --- a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp +++ b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp @@ -1192,8 +1192,8 @@ NS_IMETHODIMP nsMsgIncomingServer::DisplayOfflineMsg(nsIMsgWindow *aMsgWindow) nsXPIDLString errorMsgTitle; nsXPIDLString errorMsgBody; - bundle->GetStringFromName(NS_LITERAL_STRING("nocachedbodybody"), getter_Copies(errorMsgBody)); - bundle->GetStringFromName(NS_LITERAL_STRING("nocachedbodytitle"), getter_Copies(errorMsgTitle)); + bundle->GetStringFromName(NS_LITERAL_STRING("nocachedbodybody").get(), getter_Copies(errorMsgBody)); + bundle->GetStringFromName(NS_LITERAL_STRING("nocachedbodytitle").get(), getter_Copies(errorMsgTitle)); if (aMsgWindow) return aMsgWindow->DisplayHTMLInMessagePane(errorMsgTitle, errorMsgBody); else diff --git a/mozilla/modules/libpref/src/nsPref.cpp b/mozilla/modules/libpref/src/nsPref.cpp index 9720b577e11..1da6bfd7085 100644 --- a/mozilla/modules/libpref/src/nsPref.cpp +++ b/mozilla/modules/libpref/src/nsPref.cpp @@ -637,7 +637,7 @@ static int PR_CALLBACK NotifyObserver(const char *newpref, void *data) { nsCOMPtr observer = NS_STATIC_CAST(nsIObserver *, data); - observer->Observe(observer, NS_LITERAL_STRING("nsPref:changed"), + observer->Observe(observer, NS_LITERAL_STRING("nsPref:changed").get(), NS_ConvertASCIItoUCS2(newpref)); return 0; } diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index ef4086edbf7..f84adfa7931 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -4202,19 +4202,19 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary) PRUnichar *message = nsnull; PRUnichar *checkboxMessage = nsnull; - rv = bundle->GetStringFromName(NS_LITERAL_STRING("BadPluginTitle"), + rv = bundle->GetStringFromName(NS_LITERAL_STRING("BadPluginTitle").get(), &title); if (NS_FAILED(rv)) return rv; - rv = bundle->GetStringFromName(NS_LITERAL_STRING("BadPluginMessage"), + rv = bundle->GetStringFromName(NS_LITERAL_STRING("BadPluginMessage").get(), &message); if (NS_FAILED(rv)) { nsMemory::Free((void *)title); return rv; } - rv = bundle->GetStringFromName(NS_LITERAL_STRING("BadPluginCheckboxMessage"), + rv = bundle->GetStringFromName(NS_LITERAL_STRING("BadPluginCheckboxMessage").get(), &checkboxMessage); if (NS_FAILED(rv)) { diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp index ef4086edbf7..f84adfa7931 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -4202,19 +4202,19 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary) PRUnichar *message = nsnull; PRUnichar *checkboxMessage = nsnull; - rv = bundle->GetStringFromName(NS_LITERAL_STRING("BadPluginTitle"), + rv = bundle->GetStringFromName(NS_LITERAL_STRING("BadPluginTitle").get(), &title); if (NS_FAILED(rv)) return rv; - rv = bundle->GetStringFromName(NS_LITERAL_STRING("BadPluginMessage"), + rv = bundle->GetStringFromName(NS_LITERAL_STRING("BadPluginMessage").get(), &message); if (NS_FAILED(rv)) { nsMemory::Free((void *)title); return rv; } - rv = bundle->GetStringFromName(NS_LITERAL_STRING("BadPluginCheckboxMessage"), + rv = bundle->GetStringFromName(NS_LITERAL_STRING("BadPluginCheckboxMessage").get(), &checkboxMessage); if (NS_FAILED(rv)) { diff --git a/mozilla/netwerk/base/src/nsIOService.cpp b/mozilla/netwerk/base/src/nsIOService.cpp index 22262939c5a..2b0f30ec00c 100644 --- a/mozilla/netwerk/base/src/nsIOService.cpp +++ b/mozilla/netwerk/base/src/nsIOService.cpp @@ -354,8 +354,8 @@ nsIOService::SetOffline(PRBool offline) // don't care if notification fails if (observerService) (void)observerService->Notify(this, - NS_LITERAL_STRING("network:offline-status-changed"), - NS_LITERAL_STRING("offline")); + NS_LITERAL_STRING("network:offline-status-changed").get(), + NS_LITERAL_STRING("offline").get()); } else if (!offline && mOffline) { // go online @@ -371,8 +371,8 @@ nsIOService::SetOffline(PRBool offline) // don't care if notification fails if (observerService) (void)observerService->Notify(this, - NS_LITERAL_STRING("network:offline-status-changed"), - NS_LITERAL_STRING("online")); + NS_LITERAL_STRING("network:offline-status-changed").get(), + NS_LITERAL_STRING("online").get()); } return NS_OK; } diff --git a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp index 86c18e25fff..52181f26436 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp @@ -289,7 +289,7 @@ PRInt32 nsHTMLContentSinkStream::Write(const nsAReadableString& aString) { nsresult res; PRUnichar *encodedBuffer = nsnull; - res = mEntityConverter->ConvertToEntities(nsPromiseFlatString(aString), + res = mEntityConverter->ConvertToEntities(nsPromiseFlatString(aString).get(), nsIEntityConverter::html40Latin1, &encodedBuffer); if (NS_SUCCEEDED(res) && encodedBuffer) @@ -328,7 +328,7 @@ PRInt32 nsHTMLContentSinkStream::Write(const nsAReadableString& aString) { // Call the converter to convert to the target charset. // Convert() takes a char* output param even though it's writing unicode. - res = mCharsetEncoder->Convert(nsPromiseFlatString(aString), &encodedBuffer); + res = mCharsetEncoder->Convert(nsPromiseFlatString(aString).get(), &encodedBuffer); if (NS_SUCCEEDED(res) && encodedBuffer) { charsWritten = nsCRT::strlen(encodedBuffer); @@ -339,18 +339,16 @@ PRInt32 nsHTMLContentSinkStream::Write(const nsAReadableString& aString) // If it didn't work, just write the unicode else { - const PRUnichar* unicode = nsPromiseFlatString(aString); charsWritten = aString.Length(); - out.write(unicode, charsWritten); + out.write(nsPromiseFlatString(aString).get(), charsWritten); } } // If we couldn't get an encoder, just write the unicode else { - const PRUnichar* unicode = nsPromiseFlatString(aString); charsWritten = aString.Length(); - out.write(unicode, charsWritten); + out.write(nsPromiseFlatString(aString).get(), charsWritten); } return charsWritten; diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp index 31294b781bb..5ca9f98a74c 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp @@ -580,7 +580,7 @@ nsresult nsHTMLTokenizer::ConsumeAttributes(PRUnichar aChar,CStartToken* aToken, const nsAReadableString& key=theToken->GetKey(); const nsAReadableString& text=theToken->GetValue(); // support XML like syntax to fix bugs like 44186 - if((kForwardSlash==key.CharAt(0)) && (0==text.Length())){ + if((kForwardSlash==key.First()) && (0==text.Length())){ aToken->SetEmpty(PR_TRUE); isUsableAttr=!mDoXMLEmptyTags; } diff --git a/mozilla/parser/htmlparser/src/nsLoggingSink.cpp b/mozilla/parser/htmlparser/src/nsLoggingSink.cpp index 7ea1600cc03..39fcbd13590 100644 --- a/mozilla/parser/htmlparser/src/nsLoggingSink.cpp +++ b/mozilla/parser/htmlparser/src/nsLoggingSink.cpp @@ -708,7 +708,11 @@ nsLoggingSink::LeafNode(const nsIParserNode& aNode) nsresult nsLoggingSink::QuoteText(const nsAReadableString& aValue, nsString& aResult) { aResult.Truncate(); - const PRUnichar* cp = nsPromiseFlatString(aValue); + /* + if you're stepping through the string anyway, why not use iterators instead of forcing the string to copy? + */ + nsPromiseFlatString flat(aValue); + const PRUnichar* cp = flat.get(); const PRUnichar* end = cp + aValue.Length(); while (cp < end) { PRUnichar ch = *cp++; diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp index cc8543ba606..0c7b5607edf 100644 --- a/mozilla/profile/src/nsProfile.cpp +++ b/mozilla/profile/src/nsProfile.cpp @@ -1707,7 +1707,7 @@ nsProfile::DefineLocaleDefaultsDir() if (NS_SUCCEEDED(rv)) { nsXPIDLString localeName; - rv = chromeRegistry->GetSelectedLocale(NS_LITERAL_STRING("navigator"), getter_Copies(localeName)); + rv = chromeRegistry->GetSelectedLocale(NS_LITERAL_STRING("navigator").get(), getter_Copies(localeName)); if (NS_SUCCEEDED(rv)) rv = localeDefaults->AppendUnicode(localeName); } diff --git a/mozilla/profile/src/nsProfileAccess.cpp b/mozilla/profile/src/nsProfileAccess.cpp index 71f19133b5e..7f493fb3bd1 100644 --- a/mozilla/profile/src/nsProfileAccess.cpp +++ b/mozilla/profile/src/nsProfileAccess.cpp @@ -375,13 +375,13 @@ nsProfileAccess::FillProfileInfo(nsIFile* regName) nsRegistryKey profilesTreeKey; rv = registry->GetKey(nsIRegistry::Common, - kRegistryProfileSubtreeString, + kRegistryProfileSubtreeString.get(), &profilesTreeKey); if (NS_FAILED(rv)) { rv = registry->AddKey(nsIRegistry::Common, - kRegistryProfileSubtreeString, + kRegistryProfileSubtreeString.get(), &profilesTreeKey); if (NS_FAILED(rv)) return rv; } @@ -401,7 +401,7 @@ nsProfileAccess::FillProfileInfo(nsIFile* regName) // Get the current profile rv = registry->GetString(profilesTreeKey, - kRegistryCurrentProfileString, + kRegistryCurrentProfileString.get(), getter_Copies(tmpCurrentProfile)); if (tmpCurrentProfile) @@ -418,7 +418,7 @@ nsProfileAccess::FillProfileInfo(nsIFile* regName) // Get the profile version rv = registry->GetString(profilesTreeKey, - kRegistryVersionString, + kRegistryVersionString.get(), getter_Copies(tmpVersion)); if (tmpVersion == nsnull) @@ -429,7 +429,7 @@ nsProfileAccess::FillProfileInfo(nsIFile* regName) // Get the preg info rv = registry->GetString(profilesTreeKey, - kRegistryHavePREGInfoString, + kRegistryHavePREGInfoString.get(), getter_Copies(tmpPREGInfo)); if (tmpPREGInfo == nsnull) @@ -479,7 +479,7 @@ nsProfileAccess::FillProfileInfo(nsIFile* regName) if (NS_FAILED(rv)) return rv; rv = registry->GetString(profKey, - kRegistryMigratedString, + kRegistryMigratedString.get(), getter_Copies(isMigrated)); if (NS_FAILED(rv)) return rv; nsLiteralString isMigratedString(isMigrated); @@ -488,19 +488,19 @@ nsProfileAccess::FillProfileInfo(nsIFile* regName) // are for activation, they are optional and their values // do not call for a return registry->GetString(profKey, - kRegistryNCProfileNameString, + kRegistryNCProfileNameString.get(), getter_Copies(NCProfileName)); registry->GetString(profKey, - kRegistryNCServiceDenialString, + kRegistryNCServiceDenialString.get(), getter_Copies(NCDeniedService)); registry->GetString(profKey, - kRegistryNCUserEmailString, + kRegistryNCUserEmailString.get(), getter_Copies(NCEmailAddress)); registry->GetString(profKey, - kRegistryNCHavePREGInfoString, + kRegistryNCHavePREGInfoString.get(), getter_Copies(NCHavePregInfo)); // Make sure that mCurrentProfile is valid @@ -763,7 +763,7 @@ nsProfileAccess::UpdateRegistry(nsIFile* regName) // Get the major subtree rv = registry->GetKey(nsIRegistry::Common, - kRegistryProfileSubtreeString, + kRegistryProfileSubtreeString.get(), &profilesTreeKey); if (NS_FAILED(rv)) return rv; @@ -771,20 +771,20 @@ nsProfileAccess::UpdateRegistry(nsIFile* regName) if (!mCurrentProfile.IsEmpty()) { rv = registry->SetString(profilesTreeKey, - kRegistryCurrentProfileString, + kRegistryCurrentProfileString.get(), mCurrentProfile.GetUnicode()); if (NS_FAILED(rv)) return rv; } // Set the registry version rv = registry->SetString(profilesTreeKey, - kRegistryVersionString, - kRegistryCurrentVersion); + kRegistryVersionString.get(), + kRegistryCurrentVersion.get()); if (NS_FAILED(rv)) return rv; // Set preg info rv = registry->SetString(profilesTreeKey, - kRegistryHavePREGInfoString, + kRegistryHavePREGInfoString.get(), mHavePREGInfo.GetUnicode()); if (NS_FAILED(rv)) return rv; @@ -836,24 +836,24 @@ nsProfileAccess::UpdateRegistry(nsIFile* regName) if (NS_FAILED(rv)) return rv; rv = registry->SetString(profKey, - kRegistryMigratedString, - profileItem->isMigrated ? kRegistryYesString : kRegistryNoString); + kRegistryMigratedString.get(), + profileItem->isMigrated ? kRegistryYesString.get() : kRegistryNoString.get()); if (NS_FAILED(rv)) return rv; registry->SetString(profKey, - kRegistryNCProfileNameString, + kRegistryNCProfileNameString.get(), profileItem->NCProfileName.GetUnicode()); registry->SetString(profKey, - kRegistryNCServiceDenialString, + kRegistryNCServiceDenialString.get(), profileItem->NCDeniedService.GetUnicode()); registry->SetString(profKey, - kRegistryNCUserEmailString, + kRegistryNCUserEmailString.get(), profileItem->NCEmailAddress.GetUnicode()); registry->SetString(profKey, - kRegistryNCHavePREGInfoString, + kRegistryNCHavePREGInfoString.get(), profileItem->NCHavePregInfo.GetUnicode()); rv = profileItem->ExternalizeLocation(registry, profKey); @@ -885,24 +885,24 @@ nsProfileAccess::UpdateRegistry(nsIFile* regName) if (NS_FAILED(rv)) return rv; rv = registry->SetString(profKey, - kRegistryMigratedString, - profileItem->isMigrated ? kRegistryYesString : kRegistryNoString); + kRegistryMigratedString.get(), + profileItem->isMigrated ? kRegistryYesString.get() : kRegistryNoString.get()); if (NS_FAILED(rv)) return rv; registry->SetString(profKey, - kRegistryNCProfileNameString, + kRegistryNCProfileNameString.get(), profileItem->NCProfileName.GetUnicode()); registry->SetString(profKey, - kRegistryNCServiceDenialString, + kRegistryNCServiceDenialString.get(), profileItem->NCDeniedService.GetUnicode()); registry->SetString(profKey, - kRegistryNCUserEmailString, + kRegistryNCUserEmailString.get(), profileItem->NCEmailAddress.GetUnicode()); registry->SetString(profKey, - kRegistryNCHavePREGInfoString, + kRegistryNCHavePREGInfoString.get(), profileItem->NCHavePregInfo.GetUnicode()); rv = profileItem->ExternalizeLocation(registry, profKey); @@ -1286,13 +1286,13 @@ nsProfileAccess::GetMozRegDataMovedFlag(PRBool *isDataMoved) if (NS_FAILED(rv)) return rv; rv = registry->GetKey(nsIRegistry::Common, - kRegistryProfileSubtreeString, + kRegistryProfileSubtreeString.get(), &profilesTreeKey); if (NS_SUCCEEDED(rv)) { rv = registry->GetString(profilesTreeKey, - kRegistryMozRegDataMovedString, + kRegistryMozRegDataMovedString.get(), getter_Copies(tmpRegDataMoved)); nsAutoString isDataMovedString(tmpRegDataMoved); @@ -1302,7 +1302,7 @@ nsProfileAccess::GetMozRegDataMovedFlag(PRBool *isDataMoved) else { rv = registry->AddKey(nsIRegistry::Common, - kRegistryProfileSubtreeString, + kRegistryProfileSubtreeString.get(), &profilesTreeKey); } return rv; @@ -1327,14 +1327,14 @@ nsProfileAccess::SetMozRegDataMovedFlag(nsIFile* regName) if (NS_FAILED(rv)) return rv; rv = registry->GetKey(nsIRegistry::Common, - kRegistryProfileSubtreeString, + kRegistryProfileSubtreeString.get(), &profilesTreeKey); if (NS_SUCCEEDED(rv)) { rv = registry->SetString(profilesTreeKey, - kRegistryMozRegDataMovedString, - kRegistryYesString); + kRegistryMozRegDataMovedString.get(), + kRegistryYesString.get()); } return rv; @@ -1435,7 +1435,7 @@ nsresult ProfileStruct::InternalizeLocation(nsIRegistry *aRegistry, nsRegistryKe { nsXPIDLString profLoc; - rv = aRegistry->GetString( profKey, NS_LITERAL_STRING("ProfileLocation"), getter_Copies(profLoc)); + rv = aRegistry->GetString( profKey, NS_LITERAL_STRING("ProfileLocation").get(), getter_Copies(profLoc)); if (NS_FAILED(rv)) return rv; regLocationData = profLoc; @@ -1473,7 +1473,7 @@ nsresult ProfileStruct::InternalizeLocation(nsIRegistry *aRegistry, nsRegistryKe nsAutoString dirNameString; rv = aRegistry->GetString(profKey, - kRegistryDirectoryString, + kRegistryDirectoryString.get(), getter_Copies(regData)); if (NS_FAILED(rv)) return rv; @@ -1538,7 +1538,7 @@ nsresult ProfileStruct::InternalizeLocation(nsIRegistry *aRegistry, nsRegistryKe else { rv = aRegistry->GetString(profKey, - kRegistryDirectoryString, + kRegistryDirectoryString.get(), getter_Copies(regData)); if (NS_FAILED(rv)) return rv; regLocationData = regData; @@ -1604,7 +1604,7 @@ nsresult ProfileStruct::ExternalizeLocation(nsIRegistry *aRegistry, nsRegistryKe #endif rv = aRegistry->SetString(profKey, - kRegistryDirectoryString, + kRegistryDirectoryString.get(), regData.GetUnicode()); } @@ -1612,7 +1612,7 @@ nsresult ProfileStruct::ExternalizeLocation(nsIRegistry *aRegistry, nsRegistryKe { // Write the original data back out - maybe it can be resolved later. rv = aRegistry->SetString(profKey, - kRegistryDirectoryString, + kRegistryDirectoryString.get(), regLocationData.GetUnicode()); } else diff --git a/mozilla/widget/src/mac/nsFilePicker.cpp b/mozilla/widget/src/mac/nsFilePicker.cpp index e2d89fd2460..f1491b30ef8 100644 --- a/mozilla/widget/src/mac/nsFilePicker.cpp +++ b/mozilla/widget/src/mac/nsFilePicker.cpp @@ -227,7 +227,7 @@ nsFilePicker :: IsExtensionInFilterList ( StrFileName & inFileName ) // see if it is in our list for ( int i = 0; i < mFlatFilters.Count(); ++i ) { - if ( *mFlatFilters[i] == extension ) + if ( mFlatFilters[i]->Equals(extension) ) return true; } return false; diff --git a/mozilla/widget/src/mac/nsMimeMapper.cpp b/mozilla/widget/src/mac/nsMimeMapper.cpp index f3727671d40..53ecd9f54b2 100644 --- a/mozilla/widget/src/mac/nsMimeMapper.cpp +++ b/mozilla/widget/src/mac/nsMimeMapper.cpp @@ -63,7 +63,7 @@ nsMimeMapperMac :: MapMimeTypeToMacOSType ( const char* aMimeStr, PRBool inAddIf // first check if it is already in our list. for ( MimeMapConstIterator it = mMappings.begin(); it != mMappings.end(); ++it ) { - if ( it->second == aMimeStr ) { + if ( it->second.Equals(aMimeStr) ) { format = it->first; break; }