diff --git a/mozilla/widget/src/mac/nsContextMenu.cpp b/mozilla/widget/src/mac/nsContextMenu.cpp index b1f0a63a53c..3e872954ee3 100644 --- a/mozilla/widget/src/mac/nsContextMenu.cpp +++ b/mozilla/widget/src/mac/nsContextMenu.cpp @@ -183,8 +183,8 @@ NS_METHOD nsContextMenu::AddMenuItem(nsIMenuItem * aMenuItem) mMenuItemVoidArray.AppendElement(supports); nsString label; - nsString labelHack = " "; - nsString tmp = "-"; + nsString labelHack; labelHack.AssignWithConversion(" "); + nsString tmp; tmp.AssignWithConversion("-"); aMenuItem->GetLabel(label); PRUnichar slash = tmp.CharAt(0); char* menuLabel; @@ -444,12 +444,12 @@ nsEventStatus nsContextMenu::MenuConstruct( nsString menuitemNodeType; nsString menuitemName; menuitemElement->GetNodeName(menuitemNodeType); - if (menuitemNodeType.Equals("menuitem")) { + if (menuitemNodeType.EqualsWithConversion("menuitem")) { // LoadMenuItem LoadMenuItem(this, menuitemElement, menuitemNode, menuIndex, (nsIWebShell*)aWebShell); - } else if (menuitemNodeType.Equals("menuseparator")) { + } else if (menuitemNodeType.EqualsWithConversion("menuseparator")) { AddSeparator(); - } else if (menuitemNodeType.Equals("menu")) { + } else if (menuitemNodeType.EqualsWithConversion("menu")) { // Load a submenu LoadSubMenu(this, menuitemElement, menuitemNode); } @@ -527,9 +527,9 @@ void nsContextMenu::LoadMenuItem( nsString menuitemName; nsString menuitemCmd; - menuitemElement->GetAttribute(nsAutoString("disabled"), disabled); - menuitemElement->GetAttribute(nsAutoString("value"), menuitemName); - menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd); + menuitemElement->GetAttribute(NS_ConvertASCIItoUCS2("disabled"), disabled); + menuitemElement->GetAttribute(NS_ConvertASCIItoUCS2("value"), menuitemName); + menuitemElement->GetAttribute(NS_ConvertASCIItoUCS2("cmd"), menuitemCmd); // Create nsMenuItem nsIMenuItem * pnsMenuItem = nsnull; nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, NS_GET_IID(nsIMenuItem), (void**)&pnsMenuItem); @@ -550,7 +550,7 @@ void nsContextMenu::LoadMenuItem( return; } - nsAutoString cmdAtom("oncommand"); + nsAutoString cmdAtom; cmdAtom.AssignWithConversion("oncommand"); nsString cmdName; domElement->GetAttribute(cmdAtom, cmdName); @@ -562,7 +562,7 @@ void nsContextMenu::LoadMenuItem( pnsMenuItem->SetDOMElement(domElement); pnsMenuItem->SetDOMNode(menuitemNode); - if(disabled.Equals(NS_STRING_TRUE) ) + if(disabled.EqualsWithConversion(NS_STRING_TRUE) ) ::DisableMenuItem(mMacMenuHandle, menuitemIndex + 1); else ::EnableMenuItem(mMacMenuHandle, menuitemIndex + 1); @@ -579,7 +579,7 @@ void nsContextMenu::LoadSubMenu( nsIDOMNode * menuNode) { nsString menuName; - menuElement->GetAttribute(nsAutoString("value"), menuName); + menuElement->GetAttribute(NS_ConvertASCIItoUCS2("value"), menuName); //printf("Creating Menu [%s] \n", menuName.ToNewCString()); // this leaks // Create nsMenu diff --git a/mozilla/widget/src/mac/nsFilePicker.cpp b/mozilla/widget/src/mac/nsFilePicker.cpp index 88b7086ba71..f587d866bca 100644 --- a/mozilla/widget/src/mac/nsFilePicker.cpp +++ b/mozilla/widget/src/mac/nsFilePicker.cpp @@ -518,7 +518,7 @@ NS_IMETHODIMP nsFilePicker::GetFileURL(nsIFileURL **aFileURL) //------------------------------------------------------------------------- NS_IMETHODIMP nsFilePicker::SetDefaultString(const char *aString) { - mDefault = aString; + mDefault.AssignWithConversion(aString); return NS_OK; } diff --git a/mozilla/widget/src/mac/nsFileWidget.cpp b/mozilla/widget/src/mac/nsFileWidget.cpp index 4862b0199fd..fb1fef42b1e 100644 --- a/mozilla/widget/src/mac/nsFileWidget.cpp +++ b/mozilla/widget/src/mac/nsFileWidget.cpp @@ -84,8 +84,7 @@ NS_IMETHODIMP nsFileWidget::Create(nsIWidget *aParent, nsIToolkit *aToolkit, nsWidgetInitData *aInitData) { - nsString title("Open"); - Create(aParent, title, eMode_load, aContext, aAppShell, aToolkit, aInitData); + Create(aParent, NS_ConvertASCIItoUCS2("Open"), eMode_load, aContext, aAppShell, aToolkit, aInitData); return NS_OK; } @@ -188,7 +187,7 @@ PRBool nsFileWidget::Show() nsNativeFileSpec fileSpec(theFile); nsFilePath filePath(fileSpec); - mFile = filePath; + mFile.AssignWithConversion( NS_STATIC_CAST(const char*, filePath) ); mFileSpec = fileSpec; } @@ -446,11 +445,11 @@ void nsFileWidget::GetFilterListArray(nsString& aFilterList) const nsString& filter = mFilters[i]; aFilterList.Append(title); - aFilterList.Append('\0'); + aFilterList.AppendWithConversion('\0'); aFilterList.Append(filter); - aFilterList.Append('\0'); + aFilterList.AppendWithConversion('\0'); } - aFilterList.Append('\0'); + aFilterList.AppendWithConversion('\0'); } //------------------------------------------------------------------------- diff --git a/mozilla/widget/src/mac/nsMacControl.cpp b/mozilla/widget/src/mac/nsMacControl.cpp index f0e3065e5b9..3cebe0bd54e 100644 --- a/mozilla/widget/src/mac/nsMacControl.cpp +++ b/mozilla/widget/src/mac/nsMacControl.cpp @@ -64,7 +64,6 @@ nsMacControl::nsMacControl() mControl = nsnull; mControlType = pushButProc; - mLastLabel = ""; mLastBounds.SetRect(0,0,0,0); mLastValue = 0; mLastHilite = 0; @@ -450,13 +449,13 @@ void nsMacControl::Str255ToString(const Str255& aStr255, nsString& aText) PRInt32 outLength = 512; rv = mUnicodeDecoder->Convert((char *) &aStr255[1], &inLength, buffer, &outLength); if (NS_SUCCEEDED(rv)) { - aText.SetString(buffer, outLength); + aText.Assign(buffer, outLength); } } if (NS_FAILED(rv)) { // NS_ASSERTION(0, "error: charset covnersion"); - aText.SetString((char *) &aStr255[1], aStr255[0]); + aText.AssignWithConversion((char *) &aStr255[1], aStr255[0]); } } @@ -603,7 +602,7 @@ void nsMacControl::GetFileSystemCharset(nsString & fileSystemCharset) NS_ASSERTION(NS_SUCCEEDED(rv), "error getting platform charset"); if (NS_FAILED(rv)) - aCharset.SetString("x-mac-roman"); + aCharset.AssignWithConversion("x-mac-roman"); } fileSystemCharset = aCharset; } diff --git a/mozilla/widget/src/mac/nsMenu.cpp b/mozilla/widget/src/mac/nsMenu.cpp index b50f84e34bd..80d3fe1f01f 100644 --- a/mozilla/widget/src/mac/nsMenu.cpp +++ b/mozilla/widget/src/mac/nsMenu.cpp @@ -220,8 +220,8 @@ NS_METHOD nsMenu::SetLabel(const nsString &aText) if(mDOMElement) { nsString menuIDstring; - mDOMElement->GetAttribute(nsAutoString("id"), menuIDstring); - if(menuIDstring.Equals("menu_Help")) { + mDOMElement->GetAttribute(NS_ConvertASCIItoUCS2("id"), menuIDstring); + if(menuIDstring.EqualsWithConversion("menu_Help")) { mIsHelpMenu = PR_TRUE; ::HMGetHelpMenuHandle(&mMacMenuHandle); mMacMenuID = kHMHelpMenuID; @@ -317,9 +317,9 @@ NS_METHOD nsMenu::AddMenuItem(nsIMenuItem * aMenuItem) } // I want to be internationalized too! - nsString keyEquivalent = " "; + nsString keyEquivalent; keyEquivalent.AssignWithConversion(" "); aMenuItem->GetShortcutChar(keyEquivalent); - if(!keyEquivalent.Equals(" ")) { + if(!keyEquivalent.EqualsWithConversion(" ")) { keyEquivalent.ToUpperCase(); char keyStr[2]; keyEquivalent.ToCString(keyStr, sizeof(keyStr)); @@ -566,7 +566,7 @@ nsEventStatus nsMenu::MenuItemSelected(const nsMenuEvent & aMenuEvent) // "releaseName" is the current node id for the About Mozilla/Netscape // menu node. nsCOMPtr domElement; - xulDoc->GetElementById("releaseName", getter_AddRefs(domElement)); + xulDoc->GetElementById(NS_ConvertASCIItoUCS2("releaseName"), getter_AddRefs(domElement)); if (!domElement) { NS_ERROR("GetElementById failed."); return nsEventStatus_eConsumeNoDefault; @@ -794,7 +794,7 @@ nsEventStatus nsMenu::MenuConstruct( // Open the node. nsCOMPtr domElement = do_QueryInterface(mDOMNode); if (domElement) - domElement->SetAttribute("open", "true"); + domElement->SetAttribute(NS_ConvertASCIItoUCS2("open"), NS_ConvertASCIItoUCS2("true")); gCurrentMenuDepth++; @@ -821,16 +821,16 @@ nsEventStatus nsMenu::MenuConstruct( nsString menuitemName; nsString label; - menuitemElement->GetAttribute("value", label); + menuitemElement->GetAttribute(NS_ConvertASCIItoUCS2("value"), label); //printf("label = %s \n", label.ToNewCString()); menuitemElement->GetNodeName(menuitemNodeType); - if (menuitemNodeType.Equals("menuitem")) { + if (menuitemNodeType.EqualsWithConversion("menuitem")) { // LoadMenuItem LoadMenuItem(this, menuitemElement, menuitemNode, menuIndex, (nsIWebShell*)aWebShell); - } else if (menuitemNodeType.Equals("menuseparator")) { + } else if (menuitemNodeType.EqualsWithConversion("menuseparator")) { AddSeparator(); - } else if (menuitemNodeType.Equals("menu")) { + } else if (menuitemNodeType.EqualsWithConversion("menu")) { // Load a submenu LoadSubMenu(this, menuitemElement, menuitemNode); } @@ -866,7 +866,7 @@ nsEventStatus nsMenu::HelpMenuConstruct( // Open the node. nsCOMPtr domElement = do_QueryInterface(mDOMNode); if (domElement) - domElement->SetAttribute("open", "true"); + domElement->SetAttribute(NS_ConvertASCIItoUCS2("open"), NS_ConvertASCIItoUCS2("true")); gCurrentMenuDepth++; @@ -893,16 +893,16 @@ nsEventStatus nsMenu::HelpMenuConstruct( nsString menuitemName; nsString label; - menuitemElement->GetAttribute("value", label); + menuitemElement->GetAttribute(NS_ConvertASCIItoUCS2("value"), label); //printf("label = %s \n", label.ToNewCString()); menuitemElement->GetNodeName(menuitemNodeType); - if (menuitemNodeType.Equals("menuitem")) { + if (menuitemNodeType.EqualsWithConversion("menuitem")) { // LoadMenuItem LoadMenuItem(this, menuitemElement, menuitemNode, menuIndex, (nsIWebShell*)aWebShell); - } else if (menuitemNodeType.Equals("menuseparator")) { + } else if (menuitemNodeType.EqualsWithConversion("menuseparator")) { AddSeparator(); - } else if (menuitemNodeType.Equals("menu")) { + } else if (menuitemNodeType.EqualsWithConversion("menu")) { // Load a submenu LoadSubMenu(this, menuitemElement, menuitemNode); } @@ -950,7 +950,7 @@ nsEventStatus nsMenu::MenuDestruct(const nsMenuEvent & aMenuEvent) contentNode->GetDocument(*getter_AddRefs(document)); if(document) - domElement->RemoveAttribute("open"); + domElement->RemoveAttribute(NS_ConvertASCIItoUCS2("open")); } return nsEventStatus_eIgnore; @@ -1246,11 +1246,11 @@ void nsMenu::LoadMenuItem( nsString menuitemName; nsString menuitemCmd; - menuitemElement->GetAttribute(nsAutoString("disabled"), disabled); - menuitemElement->GetAttribute(nsAutoString("checked"), checked); - menuitemElement->GetAttribute(nsAutoString("type"), type); - menuitemElement->GetAttribute(nsAutoString("value"), menuitemName); - menuitemElement->GetAttribute(nsAutoString("cmd"), menuitemCmd); + menuitemElement->GetAttribute(NS_ConvertASCIItoUCS2("disabled"), disabled); + menuitemElement->GetAttribute(NS_ConvertASCIItoUCS2("checked"), checked); + menuitemElement->GetAttribute(NS_ConvertASCIItoUCS2("type"), type); + menuitemElement->GetAttribute(NS_ConvertASCIItoUCS2("value"), menuitemName); + menuitemElement->GetAttribute(NS_ConvertASCIItoUCS2("cmd"), menuitemCmd); // Create nsMenuItem nsIMenuItem * pnsMenuItem = nsnull; nsresult rv = nsComponentManager::CreateInstance(kMenuItemCID, nsnull, NS_GET_IID(nsIMenuItem), (void**)&pnsMenuItem); @@ -1270,7 +1270,7 @@ void nsMenu::LoadMenuItem( return; } - nsAutoString cmdAtom("oncommand"); + nsAutoString cmdAtom; cmdAtom.AssignWithConversion("oncommand"); nsString cmdName; domElement->GetAttribute(cmdAtom, cmdName); @@ -1285,7 +1285,7 @@ void nsMenu::LoadMenuItem( //NS_ASSERTION(false, "get debugger"); // Set key shortcut and modifiers - nsAutoString keyAtom("key"); + nsAutoString keyAtom; keyAtom.AssignWithConversion("key"); nsString keyValue; domElement->GetAttribute(keyAtom, keyValue); @@ -1309,14 +1309,14 @@ void nsMenu::LoadMenuItem( if(keyElement){ PRUint8 modifiers = knsMenuItemNoModifier; - nsAutoString shiftAtom("shift"); - nsAutoString altAtom("alt"); - nsAutoString commandAtom("command"); + nsAutoString shiftAtom; shiftAtom.AssignWithConversion("shift"); + nsAutoString altAtom; altAtom.AssignWithConversion("alt"); + nsAutoString commandAtom; commandAtom.AssignWithConversion("command"); nsString shiftValue; nsString altValue; nsString commandValue; nsString controlValue; - nsString keyChar = " "; + nsString keyChar; keyChar.AssignWithConversion(" "); keyElement->GetAttribute(keyAtom, keyChar); keyElement->GetAttribute(shiftAtom, shiftValue); @@ -1324,41 +1324,41 @@ void nsMenu::LoadMenuItem( keyElement->GetAttribute(commandAtom, commandValue); nsAutoString xulkey; - keyElement->GetAttribute("xulkey", xulkey); - if (xulkey.Equals("true")) + keyElement->GetAttribute(NS_ConvertASCIItoUCS2("xulkey"), xulkey); + if (xulkey.EqualsWithConversion("true")) modifiers |= knsMenuItemCommandModifier; - if(!keyChar.Equals(" ")) + if(!keyChar.EqualsWithConversion(" ")) pnsMenuItem->SetShortcutChar(keyChar); - if(shiftValue.Equals("true")) + if(shiftValue.EqualsWithConversion("true")) modifiers |= knsMenuItemShiftModifier; - if(altValue.Equals("true")) + if(altValue.EqualsWithConversion("true")) modifiers |= knsMenuItemAltModifier; - if(commandValue.Equals("true")) + if(commandValue.EqualsWithConversion("true")) modifiers |= knsMenuItemCommandModifier; - if(controlValue.Equals("true")) + if(controlValue.EqualsWithConversion("true")) modifiers |= knsMenuItemControlModifier; pnsMenuItem->SetModifiers(modifiers); } - if(disabled.Equals(NS_STRING_TRUE)) + if(disabled.EqualsWithConversion(NS_STRING_TRUE)) pnsMenuItem->SetEnabled(PR_FALSE); else pnsMenuItem->SetEnabled(PR_TRUE); - if(checked.Equals(NS_STRING_TRUE)) + if(checked.EqualsWithConversion(NS_STRING_TRUE)) pnsMenuItem->SetChecked(PR_TRUE); else pnsMenuItem->SetChecked(PR_FALSE); - if(type.Equals("checkbox")) + if(type.EqualsWithConversion("checkbox")) pnsMenuItem->SetMenuItemType(nsIMenuItem::eCheckbox); - else if ( type.Equals("radio") ) + else if ( type.EqualsWithConversion("radio") ) pnsMenuItem->SetMenuItemType(nsIMenuItem::eRadio); nsISupports * supports = nsnull; @@ -1378,7 +1378,7 @@ void nsMenu::LoadSubMenu( nsIDOMNode * menuNode) { nsString menuName; - menuElement->GetAttribute(nsAutoString("value"), menuName); + menuElement->GetAttribute(NS_ConvertASCIItoUCS2("value"), menuName); //printf("Creating Menu [%s] \n", menuName.ToNewCString()); // this leaks // Create nsMenu @@ -1394,8 +1394,8 @@ void nsMenu::LoadSubMenu( // set if it's enabled or disabled nsAutoString disabled; - menuElement->GetAttribute(nsAutoString("disabled"), disabled); - if ( disabled.Equals("true") ) + menuElement->GetAttribute(NS_ConvertASCIItoUCS2("disabled"), disabled); + if ( disabled.EqualsWithConversion("true") ) pnsMenu->SetEnabled ( PR_FALSE ); else pnsMenu->SetEnabled ( PR_TRUE ); @@ -1511,8 +1511,8 @@ nsMenu::AttributeChanged( if(aAttribute == disabledAtom.get()) { nsCOMPtr element(do_QueryInterface(aContent)); nsString valueString; - element->GetAttribute("disabled", valueString); - if(valueString.Equals("true")) + element->GetAttribute(NS_ConvertASCIItoUCS2("disabled"), valueString); + if(valueString.EqualsWithConversion("true")) SetEnabled(PR_FALSE); else SetEnabled(PR_TRUE); @@ -1520,7 +1520,7 @@ nsMenu::AttributeChanged( ::DrawMenuBar(); } else if(aAttribute == valueAtom.get()) { nsCOMPtr element(do_QueryInterface(aContent)); - element->GetAttribute("value", mLabel); + element->GetAttribute(NS_ConvertASCIItoUCS2("value"), mLabel); ::DeleteMenu(mMacMenuID); mMacMenuHandle = NSStringNewMenu(mMacMenuID, mLabel); @@ -1781,7 +1781,7 @@ nsMenu::GetMenuPopupElement(nsIDOMNode** aResult) if (menuPopupElement) { nsString menuPopupNodeType; menuPopupElement->GetNodeName(menuPopupNodeType); - if (menuPopupNodeType.Equals("menupopup")) { + if (menuPopupNodeType.EqualsWithConversion("menupopup")) { *aResult = menuPopupNode.get(); NS_ADDREF(*aResult); return; diff --git a/mozilla/widget/src/mac/nsMenuBar.cpp b/mozilla/widget/src/mac/nsMenuBar.cpp index 79aabff4e89..6bcbe8f3975 100644 --- a/mozilla/widget/src/mac/nsMenuBar.cpp +++ b/mozilla/widget/src/mac/nsMenuBar.cpp @@ -267,11 +267,11 @@ nsEventStatus nsMenuBar::MenuConstruct( if (menuElement) { nsString menuNodeType; nsString menuName; - nsString menuAccessKey = " "; + nsString menuAccessKey; menuAccessKey.AssignWithConversion(" "); menuElement->GetNodeName(menuNodeType); - if (menuNodeType.Equals("menu")) { - menuElement->GetAttribute(nsAutoString("value"), menuName); - menuElement->GetAttribute(nsAutoString("accesskey"), menuAccessKey); + if (menuNodeType.EqualsWithConversion("menu")) { + menuElement->GetAttribute(NS_ConvertASCIItoUCS2("value"), menuName); + menuElement->GetAttribute(NS_ConvertASCIItoUCS2("accesskey"), menuAccessKey); // Don't create the whole menu yet, just add in the top level names // Create nsMenu @@ -297,8 +297,8 @@ nsEventStatus nsMenuBar::MenuConstruct( pnsMenuBar->AddMenu(pnsMenu); nsString menuIDstring; - menuElement->GetAttribute(nsAutoString("id"), menuIDstring); - if(menuIDstring.Equals("menu_Help")) { + menuElement->GetAttribute(NS_ConvertASCIItoUCS2("id"), menuIDstring); + if(menuIDstring.EqualsWithConversion("menu_Help")) { nsMenuEvent event; MenuHandle handle; #ifndef RHAPSODY @@ -472,7 +472,7 @@ NS_METHOD nsMenuBar::AddMenu(nsIMenu * aMenu) } //XXX "aboutStrName" should be less hardcoded - nsAutoString temp = "aboutStrName"; + nsAutoString temp; temp.AssignWithConversion("aboutStrName"); const PRUnichar *ptrtmp = temp.GetUnicode(); PRUnichar *ptrv = nsnull; bundle->GetStringFromName(ptrtmp, &ptrv); diff --git a/mozilla/widget/src/mac/nsMenuItem.cpp b/mozilla/widget/src/mac/nsMenuItem.cpp index a269bcf9c58..7a6074ba2aa 100644 --- a/mozilla/widget/src/mac/nsMenuItem.cpp +++ b/mozilla/widget/src/mac/nsMenuItem.cpp @@ -55,7 +55,7 @@ nsMenuItem::nsMenuItem() : nsIMenuItem() mWebShell = nsnull; mDOMElement = nsnull; mDOMNode = nsnull; - mKeyEquivalent = " "; + mKeyEquivalent.AssignWithConversion(" "); mEnabled = PR_TRUE; mIsChecked = PR_FALSE; mMenuType = eRegular; @@ -148,9 +148,9 @@ NS_METHOD nsMenuItem::SetChecked(PRBool aIsEnabled) { mIsChecked = aIsEnabled; if(mIsChecked) - mDOMElement->SetAttribute("checked", "true"); + mDOMElement->SetAttribute(NS_ConvertASCIItoUCS2("checked"), NS_ConvertASCIItoUCS2("true")); else - mDOMElement->SetAttribute("checked", "false"); + mDOMElement->SetAttribute(NS_ConvertASCIItoUCS2("checked"), NS_ConvertASCIItoUCS2("false")); return NS_OK; } @@ -240,7 +240,7 @@ nsEventStatus nsMenuItem::MenuItemSelected(const nsMenuEvent & aMenuEvent) // uncheck them all. nsAutoString myGroupName; - mDOMElement->GetAttribute("name", myGroupName); + mDOMElement->GetAttribute(NS_ConvertASCIItoUCS2("name"), myGroupName); nsCOMPtr parent; mDOMNode->GetParentNode(getter_AddRefs(parent)); @@ -257,9 +257,9 @@ nsEventStatus nsMenuItem::MenuItemSelected(const nsMenuEvent & aMenuEvent) // if the current sibling is in the same group, clear it nsAutoString currGroupName; - currElement->GetAttribute("name", currGroupName); + currElement->GetAttribute(NS_ConvertASCIItoUCS2("name"), currGroupName); if ( currGroupName == myGroupName ) - currElement->SetAttribute("checked", "false"); + currElement->SetAttribute(NS_ConvertASCIItoUCS2("checked"), NS_ConvertASCIItoUCS2("false")); } // advance to the next node diff --git a/mozilla/widget/src/mac/nsTextWidget.cpp b/mozilla/widget/src/mac/nsTextWidget.cpp index 4609fcd7fb1..853c6cb60b6 100644 --- a/mozilla/widget/src/mac/nsTextWidget.cpp +++ b/mozilla/widget/src/mac/nsTextWidget.cpp @@ -337,7 +337,7 @@ PRBool nsTextWidget::DispatchWindowEvent(nsGUIEvent &aEvent) // paste text nsString str; - str.SetString((char*)*scrapH, scrapLen); + str.AssignWithConversion((char*)*scrapH, scrapLen); PRUint32 startSel, endSel; GetSelection(&startSel, &endSel); PRUint32 outSize; @@ -535,7 +535,7 @@ NS_METHOD nsTextWidget::GetText(nsString& aTextBuffer, PRUint32 /*aBufferSize*/ { ::GetControlData(mControl, kControlNoPart, textTag, textSize, (Ptr)str, &textSize); aTextBuffer.SetLength(0); - aTextBuffer.Append(str, textSize); + aTextBuffer.AppendWithConversion(str, textSize); aSize = textSize; delete [] str; } @@ -606,7 +606,7 @@ NS_METHOD nsTextWidget::InsertText(const nsString &aText, PRUint32 aStartPos, P if (aEndPos < aStartPos) aEndPos = aStartPos; textStr.Cut(aStartPos, aEndPos - aStartPos); - textStr.Insert((nsString &)aText, aStartPos, aText.Length()); + textStr.Insert(aText, aStartPos); } aSize = textStr.Length(); diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp index a0e2cbdd0f8..e835e3ba53b 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp +++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp @@ -774,10 +774,10 @@ nsBaseWidget::debug_GuiEventToString(nsGUIEvent * aGuiEvent) { NS_ASSERTION(nsnull != aGuiEvent,"cmon, null gui event."); - nsAutoString eventName = "UNKNOWN"; + nsAutoString eventName; eventName.AssignWithConversion("UNKNOWN"); #define _ASSIGN_eventName(_value,_name)\ -case _value: eventName = _name ; break +case _value: eventName.AssignWithConversion(_name) ; break switch(aGuiEvent->message) { @@ -844,7 +844,7 @@ case _value: eventName = _name ; break sprintf(buf,"UNKNOWN: %d",aGuiEvent->message); - eventName = buf; + eventName.AssignWithConversion(buf); } break; } @@ -898,7 +898,7 @@ static PRBool debug_GetCachedBoolPref(const char * aPrefName) for (PRUint32 i = 0; i < debug_NumPrefValues; i++) { - if (nsAutoString(debug_PrefValues[i].name).Equals(aPrefName)) + if (NS_ConvertASCIItoUCS2(debug_PrefValues[i].name).EqualsWithConversion(aPrefName)) { return debug_PrefValues[i].value; } @@ -913,7 +913,7 @@ static void debug_SetCachedBoolPref(const char * aPrefName,PRBool aValue) for (PRUint32 i = 0; i < debug_NumPrefValues; i++) { - if (nsAutoString(debug_PrefValues[i].name).Equals(aPrefName)) + if (NS_ConvertASCIItoUCS2(debug_PrefValues[i].name).EqualsWithConversion(aPrefName)) { debug_PrefValues[i].value = aValue; @@ -1031,11 +1031,13 @@ nsBaseWidget::debug_DumpEvent(FILE * aFileOut, if (!debug_GetCachedBoolPref("nglayout.debug.event_dumping")) return; + + nsCAutoString tempString; tempString.AssignWithConversion(debug_GuiEventToString(aGuiEvent).GetUnicode()); fprintf(aFileOut, "%4d %-26s widget=%-8p name=%-12s id=%-8p pos=%d,%d\n", _GetPrintCount(), - (const char *) nsCAutoString(debug_GuiEventToString(aGuiEvent)), + (const char *) tempString, (void *) aWidget, (const char *) aWidgetName, (void *) (aWindowID ? aWindowID : 0x0), diff --git a/mozilla/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp b/mozilla/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp index e1a27606d31..0164e8c3420 100644 --- a/mozilla/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp +++ b/mozilla/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp @@ -118,7 +118,7 @@ NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseOutputFile( if (NS_FAILED(rv)) return rv; - fileWidget->SetDefaultString(suggestedLeafName); + fileWidget->SetDefaultString(NS_ConvertASCIItoUCS2(suggestedLeafName)); SetFileWidgetFilterList(fileWidget, outMask, nsnull, nsnull); @@ -127,7 +127,7 @@ NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseOutputFile( nsFileSpec spec; - nsString winTitle(windowTitle); + nsString winTitle; winTitle.AssignWithConversion(windowTitle); nsFileDlgResults result = fileWidget->PutFile(parentWidget(mParentWindow), winTitle, spec); if (result != nsFileDlgResults_OK) @@ -172,43 +172,43 @@ void nsFileSpecWithUIImpl::SetFileWidgetFilterList( nextFilter = filters; if (mask & eAllReadable) { - *nextTitle++ = "All Readable Files"; - *nextFilter++ = "*.eml; *.txt; *.htm; *.html; *.xml; *.gif; *.jpg; *.jpeg; *.png"; + (nextTitle++)->AssignWithConversion("All Readable Files"); + (nextFilter++)->AssignWithConversion("*.eml; *.txt; *.htm; *.html; *.xml; *.gif; *.jpg; *.jpeg; *.png"); } if (mask & eMailFiles) { - *nextTitle++ = "Mail Files (*.eml)"; - *nextFilter++ = "*.eml"; + (nextTitle++)->AssignWithConversion("Mail Files (*.eml)"); + (nextFilter++)->AssignWithConversion("*.eml"); } if (mask & eHTMLFiles) { - *nextTitle++ = "HTML Files (*.htm; *.html)"; - *nextFilter++ = "*.htm; *.html"; + (nextTitle++)->AssignWithConversion("HTML Files (*.htm; *.html)"); + (nextFilter++)->AssignWithConversion("*.htm; *.html"); } if (mask & eXMLFiles) { - *nextTitle++ = "XML Files (*.xml)"; - *nextFilter++ = "*.xml"; + (nextTitle++)->AssignWithConversion("XML Files (*.xml)"); + (nextFilter++)->AssignWithConversion("*.xml"); } if (mask & eImageFiles) { - *nextTitle++ = "Image Files (*.gif; *.jpg; *.jpeg; *.png)"; - *nextFilter++ = "*.gif; *.jpg; *.jpeg; *.png"; + (nextTitle++)->AssignWithConversion("Image Files (*.gif; *.jpg; *.jpeg; *.png)"); + (nextFilter++)->AssignWithConversion("*.gif; *.jpg; *.jpeg; *.png"); } if (mask & eTextFiles) { - *nextTitle++ = "Text Files (*.txt)"; - *nextFilter++ = "*.txt"; + (nextTitle++)->AssignWithConversion("Text Files (*.txt)"); + (nextFilter++)->AssignWithConversion("*.txt"); } if (mask & eExtraFilter) { - *nextTitle++ = inExtraFilterTitle; - *nextFilter++ = inExtraFilter; + (nextTitle++)->AssignWithConversion(inExtraFilterTitle); + (nextFilter++)->AssignWithConversion(inExtraFilter); } if (mask & eAllFiles) { - *nextTitle++ = "All Files"; - *nextFilter++ = "*.*"; + (nextTitle++)->AssignWithConversion("All Files"); + (nextFilter++)->AssignWithConversion("*.*"); } fileWidget->SetFilterList(nextFilter - filters, titles, filters); @@ -255,7 +255,7 @@ NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseInputFile( SetFileWidgetFilterList(fileWidget, inMask, inExtraFilterTitle, inExtraFilter); SetFileWidgetStartDir(fileWidget); - nsString winTitle(inTitle); + nsString winTitle; winTitle.AssignWithConversion(inTitle); if (fileWidget->GetFile(parentWidget(mParentWindow), winTitle, spec) != nsFileDlgResults_OK) rv = NS_FILE_FAILURE; else @@ -280,7 +280,7 @@ NS_IMETHODIMP nsFileSpecWithUIImpl::ChooseDirectory(const char *title, char **_r return rv; SetFileWidgetStartDir(fileWidget); nsFileSpec spec; - if (fileWidget->GetFolder(nsnull, title, spec) != nsFileDlgResults_OK) + if (fileWidget->GetFolder(nsnull, NS_ConvertASCIItoUCS2(title), spec) != nsFileDlgResults_OK) rv = NS_FILE_FAILURE; rv = mBaseFileSpec->SetFromFileSpec(spec); diff --git a/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp b/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp index 9865e276281..0ea6431cfb3 100644 --- a/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp +++ b/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp @@ -149,7 +149,7 @@ nsPrimitiveHelpers :: ConvertUnicodeToPlatformPlainText ( PRUnichar* inUnicode, if (NS_SUCCEEDED(rv)) rv = platformCharsetService->GetCharset(kPlatformCharsetSel_PlainTextInClipboard, platformCharset); if (NS_FAILED(rv)) - platformCharset.Assign("ISO-8859-1"); + platformCharset.AssignWithConversion("ISO-8859-1"); // get the encoder NS_WITH_SERVICE(nsICharsetConverterManager, ccm, NS_CHARSETCONVERTERMANAGER_PROGID, &rv); @@ -201,7 +201,7 @@ nsPrimitiveHelpers :: ConvertPlatformPlainTextToUnicode ( const char* inText, PR if (NS_SUCCEEDED(rv)) rv = platformCharsetService->GetCharset(kPlatformCharsetSel_PlainTextInClipboard, platformCharset); if (NS_FAILED(rv)) - platformCharset.Assign("ISO-8859-1"); + platformCharset.AssignWithConversion("ISO-8859-1"); // get the decoder NS_WITH_SERVICE(nsICharsetConverterManager, ccm, NS_CHARSETCONVERTERMANAGER_PROGID, &rv); diff --git a/mozilla/widget/src/xpwidgets/nsXIFFormatConverter.cpp b/mozilla/widget/src/xpwidgets/nsXIFFormatConverter.cpp index b7c0d5cdb57..00b310bfbb5 100644 --- a/mozilla/widget/src/xpwidgets/nsXIFFormatConverter.cpp +++ b/mozilla/widget/src/xpwidgets/nsXIFFormatConverter.cpp @@ -168,14 +168,16 @@ nsXIFFormatConverter::CanConvert(const char *aFromDataFlavor, const char *aToDat { if ( !_retval ) return NS_ERROR_INVALID_ARG; + + // STRING USE WARNING: reduce conversions here? *_retval = PR_FALSE; - nsAutoString fromFlavor ( aFromDataFlavor ); - if ( fromFlavor.Equals(kXIFMime) ) { - nsAutoString toFlavor ( aToDataFlavor ); - if ( toFlavor.Equals(kHTMLMime) ) + nsAutoString fromFlavor; fromFlavor.AssignWithConversion( aFromDataFlavor ); + if ( fromFlavor.EqualsWithConversion(kXIFMime) ) { + nsAutoString toFlavor; toFlavor.AssignWithConversion( aToDataFlavor ); + if ( toFlavor.EqualsWithConversion(kHTMLMime) ) *_retval = PR_TRUE; - else if ( toFlavor.Equals(kUnicodeMime) ) + else if ( toFlavor.EqualsWithConversion(kUnicodeMime) ) *_retval = PR_TRUE; #if NOT_NOW // pinkerton @@ -346,7 +348,7 @@ NS_IMETHODIMP nsXIFFormatConverter::ConvertFromXIFToUnicode(const nsAutoString & aFromStr, nsAutoString & aToStr) { // create the parser to do the conversion. - aToStr = ""; + aToStr.SetLength(0); nsCOMPtr parser; nsresult rv = nsComponentManager::CreateInstance(kCParserCID, nsnull, NS_GET_IID(nsIParser), getter_AddRefs(parser)); @@ -365,7 +367,7 @@ nsXIFFormatConverter::ConvertFromXIFToUnicode(const nsAutoString & aFromStr, nsA rv = NS_NewXIFDTD(getter_AddRefs(dtd)); if ( dtd ) { parser->RegisterDTD(dtd); - parser->Parse(aFromStr, 0, "text/xif",PR_FALSE,PR_TRUE); + parser->Parse(aFromStr, 0, NS_ConvertASCIItoUCS2("text/xif"),PR_FALSE,PR_TRUE); } } @@ -380,7 +382,7 @@ nsXIFFormatConverter::ConvertFromXIFToUnicode(const nsAutoString & aFromStr, nsA NS_IMETHODIMP nsXIFFormatConverter::ConvertFromXIFToHTML(const nsAutoString & aFromStr, nsAutoString & aToStr) { - aToStr = ""; + aToStr.SetLength(0); nsCOMPtr parser; nsresult rv = nsComponentManager::CreateInstance(kCParserCID, nsnull, @@ -400,7 +402,7 @@ nsXIFFormatConverter::ConvertFromXIFToHTML(const nsAutoString & aFromStr, nsAuto rv = NS_NewXIFDTD(getter_AddRefs(dtd)); if ( dtd ) { parser->RegisterDTD(dtd); - parser->Parse(aFromStr, 0, "text/xif",PR_FALSE,PR_TRUE); + parser->Parse(aFromStr, 0, NS_ConvertASCIItoUCS2("text/xif"),PR_FALSE,PR_TRUE); } } return NS_OK; @@ -415,9 +417,9 @@ nsXIFFormatConverter::ConvertFromXIFToAOLMail(const nsAutoString & aFromStr, nsA { nsAutoString html; if (NS_OK == ConvertFromXIFToHTML(aFromStr, html)) { - aToStr = ""; + aToStr.AssignWithConversion(""); aToStr.Append(html); - aToStr.Append(""); + aToStr.AppendWithConversion(""); } return NS_OK; } diff --git a/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp b/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp index fdd7f3c5019..344b13bbb70 100644 --- a/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp +++ b/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp @@ -237,7 +237,7 @@ static int colorPrefChanged (const char *newpref, void *data) rv = prefService->CopyCharPref(np->name, &colorStr); if (NS_SUCCEEDED(rv) && colorStr[0]) { - nsString colorNSStr(colorStr); + nsString colorNSStr; colorNSStr.AssignWithConversion(colorStr); nscolor thecolor; if (NS_SUCCEEDED(NS_ColorNameToRGB(colorNSStr, &thecolor))) { @@ -290,7 +290,7 @@ nsXPLookAndFeel::InitFromPref(nsLookAndFeelColorPref* aPref, nsIPref* aPrefServi nsresult rv = aPrefService->CopyCharPref(aPref->name, &colorStr); if (NS_SUCCEEDED(rv) && colorStr[0]) { - nsAutoString colorNSStr(colorStr); + nsAutoString colorNSStr; colorNSStr.AssignWithConversion(colorStr); nscolor thecolor; if (NS_SUCCEEDED(NS_ColorNameToRGB(colorNSStr, &thecolor))) {