From 7f19cefa4de887c720cf8f660997baafb85490aa Mon Sep 17 00:00:00 2001 From: "disttsc%bart.nl" Date: Thu, 8 Mar 2001 10:45:03 +0000 Subject: [PATCH] Change implicit conversion from |NS_ConvertUTF8toUCS2| |NS_ConvertASCIItoUCS2| |NS_ConvertUCS2toUTF8| |nsLiteral[C]String| |nsPromiseFlat[C]String| to explicit |get()|. Add |get()| to |nsString|, remove implicit conversion operators where possible, add NS_WARNING where not (yet!). Bug=53057, r=alecf, sr=scc git-svn-id: svn://10.0.0.236/trunk@88955 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp b/mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp index f4ac22991f2..d6177444625 100644 --- a/mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp +++ b/mozilla/xpfe/components/winhooks/nsWindowsHooks.cpp @@ -289,22 +289,22 @@ nsWindowsHooks::CheckSettings( nsIDOMWindowInternal *aParent ) { textKey = "initialPromptText"; } nsXPIDLString text, label, title, yesButtonLabel, noButtonLabel, cancelButtonLabel; - if ( NS_SUCCEEDED( ( rv = bundle->GetStringFromName( NS_ConvertASCIItoUCS2( textKey ).GetUnicode(), + if ( NS_SUCCEEDED( ( rv = bundle->GetStringFromName( NS_ConvertASCIItoUCS2( textKey ).get(), getter_Copies( text ) ) ) ) && - NS_SUCCEEDED( ( rv = bundle->GetStringFromName( NS_LITERAL_STRING( "checkBoxLabel" ), + NS_SUCCEEDED( ( rv = bundle->GetStringFromName( NS_LITERAL_STRING( "checkBoxLabel" ).get(), getter_Copies( label ) ) ) ) && - NS_SUCCEEDED( ( rv = bundle->GetStringFromName( NS_LITERAL_STRING( "title" ), + NS_SUCCEEDED( ( rv = bundle->GetStringFromName( NS_LITERAL_STRING( "title" ).get(), getter_Copies( title ) ) ) ) && - NS_SUCCEEDED( ( rv = bundle->GetStringFromName( NS_LITERAL_STRING( "yesButtonLabel" ), + NS_SUCCEEDED( ( rv = bundle->GetStringFromName( NS_LITERAL_STRING( "yesButtonLabel" ).get(), getter_Copies( yesButtonLabel ) ) ) ) && - NS_SUCCEEDED( ( rv = bundle->GetStringFromName( NS_LITERAL_STRING( "noButtonLabel" ), + NS_SUCCEEDED( ( rv = bundle->GetStringFromName( NS_LITERAL_STRING( "noButtonLabel" ).get(), getter_Copies( noButtonLabel ) ) ) ) && - NS_SUCCEEDED( ( rv = bundle->GetStringFromName( NS_LITERAL_STRING( "cancelButtonLabel" ), + NS_SUCCEEDED( ( rv = bundle->GetStringFromName( NS_LITERAL_STRING( "cancelButtonLabel" ).get(), getter_Copies( cancelButtonLabel ) ) ) ) ) { // Got the text, now show dialog. PRBool showDialog = settings->mShowDialog;