diff --git a/mozilla/content/base/src/nsCommentNode.cpp b/mozilla/content/base/src/nsCommentNode.cpp index e14bff32d04..f4e592e8704 100644 --- a/mozilla/content/base/src/nsCommentNode.cpp +++ b/mozilla/content/base/src/nsCommentNode.cpp @@ -261,7 +261,7 @@ nsCommentNode::GetTag(nsIAtom*& aResult) const NS_IMETHODIMP nsCommentNode::GetNodeName(nsString& aNodeName) { - aNodeName.Assign("#comment"); + aNodeName.AssignWithConversion("#comment"); return NS_OK; } @@ -520,7 +520,7 @@ nsCommentNode::SetText(const char* aBuffer, PRInt32 aLength, PRBool aNotify) { - nsAutoString str(aBuffer); + nsAutoString str; str.AssignWithConversion(aBuffer); StripCommentDelimiters(str); return mInner.SetText(this, str.GetUnicode(), str.Length(), aNotify); diff --git a/mozilla/content/base/src/nsDOMAttributeMap.cpp b/mozilla/content/base/src/nsDOMAttributeMap.cpp index d71bf8be126..db28ab25e83 100644 --- a/mozilla/content/base/src/nsDOMAttributeMap.cpp +++ b/mozilla/content/base/src/nsDOMAttributeMap.cpp @@ -223,7 +223,7 @@ nsDOMAttributeMap::GetNormalizedName(PRInt32 aNameSpaceID, if (nsnull != prefix) { prefix->ToString(aAttrName); - aAttrName.Append(":"); + aAttrName.AppendWithConversion(":"); NS_RELEASE(prefix); } diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index 7b01b89581f..d93d1b577c1 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -495,7 +495,7 @@ nsDOMImplementation::CreateDocumentType(const nsString& aQualifiedName, NS_ENSURE_ARG_POINTER(aReturn); return NS_NewDOMDocumentType(aReturn, aQualifiedName, nsnull, nsnull, - aPublicId, aSystemId, nsAutoString("")); + aPublicId, aSystemId, nsAutoString()); } NS_IMETHODIMP @@ -611,7 +611,7 @@ nsDocument::nsDocument() mArena = nsnull; mDocumentTitle = nsnull; mDocumentURL = nsnull; - mCharacterSet = "ISO-8859-1"; + mCharacterSet.AssignWithConversion("ISO-8859-1"); mParentDocument = nsnull; mRootContent = nsnull; mScriptObject = nsnull; @@ -1002,7 +1002,7 @@ NS_IMETHODIMP nsDocument::GetLineBreaker(nsILineBreaker** aResult) (nsISupports **)&lf); if (NS_SUCCEEDED(result)) { nsILineBreaker *lb = nsnull ; - nsAutoString lbarg(""); + nsAutoString lbarg; result = lf->GetBreaker(lbarg, &lb); if(NS_SUCCEEDED(result)) { mLineBreaker = lb; @@ -1032,7 +1032,7 @@ NS_IMETHODIMP nsDocument::GetWordBreaker(nsIWordBreaker** aResult) (nsISupports **)&lf); if (NS_SUCCEEDED(result)) { nsIWordBreaker *lb = nsnull ; - nsAutoString lbarg(""); + nsAutoString lbarg; result = lf->GetBreaker(lbarg, &lb); if(NS_SUCCEEDED(result)) { mWordBreaker = lb; @@ -1082,7 +1082,7 @@ nsDocument::SetHeaderData(nsIAtom* aHeaderField, const nsString& aData) do { // look for existing and replace if (data->mField == aHeaderField) { if (0 < aData.Length()) { - data->mData = aData; + data->mData.Assign(aData); } else { // don't store empty string (*lastPtr)->mNext = data->mNext; @@ -2197,7 +2197,7 @@ nsDocument::GetHeight(PRInt32* aHeight) NS_IMETHODIMP nsDocument::GetNodeName(nsString& aNodeName) { - aNodeName.Assign("#document"); + aNodeName.AssignWithConversion("#document"); return NS_OK; } @@ -2740,7 +2740,7 @@ PRBool nsDocument::SetProperty(JSContext *aContext, JSObject *aObj, jsval aID mPropName.Assign(JS_GetStringChars(JS_ValueToString(aContext, aID))); if (mPropName.Length() > 2) mPrefix.Assign(mPropName.GetUnicode(), 2); - if (mPrefix.Equals("on")) { + if (mPrefix.EqualsWithConversion("on")) { nsCOMPtr atom = getter_AddRefs(NS_NewAtom(mPropName)); nsIEventListenerManager *mManager = nsnull; @@ -2963,25 +2963,25 @@ nsDocument::CreateXIF(nsString & aBuffer, nsIDOMSelection* aSelection) converter.SetSelection(aSelection); - converter.AddStartTag("section"); - converter.AddStartTag("section_head"); + converter.AddStartTag( NS_ConvertToString("section") ); + converter.AddStartTag( NS_ConvertToString("section_head") ); - converter.BeginStartTag("document_info"); - converter.AddAttribute(nsAutoString("charset"),mCharacterSet); + converter.BeginStartTag( NS_ConvertToString("document_info") ); + converter.AddAttribute(NS_ConvertToString("charset"),mCharacterSet); nsCOMPtr uri (getter_AddRefs(GetDocumentURL())); if (uri) { char* spec = 0; if (NS_SUCCEEDED(uri->GetSpec(&spec)) && spec) { - converter.AddAttribute(nsAutoString("uri"), spec); + converter.AddAttribute(NS_ConvertToString("uri"), NS_ConvertToString(spec)); Recycle(spec); } } - converter.FinishStartTag("document_info",PR_TRUE,PR_TRUE); + converter.FinishStartTag(NS_ConvertToString("document_info"),PR_TRUE,PR_TRUE); - converter.AddEndTag("section_head"); - converter.AddStartTag("section_body"); + converter.AddEndTag(NS_ConvertToString("section_head")); + converter.AddStartTag(NS_ConvertToString("section_body")); nsCOMPtr doctype; GetDoctype(getter_AddRefs(doctype)); @@ -2991,28 +2991,28 @@ nsDocument::CreateXIF(nsString & aBuffer, nsIDOMSelection* aSelection) doctype->GetName(tmpStr); if (tmpStr.Length()) { - docTypeStr.Append("DOCTYPE "); + docTypeStr.AppendWithConversion("DOCTYPE "); docTypeStr.Append(tmpStr); doctype->GetPublicId(tmpStr); if (tmpStr.Length()) { - docTypeStr.Append(" PUBLIC \""); + docTypeStr.AppendWithConversion(" PUBLIC \""); docTypeStr.Append(tmpStr); - docTypeStr.Append('"'); + docTypeStr.AppendWithConversion('"'); } doctype->GetSystemId(tmpStr); if (tmpStr.Length()) { - docTypeStr.Append(" SYSTEM \""); + docTypeStr.AppendWithConversion(" SYSTEM \""); docTypeStr.Append(tmpStr); - docTypeStr.Append('"'); + docTypeStr.AppendWithConversion('"'); } doctype->GetInternalSubset(tmpStr); if (tmpStr.Length()) { - docTypeStr.Append(" [\n"); + docTypeStr.AppendWithConversion(" [\n"); docTypeStr.Append(tmpStr); - docTypeStr.Append("\n]"); + docTypeStr.AppendWithConversion("\n]"); } } @@ -3062,8 +3062,8 @@ nsDocument::CreateXIF(nsString & aBuffer, nsIDOMSelection* aSelection) #endif NS_RELEASE(root); } - converter.AddEndTag("section_body"); - converter.AddEndTag("section"); + converter.AddEndTag(NS_ConvertToString("section_body")); + converter.AddEndTag(NS_ConvertToString("section")); return result; } @@ -3081,7 +3081,7 @@ nsDocument::OutputDocumentAs(nsIOutputStream* aStream, nsIDOMSelection* selectio { rv = GetDocumentCharacterSet(charsetStr); if(NS_FAILED(rv)) { - charsetStr = "ISO-8859-1"; + charsetStr.AssignWithConversion("ISO-8859-1"); } } @@ -3119,7 +3119,7 @@ nsDocument::OutputDocumentAs(nsIOutputStream* aStream, nsIDOMSelection* selectio if (NS_SUCCEEDED(rv) && dtd) { parser->RegisterDTD(dtd); - parser->Parse(buffer, 0, "text/xif", PR_FALSE, PR_TRUE); + parser->Parse(buffer, 0, NS_ConvertToString("text/xif"), PR_FALSE, PR_TRUE); } } } diff --git a/mozilla/content/base/src/nsDocument.h b/mozilla/content/base/src/nsDocument.h index 27b92c190bd..1fe0bb09448 100644 --- a/mozilla/content/base/src/nsDocument.h +++ b/mozilla/content/base/src/nsDocument.h @@ -71,7 +71,7 @@ public: { mField = aField; NS_IF_ADDREF(mField); - mData = aData; + mData.Assign(aData); mNext = nsnull; } ~nsDocHeaderData(void) diff --git a/mozilla/content/base/src/nsDocumentEncoder.cpp b/mozilla/content/base/src/nsDocumentEncoder.cpp index a1de491b977..e2ca0c73c54 100644 --- a/mozilla/content/base/src/nsDocumentEncoder.cpp +++ b/mozilla/content/base/src/nsDocumentEncoder.cpp @@ -85,9 +85,12 @@ protected: NS_IMPL_ADDREF(nsTextEncoder) NS_IMPL_RELEASE(nsTextEncoder) -nsTextEncoder::nsTextEncoder() : mMimeType("text/plain") +nsTextEncoder::nsTextEncoder() { NS_INIT_REFCNT(); + + mMimeType.AssignWithConversion("text/plain"); + mDocument = 0; mSelection = 0; mFlags = 0; @@ -173,7 +176,7 @@ nsTextEncoder::EncodeToString(nsString& aOutputString) { nsString buffer; - if (mMimeType.Equals("text/xif")) + if (mMimeType.EqualsWithConversion("text/xif")) { mDocument->CreateXIF(aOutputString, mSelection); return NS_OK; @@ -192,7 +195,7 @@ nsTextEncoder::EncodeToString(nsString& aOutputString) { nsIHTMLContentSink* sink = nsnull; - if (mMimeType.Equals("text/html")) + if (mMimeType.EqualsWithConversion("text/html")) rv = NS_New_HTML_ContentSinkStream(&sink, &aOutputString, mFlags); else // default to text/plain @@ -207,7 +210,7 @@ nsTextEncoder::EncodeToString(nsString& aOutputString) if (NS_SUCCEEDED(rv)) { parser->RegisterDTD(dtd); - parser->Parse(buffer, 0, "text/xif", PR_FALSE, PR_TRUE); + parser->Parse(buffer, 0, NS_ConvertToString("text/xif"), PR_FALSE, PR_TRUE); } NS_IF_RELEASE(dtd); NS_IF_RELEASE(sink); @@ -235,8 +238,8 @@ nsTextEncoder::EncodeToStream(nsIOutputStream* aStream) mDocument->CreateXIF(buffer,mSelection); nsString* charset = nsnull; - nsAutoString defaultCharset("ISO-8859-1"); - if (!mCharset.Equals("null") && !mCharset.Equals("")) + nsAutoString defaultCharset; defaultCharset.AssignWithConversion("ISO-8859-1"); + if (!mCharset.EqualsWithConversion("null") && !mCharset.IsEmpty()) charset = &mCharset; nsIParser* parser; @@ -249,7 +252,7 @@ nsTextEncoder::EncodeToStream(nsIOutputStream* aStream) if (NS_SUCCEEDED(rv)) { nsIHTMLContentSink* sink = nsnull; - if (mMimeType.Equals("text/html")) + if (mMimeType.EqualsWithConversion("text/html")) rv = NS_New_HTML_ContentSinkStream(&sink, aStream, charset, mFlags); else @@ -265,7 +268,7 @@ nsTextEncoder::EncodeToStream(nsIOutputStream* aStream) if (NS_SUCCEEDED(rv)) { parser->RegisterDTD(dtd); - parser->Parse(buffer, 0, "text/xif", PR_FALSE, PR_TRUE); + parser->Parse(buffer, 0, NS_ConvertToString("text/xif"), PR_FALSE, PR_TRUE); } NS_IF_RELEASE(dtd); NS_IF_RELEASE(sink); diff --git a/mozilla/content/base/src/nsDocumentFragment.cpp b/mozilla/content/base/src/nsDocumentFragment.cpp index 236e9fe4b8d..6686413f36c 100644 --- a/mozilla/content/base/src/nsDocumentFragment.cpp +++ b/mozilla/content/base/src/nsDocumentFragment.cpp @@ -305,7 +305,7 @@ nsDocumentFragment::QueryInterface(REFNSIID aIID, void** aInstancePtr) NS_IMETHODIMP nsDocumentFragment::GetNodeName(nsString& aNodeName) { - aNodeName.Assign("#document-fragment"); + aNodeName.AssignWithConversion("#document-fragment"); return NS_OK; } diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index e59379d497a..e530123862e 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -294,9 +294,7 @@ DocumentViewerImpl::DocumentViewerImpl(nsIPresContext* aPresContext) : mPresContext(dont_QueryInterface(aPresContext)) { NS_INIT_REFCNT(); - mHintCharset = ""; mHintCharsetSource = kCharsetUninitialized; - mForceCharacterSet = ""; mAllowPlugins = PR_TRUE; mEnableRendering = PR_TRUE; mFilePointer = nsnull; @@ -1501,9 +1499,9 @@ NS_IMETHODIMP DocumentViewerImpl::GetDefaultCharacterSet(PRUnichar** aDefaultCha } } if ((nsnull == gDefCharset) || (nsnull == *gDefCharset)) - mDefaultCharacterSet = "ISO-8859-1"; + mDefaultCharacterSet.AssignWithConversion("ISO-8859-1"); else - mDefaultCharacterSet = gDefCharset; + mDefaultCharacterSet.AssignWithConversion(gDefCharset); } *aDefaultCharacterSet = mDefaultCharacterSet.ToNewUnicode(); return NS_OK; @@ -1689,7 +1687,7 @@ NS_IMETHODIMP nsDocViwerSelectionListener::NotifySelectionChanged() nsCOMPtr domWindow = do_QueryInterface(scriptGlobalObject); if (!domWindow) return NS_ERROR_FAILURE; - domWindow->UpdateCommands(nsAutoString("select")); + domWindow->UpdateCommands(NS_ConvertToString("select")); mGotSelectionState = PR_TRUE; mSelectionWasCollapsed = selectionCollapsed; } diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp index 248b6a21c98..aefec04ae56 100644 --- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp +++ b/mozilla/content/base/src/nsGenericDOMDataNode.cpp @@ -274,7 +274,7 @@ nsGenericDOMDataNode::GetData(nsString& aData) aData.Assign(mText.Get2b(), mText.GetLength()); } else { - aData.Assign(mText.Get1b(), mText.GetLength()); + aData.AssignWithConversion(mText.Get1b(), mText.GetLength()); } return NS_OK; } @@ -334,7 +334,7 @@ nsGenericDOMDataNode::SubstringData(PRUint32 aStart, aReturn.Assign(mText.Get2b() + aStart, amount); } else { - aReturn.Assign(mText.Get1b() + aStart, amount); + aReturn.AssignWithConversion(mText.Get1b() + aStart, amount); } return NS_OK; @@ -642,15 +642,15 @@ nsGenericDOMDataNode::ToCString(nsString& aBuf, PRInt32 aOffset, while (cp < end) { PRUnichar ch = *cp++; if (ch == '\r') { - aBuf.Append("\\r"); + aBuf.AppendWithConversion("\\r"); } else if (ch == '\n') { - aBuf.Append("\\n"); + aBuf.AppendWithConversion("\\n"); } else if (ch == '\t') { - aBuf.Append("\\t"); + aBuf.AppendWithConversion("\\t"); } else if ((ch < ' ') || (ch >= 127)) { char buf[10]; PR_snprintf(buf, sizeof(buf), "\\u%04x", ch); - aBuf.Append(buf); + aBuf.AppendWithConversion(buf); } else { aBuf.Append(ch); } @@ -662,15 +662,15 @@ nsGenericDOMDataNode::ToCString(nsString& aBuf, PRInt32 aOffset, while (cp < end) { PRUnichar ch = *cp++; if (ch == '\r') { - aBuf.Append("\\r"); + aBuf.AppendWithConversion("\\r"); } else if (ch == '\n') { - aBuf.Append("\\n"); + aBuf.AppendWithConversion("\\n"); } else if (ch == '\t') { - aBuf.Append("\\t"); + aBuf.AppendWithConversion("\\t"); } else if ((ch < ' ') || (ch >= 127)) { char buf[10]; PR_snprintf(buf, sizeof(buf), "\\u%04x", ch); - aBuf.Append(buf); + aBuf.AppendWithConversion(buf); } else { aBuf.Append(ch); } @@ -971,7 +971,7 @@ nsGenericDOMDataNode::CopyText(nsString& aResult) aResult.Assign(mText.Get2b(), mText.GetLength()); } else { - aResult.Assign(mText.Get1b(), mText.GetLength()); + aResult.AssignWithConversion(mText.Get1b(), mText.GetLength()); } return NS_OK; } diff --git a/mozilla/content/base/src/nsNameSpaceManager.cpp b/mozilla/content/base/src/nsNameSpaceManager.cpp index eba5dabc22e..19ecacb2bfa 100644 --- a/mozilla/content/base/src/nsNameSpaceManager.cpp +++ b/mozilla/content/base/src/nsNameSpaceManager.cpp @@ -108,11 +108,11 @@ static void AddRefTable() gURIToIDTable = new nsHashtable(); gURIArray = new nsVoidArray(); - nsString* xmlns = new nsString(kXMLNSNameSpaceURI); - nsString* xml = new nsString(kXMLNameSpaceURI); - nsString* html = new nsString(kHTMLNameSpaceURI); - nsString* xhtml = new nsString(kXHTMLNameSpaceURI); - nsString* xlink = new nsString(kXLinkNameSpaceURI); + nsString* xmlns = new nsString( NS_ConvertToString(kXMLNSNameSpaceURI) ); + nsString* xml = new nsString( NS_ConvertToString(kXMLNameSpaceURI) ); + nsString* html = new nsString( NS_ConvertToString(kHTMLNameSpaceURI) ); + nsString* xhtml = new nsString( NS_ConvertToString(kXHTMLNameSpaceURI) ); + nsString* xlink = new nsString( NS_ConvertToString(kXLinkNameSpaceURI) ); gURIArray->AppendElement(xmlns); // ordering here needs to match IDs gURIArray->AppendElement(xml); gURIArray->AppendElement(html); diff --git a/mozilla/content/base/src/nsRange.cpp b/mozilla/content/base/src/nsRange.cpp index ac9d4052367..bd20dff7865 100644 --- a/mozilla/content/base/src/nsRange.cpp +++ b/mozilla/content/base/src/nsRange.cpp @@ -1862,7 +1862,7 @@ nsRange::CreateContextualFragment(const nsString& aFragment, } else { // Who're we kidding. This only works for html. - contentType.Assign("text/html"); + contentType.AssignWithConversion("text/html"); } result = parser->ParseFragment(aFragment, (void*)0, diff --git a/mozilla/content/base/src/nsSelection.cpp b/mozilla/content/base/src/nsSelection.cpp index 9ef2ad73f15..27d81c1c97e 100644 --- a/mozilla/content/base/src/nsSelection.cpp +++ b/mozilla/content/base/src/nsSelection.cpp @@ -1380,16 +1380,16 @@ nsDOMSelection::ToString(nsString& aReturn) { PRInt32 cnt; GetRangeCount(&cnt); - aReturn = "nsSelection: "; + aReturn.AssignWithConversion("nsSelection: "); aReturn += cnt; - aReturn += " items\n"; + aReturn.AppendWithConversion(" items\n"); // Get an iterator nsSelectionIterator iter(this); nsresult res = iter.First(); if (!NS_SUCCEEDED(res)) { - aReturn += " Can't get an iterator\n"; + aReturn.AppendWithConversion(" Can't get an iterator\n"); return NS_ERROR_FAILURE; } @@ -1399,7 +1399,7 @@ nsDOMSelection::ToString(nsString& aReturn) res = iter.CurrentItem(NS_STATIC_CAST(nsIDOMRange**, getter_AddRefs(range))); if (!NS_SUCCEEDED(res)) { - aReturn += " OOPS\n"; + aReturn.AppendWithConversion(" OOPS\n"); return NS_ERROR_FAILURE; } nsString rangeStr; @@ -1408,16 +1408,16 @@ nsDOMSelection::ToString(nsString& aReturn) iter.Next(); } - aReturn += "Anchor is "; + aReturn.AppendWithConversion("Anchor is "); PRInt32 theInt = (PRInt32)(nsIDOMNode*)FetchAnchorNode(); - aReturn.Append(theInt); - aReturn += ", "; + aReturn.AppendWithConversion(theInt); + aReturn.AppendWithConversion(", "); aReturn += FetchAnchorOffset(); - aReturn += "Focus is"; - aReturn.Append((long)(nsIDOMNode*)FetchFocusNode(), 16); - aReturn += ", "; + aReturn.AppendWithConversion("Focus is"); + aReturn.AppendWithConversion((long)(nsIDOMNode*)FetchFocusNode(), 16); + aReturn.AppendWithConversion(", "); aReturn += FetchFocusOffset(); - aReturn += "\n ... end of selection\n"; + aReturn.AppendWithConversion("\n ... end of selection\n"); return NS_OK; } diff --git a/mozilla/content/base/src/nsTextFragment.cpp b/mozilla/content/base/src/nsTextFragment.cpp index e752e5f6588..43ea0a63c3b 100644 --- a/mozilla/content/base/src/nsTextFragment.cpp +++ b/mozilla/content/base/src/nsTextFragment.cpp @@ -198,7 +198,7 @@ nsTextFragment::AppendTo(nsString& aString) const aString.Append(m2b, mState.mLength); } else { - aString.Append((char*)m1b, mState.mLength); + aString.AppendWithConversion((char*)m1b, mState.mLength); } } diff --git a/mozilla/content/base/src/nsTextNode.cpp b/mozilla/content/base/src/nsTextNode.cpp index 9c4a4748f35..2d294d8d18e 100644 --- a/mozilla/content/base/src/nsTextNode.cpp +++ b/mozilla/content/base/src/nsTextNode.cpp @@ -130,7 +130,7 @@ nsTextNode::GetTag(nsIAtom*& aResult) const NS_IMETHODIMP nsTextNode::GetNodeName(nsString& aNodeName) { - aNodeName.Assign("#text"); + aNodeName.AssignWithConversion("#text"); return NS_OK; } diff --git a/mozilla/content/events/src/nsDOMEvent.cpp b/mozilla/content/events/src/nsDOMEvent.cpp index 849f27c68b7..e96fdf91657 100644 --- a/mozilla/content/events/src/nsDOMEvent.cpp +++ b/mozilla/content/events/src/nsDOMEvent.cpp @@ -111,7 +111,7 @@ NS_METHOD nsDOMEvent::GetType(nsString& aType) const char* mName = GetEventName(mEvent->message); if (nsnull != mName) { - aType = mName; + aType.AssignWithConversion(mName); return NS_OK; } diff --git a/mozilla/content/events/src/nsEventListenerManager.cpp b/mozilla/content/events/src/nsEventListenerManager.cpp index 219386c3759..af572b69bdd 100644 --- a/mozilla/content/events/src/nsEventListenerManager.cpp +++ b/mozilla/content/events/src/nsEventListenerManager.cpp @@ -433,7 +433,7 @@ nsresult nsEventListenerManager::AddEventListenerByType(nsIDOMEventListener *aLi { PRInt32 subType; nsIID iid; - nsAutoString str("on"); + nsAutoString str; str.AssignWithConversion("on"); nsIAtom* atom; str.Append(aType); @@ -454,7 +454,7 @@ nsresult nsEventListenerManager::RemoveEventListenerByType(nsIDOMEventListener * PRInt32 subType; nsIID iid; - nsAutoString str("on"); + nsAutoString str; str.AssignWithConversion("on"); nsIAtom* atom; str.Append(aType); @@ -651,7 +651,7 @@ nsEventListenerManager::HandleEventSubType(nsListenerStruct* aListenerStruct, if (NS_SUCCEEDED(result)) { nsAutoString eventString; if (NS_SUCCEEDED(aDOMEvent->GetType(eventString))) { - eventString.Insert("on", 0, 2); + eventString.InsertWithConversion("on", 0, 2); nsCOMPtr atom = getter_AddRefs(NS_NewAtom(eventString)); nsCOMPtr handlerOwner = do_QueryInterface(owner); diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp index d5ef23b53e1..8ee9a434c7c 100644 --- a/mozilla/content/events/src/nsEventStateManager.cpp +++ b/mozilla/content/events/src/nsEventStateManager.cpp @@ -134,7 +134,7 @@ nsEventStateManager::Init() NS_OBSERVERSERVICE_PROGID, &rv); if (NS_SUCCEEDED(rv)) { - nsAutoString topic(NS_XPCOM_SHUTDOWN_OBSERVER_ID); + nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); observerService->AddObserver(this, topic.GetUnicode()); } @@ -181,7 +181,7 @@ nsEventStateManager::~nsEventStateManager() NS_OBSERVERSERVICE_PROGID, &rv); if (NS_SUCCEEDED(rv)) { - nsAutoString topic(NS_XPCOM_SHUTDOWN_OBSERVER_ID); + nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); observerService->RemoveObserver(this, topic.GetUnicode()); } } @@ -219,7 +219,7 @@ NS_IMETHODIMP nsEventStateManager::Observe(nsISupports *aSubject, const PRUnichar *aTopic, const PRUnichar *someData) { nsAutoString topicString(aTopic); - nsAutoString shutdownString(NS_XPCOM_SHUTDOWN_OBSERVER_ID); + nsAutoString shutdownString; shutdownString.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); if (topicString == shutdownString) Shutdown(); @@ -1811,7 +1811,7 @@ nsEventStateManager::GetNextTabbableContent(nsIContent* aParent, nsIContent* aCh if (focusable) { nsAutoString value; child->GetAttribute(kNameSpaceID_None, nsHTMLAtoms::disabled, value); - if (!value.Equals("true")) + if (!value.EqualsWithConversion("true")) disabled = PR_FALSE; } } diff --git a/mozilla/content/html/style/src/nsCSSLoader.cpp b/mozilla/content/html/style/src/nsCSSLoader.cpp index b242f2e924d..a8809691365 100644 --- a/mozilla/content/html/style/src/nsCSSLoader.cpp +++ b/mozilla/content/html/style/src/nsCSSLoader.cpp @@ -605,7 +605,7 @@ SheetLoadData::OnStreamComplete(nsIStreamLoader* aLoader, PRUint32 stringLen, const char* string) { - nsString aStyleData(string, stringLen); + nsString aStyleData; aStyleData.AssignWithConversion(string, stringLen); mLoader->DidLoadStyle(aLoader, aStyleData, this, aStatus); // We added a reference when the loader was created. This diff --git a/mozilla/content/shared/src/nsTextFragment.cpp b/mozilla/content/shared/src/nsTextFragment.cpp index e752e5f6588..43ea0a63c3b 100644 --- a/mozilla/content/shared/src/nsTextFragment.cpp +++ b/mozilla/content/shared/src/nsTextFragment.cpp @@ -198,7 +198,7 @@ nsTextFragment::AppendTo(nsString& aString) const aString.Append(m2b, mState.mLength); } else { - aString.Append((char*)m1b, mState.mLength); + aString.AppendWithConversion((char*)m1b, mState.mLength); } } diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index e59379d497a..e530123862e 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -294,9 +294,7 @@ DocumentViewerImpl::DocumentViewerImpl(nsIPresContext* aPresContext) : mPresContext(dont_QueryInterface(aPresContext)) { NS_INIT_REFCNT(); - mHintCharset = ""; mHintCharsetSource = kCharsetUninitialized; - mForceCharacterSet = ""; mAllowPlugins = PR_TRUE; mEnableRendering = PR_TRUE; mFilePointer = nsnull; @@ -1501,9 +1499,9 @@ NS_IMETHODIMP DocumentViewerImpl::GetDefaultCharacterSet(PRUnichar** aDefaultCha } } if ((nsnull == gDefCharset) || (nsnull == *gDefCharset)) - mDefaultCharacterSet = "ISO-8859-1"; + mDefaultCharacterSet.AssignWithConversion("ISO-8859-1"); else - mDefaultCharacterSet = gDefCharset; + mDefaultCharacterSet.AssignWithConversion(gDefCharset); } *aDefaultCharacterSet = mDefaultCharacterSet.ToNewUnicode(); return NS_OK; @@ -1689,7 +1687,7 @@ NS_IMETHODIMP nsDocViwerSelectionListener::NotifySelectionChanged() nsCOMPtr domWindow = do_QueryInterface(scriptGlobalObject); if (!domWindow) return NS_ERROR_FAILURE; - domWindow->UpdateCommands(nsAutoString("select")); + domWindow->UpdateCommands(NS_ConvertToString("select")); mGotSelectionState = PR_TRUE; mSelectionWasCollapsed = selectionCollapsed; } diff --git a/mozilla/layout/base/nsPresContext.cpp b/mozilla/layout/base/nsPresContext.cpp index d668bb8bb6d..5bdc56b68df 100644 --- a/mozilla/layout/base/nsPresContext.cpp +++ b/mozilla/layout/base/nsPresContext.cpp @@ -149,12 +149,12 @@ nsPresContext::GetFontPreferences() char* value = nsnull; mPrefs->CopyCharPref("font.default", &value); if (value) { - mDefaultFont.name = value; + mDefaultFont.name.AssignWithConversion(value); nsAllocator::Free(value); value = nsnull; } if (mLangGroup) { - nsAutoString pref("font.size.variable."); + nsAutoString pref; pref.AssignWithConversion("font.size.variable."); const PRUnichar* langGroup = nsnull; mLangGroup->GetUnicode(&langGroup); pref.Append(langGroup); @@ -162,7 +162,7 @@ nsPresContext::GetFontPreferences() pref.ToCString(name, sizeof(name)); PRInt32 variableSize = 16; mPrefs->GetIntPref(name, &variableSize); - pref = "font.size.fixed."; + pref.AssignWithConversion("font.size.fixed."); pref.Append(langGroup); pref.ToCString(name, sizeof(name)); PRInt32 fixedSize = 13; diff --git a/mozilla/layout/base/nsPresState.cpp b/mozilla/layout/base/nsPresState.cpp index 5603d353e08..3f3d8923216 100644 --- a/mozilla/layout/base/nsPresState.cpp +++ b/mozilla/layout/base/nsPresState.cpp @@ -70,7 +70,7 @@ nsPresState::GetStateProperty(const nsString& aName, nsString& aResult) aResult = data; nsAllocator::Free(data); } else { - aResult = ""; + aResult.SetLength(0); } return NS_OK; } diff --git a/mozilla/layout/base/src/nsCommentNode.cpp b/mozilla/layout/base/src/nsCommentNode.cpp index e14bff32d04..f4e592e8704 100644 --- a/mozilla/layout/base/src/nsCommentNode.cpp +++ b/mozilla/layout/base/src/nsCommentNode.cpp @@ -261,7 +261,7 @@ nsCommentNode::GetTag(nsIAtom*& aResult) const NS_IMETHODIMP nsCommentNode::GetNodeName(nsString& aNodeName) { - aNodeName.Assign("#comment"); + aNodeName.AssignWithConversion("#comment"); return NS_OK; } @@ -520,7 +520,7 @@ nsCommentNode::SetText(const char* aBuffer, PRInt32 aLength, PRBool aNotify) { - nsAutoString str(aBuffer); + nsAutoString str; str.AssignWithConversion(aBuffer); StripCommentDelimiters(str); return mInner.SetText(this, str.GetUnicode(), str.Length(), aNotify); diff --git a/mozilla/layout/base/src/nsDOMAttributeMap.cpp b/mozilla/layout/base/src/nsDOMAttributeMap.cpp index d71bf8be126..db28ab25e83 100644 --- a/mozilla/layout/base/src/nsDOMAttributeMap.cpp +++ b/mozilla/layout/base/src/nsDOMAttributeMap.cpp @@ -223,7 +223,7 @@ nsDOMAttributeMap::GetNormalizedName(PRInt32 aNameSpaceID, if (nsnull != prefix) { prefix->ToString(aAttrName); - aAttrName.Append(":"); + aAttrName.AppendWithConversion(":"); NS_RELEASE(prefix); } diff --git a/mozilla/layout/base/src/nsDocument.cpp b/mozilla/layout/base/src/nsDocument.cpp index 7b01b89581f..d93d1b577c1 100644 --- a/mozilla/layout/base/src/nsDocument.cpp +++ b/mozilla/layout/base/src/nsDocument.cpp @@ -495,7 +495,7 @@ nsDOMImplementation::CreateDocumentType(const nsString& aQualifiedName, NS_ENSURE_ARG_POINTER(aReturn); return NS_NewDOMDocumentType(aReturn, aQualifiedName, nsnull, nsnull, - aPublicId, aSystemId, nsAutoString("")); + aPublicId, aSystemId, nsAutoString()); } NS_IMETHODIMP @@ -611,7 +611,7 @@ nsDocument::nsDocument() mArena = nsnull; mDocumentTitle = nsnull; mDocumentURL = nsnull; - mCharacterSet = "ISO-8859-1"; + mCharacterSet.AssignWithConversion("ISO-8859-1"); mParentDocument = nsnull; mRootContent = nsnull; mScriptObject = nsnull; @@ -1002,7 +1002,7 @@ NS_IMETHODIMP nsDocument::GetLineBreaker(nsILineBreaker** aResult) (nsISupports **)&lf); if (NS_SUCCEEDED(result)) { nsILineBreaker *lb = nsnull ; - nsAutoString lbarg(""); + nsAutoString lbarg; result = lf->GetBreaker(lbarg, &lb); if(NS_SUCCEEDED(result)) { mLineBreaker = lb; @@ -1032,7 +1032,7 @@ NS_IMETHODIMP nsDocument::GetWordBreaker(nsIWordBreaker** aResult) (nsISupports **)&lf); if (NS_SUCCEEDED(result)) { nsIWordBreaker *lb = nsnull ; - nsAutoString lbarg(""); + nsAutoString lbarg; result = lf->GetBreaker(lbarg, &lb); if(NS_SUCCEEDED(result)) { mWordBreaker = lb; @@ -1082,7 +1082,7 @@ nsDocument::SetHeaderData(nsIAtom* aHeaderField, const nsString& aData) do { // look for existing and replace if (data->mField == aHeaderField) { if (0 < aData.Length()) { - data->mData = aData; + data->mData.Assign(aData); } else { // don't store empty string (*lastPtr)->mNext = data->mNext; @@ -2197,7 +2197,7 @@ nsDocument::GetHeight(PRInt32* aHeight) NS_IMETHODIMP nsDocument::GetNodeName(nsString& aNodeName) { - aNodeName.Assign("#document"); + aNodeName.AssignWithConversion("#document"); return NS_OK; } @@ -2740,7 +2740,7 @@ PRBool nsDocument::SetProperty(JSContext *aContext, JSObject *aObj, jsval aID mPropName.Assign(JS_GetStringChars(JS_ValueToString(aContext, aID))); if (mPropName.Length() > 2) mPrefix.Assign(mPropName.GetUnicode(), 2); - if (mPrefix.Equals("on")) { + if (mPrefix.EqualsWithConversion("on")) { nsCOMPtr atom = getter_AddRefs(NS_NewAtom(mPropName)); nsIEventListenerManager *mManager = nsnull; @@ -2963,25 +2963,25 @@ nsDocument::CreateXIF(nsString & aBuffer, nsIDOMSelection* aSelection) converter.SetSelection(aSelection); - converter.AddStartTag("section"); - converter.AddStartTag("section_head"); + converter.AddStartTag( NS_ConvertToString("section") ); + converter.AddStartTag( NS_ConvertToString("section_head") ); - converter.BeginStartTag("document_info"); - converter.AddAttribute(nsAutoString("charset"),mCharacterSet); + converter.BeginStartTag( NS_ConvertToString("document_info") ); + converter.AddAttribute(NS_ConvertToString("charset"),mCharacterSet); nsCOMPtr uri (getter_AddRefs(GetDocumentURL())); if (uri) { char* spec = 0; if (NS_SUCCEEDED(uri->GetSpec(&spec)) && spec) { - converter.AddAttribute(nsAutoString("uri"), spec); + converter.AddAttribute(NS_ConvertToString("uri"), NS_ConvertToString(spec)); Recycle(spec); } } - converter.FinishStartTag("document_info",PR_TRUE,PR_TRUE); + converter.FinishStartTag(NS_ConvertToString("document_info"),PR_TRUE,PR_TRUE); - converter.AddEndTag("section_head"); - converter.AddStartTag("section_body"); + converter.AddEndTag(NS_ConvertToString("section_head")); + converter.AddStartTag(NS_ConvertToString("section_body")); nsCOMPtr doctype; GetDoctype(getter_AddRefs(doctype)); @@ -2991,28 +2991,28 @@ nsDocument::CreateXIF(nsString & aBuffer, nsIDOMSelection* aSelection) doctype->GetName(tmpStr); if (tmpStr.Length()) { - docTypeStr.Append("DOCTYPE "); + docTypeStr.AppendWithConversion("DOCTYPE "); docTypeStr.Append(tmpStr); doctype->GetPublicId(tmpStr); if (tmpStr.Length()) { - docTypeStr.Append(" PUBLIC \""); + docTypeStr.AppendWithConversion(" PUBLIC \""); docTypeStr.Append(tmpStr); - docTypeStr.Append('"'); + docTypeStr.AppendWithConversion('"'); } doctype->GetSystemId(tmpStr); if (tmpStr.Length()) { - docTypeStr.Append(" SYSTEM \""); + docTypeStr.AppendWithConversion(" SYSTEM \""); docTypeStr.Append(tmpStr); - docTypeStr.Append('"'); + docTypeStr.AppendWithConversion('"'); } doctype->GetInternalSubset(tmpStr); if (tmpStr.Length()) { - docTypeStr.Append(" [\n"); + docTypeStr.AppendWithConversion(" [\n"); docTypeStr.Append(tmpStr); - docTypeStr.Append("\n]"); + docTypeStr.AppendWithConversion("\n]"); } } @@ -3062,8 +3062,8 @@ nsDocument::CreateXIF(nsString & aBuffer, nsIDOMSelection* aSelection) #endif NS_RELEASE(root); } - converter.AddEndTag("section_body"); - converter.AddEndTag("section"); + converter.AddEndTag(NS_ConvertToString("section_body")); + converter.AddEndTag(NS_ConvertToString("section")); return result; } @@ -3081,7 +3081,7 @@ nsDocument::OutputDocumentAs(nsIOutputStream* aStream, nsIDOMSelection* selectio { rv = GetDocumentCharacterSet(charsetStr); if(NS_FAILED(rv)) { - charsetStr = "ISO-8859-1"; + charsetStr.AssignWithConversion("ISO-8859-1"); } } @@ -3119,7 +3119,7 @@ nsDocument::OutputDocumentAs(nsIOutputStream* aStream, nsIDOMSelection* selectio if (NS_SUCCEEDED(rv) && dtd) { parser->RegisterDTD(dtd); - parser->Parse(buffer, 0, "text/xif", PR_FALSE, PR_TRUE); + parser->Parse(buffer, 0, NS_ConvertToString("text/xif"), PR_FALSE, PR_TRUE); } } } diff --git a/mozilla/layout/base/src/nsDocument.h b/mozilla/layout/base/src/nsDocument.h index 27b92c190bd..1fe0bb09448 100644 --- a/mozilla/layout/base/src/nsDocument.h +++ b/mozilla/layout/base/src/nsDocument.h @@ -71,7 +71,7 @@ public: { mField = aField; NS_IF_ADDREF(mField); - mData = aData; + mData.Assign(aData); mNext = nsnull; } ~nsDocHeaderData(void) diff --git a/mozilla/layout/base/src/nsDocumentEncoder.cpp b/mozilla/layout/base/src/nsDocumentEncoder.cpp index a1de491b977..e2ca0c73c54 100644 --- a/mozilla/layout/base/src/nsDocumentEncoder.cpp +++ b/mozilla/layout/base/src/nsDocumentEncoder.cpp @@ -85,9 +85,12 @@ protected: NS_IMPL_ADDREF(nsTextEncoder) NS_IMPL_RELEASE(nsTextEncoder) -nsTextEncoder::nsTextEncoder() : mMimeType("text/plain") +nsTextEncoder::nsTextEncoder() { NS_INIT_REFCNT(); + + mMimeType.AssignWithConversion("text/plain"); + mDocument = 0; mSelection = 0; mFlags = 0; @@ -173,7 +176,7 @@ nsTextEncoder::EncodeToString(nsString& aOutputString) { nsString buffer; - if (mMimeType.Equals("text/xif")) + if (mMimeType.EqualsWithConversion("text/xif")) { mDocument->CreateXIF(aOutputString, mSelection); return NS_OK; @@ -192,7 +195,7 @@ nsTextEncoder::EncodeToString(nsString& aOutputString) { nsIHTMLContentSink* sink = nsnull; - if (mMimeType.Equals("text/html")) + if (mMimeType.EqualsWithConversion("text/html")) rv = NS_New_HTML_ContentSinkStream(&sink, &aOutputString, mFlags); else // default to text/plain @@ -207,7 +210,7 @@ nsTextEncoder::EncodeToString(nsString& aOutputString) if (NS_SUCCEEDED(rv)) { parser->RegisterDTD(dtd); - parser->Parse(buffer, 0, "text/xif", PR_FALSE, PR_TRUE); + parser->Parse(buffer, 0, NS_ConvertToString("text/xif"), PR_FALSE, PR_TRUE); } NS_IF_RELEASE(dtd); NS_IF_RELEASE(sink); @@ -235,8 +238,8 @@ nsTextEncoder::EncodeToStream(nsIOutputStream* aStream) mDocument->CreateXIF(buffer,mSelection); nsString* charset = nsnull; - nsAutoString defaultCharset("ISO-8859-1"); - if (!mCharset.Equals("null") && !mCharset.Equals("")) + nsAutoString defaultCharset; defaultCharset.AssignWithConversion("ISO-8859-1"); + if (!mCharset.EqualsWithConversion("null") && !mCharset.IsEmpty()) charset = &mCharset; nsIParser* parser; @@ -249,7 +252,7 @@ nsTextEncoder::EncodeToStream(nsIOutputStream* aStream) if (NS_SUCCEEDED(rv)) { nsIHTMLContentSink* sink = nsnull; - if (mMimeType.Equals("text/html")) + if (mMimeType.EqualsWithConversion("text/html")) rv = NS_New_HTML_ContentSinkStream(&sink, aStream, charset, mFlags); else @@ -265,7 +268,7 @@ nsTextEncoder::EncodeToStream(nsIOutputStream* aStream) if (NS_SUCCEEDED(rv)) { parser->RegisterDTD(dtd); - parser->Parse(buffer, 0, "text/xif", PR_FALSE, PR_TRUE); + parser->Parse(buffer, 0, NS_ConvertToString("text/xif"), PR_FALSE, PR_TRUE); } NS_IF_RELEASE(dtd); NS_IF_RELEASE(sink); diff --git a/mozilla/layout/base/src/nsDocumentFragment.cpp b/mozilla/layout/base/src/nsDocumentFragment.cpp index 236e9fe4b8d..6686413f36c 100644 --- a/mozilla/layout/base/src/nsDocumentFragment.cpp +++ b/mozilla/layout/base/src/nsDocumentFragment.cpp @@ -305,7 +305,7 @@ nsDocumentFragment::QueryInterface(REFNSIID aIID, void** aInstancePtr) NS_IMETHODIMP nsDocumentFragment::GetNodeName(nsString& aNodeName) { - aNodeName.Assign("#document-fragment"); + aNodeName.AssignWithConversion("#document-fragment"); return NS_OK; } diff --git a/mozilla/layout/base/src/nsDocumentViewer.cpp b/mozilla/layout/base/src/nsDocumentViewer.cpp index e59379d497a..e530123862e 100644 --- a/mozilla/layout/base/src/nsDocumentViewer.cpp +++ b/mozilla/layout/base/src/nsDocumentViewer.cpp @@ -294,9 +294,7 @@ DocumentViewerImpl::DocumentViewerImpl(nsIPresContext* aPresContext) : mPresContext(dont_QueryInterface(aPresContext)) { NS_INIT_REFCNT(); - mHintCharset = ""; mHintCharsetSource = kCharsetUninitialized; - mForceCharacterSet = ""; mAllowPlugins = PR_TRUE; mEnableRendering = PR_TRUE; mFilePointer = nsnull; @@ -1501,9 +1499,9 @@ NS_IMETHODIMP DocumentViewerImpl::GetDefaultCharacterSet(PRUnichar** aDefaultCha } } if ((nsnull == gDefCharset) || (nsnull == *gDefCharset)) - mDefaultCharacterSet = "ISO-8859-1"; + mDefaultCharacterSet.AssignWithConversion("ISO-8859-1"); else - mDefaultCharacterSet = gDefCharset; + mDefaultCharacterSet.AssignWithConversion(gDefCharset); } *aDefaultCharacterSet = mDefaultCharacterSet.ToNewUnicode(); return NS_OK; @@ -1689,7 +1687,7 @@ NS_IMETHODIMP nsDocViwerSelectionListener::NotifySelectionChanged() nsCOMPtr domWindow = do_QueryInterface(scriptGlobalObject); if (!domWindow) return NS_ERROR_FAILURE; - domWindow->UpdateCommands(nsAutoString("select")); + domWindow->UpdateCommands(NS_ConvertToString("select")); mGotSelectionState = PR_TRUE; mSelectionWasCollapsed = selectionCollapsed; } diff --git a/mozilla/layout/base/src/nsFrameUtil.cpp b/mozilla/layout/base/src/nsFrameUtil.cpp index 1a56f25cda5..8f867440e9f 100644 --- a/mozilla/layout/base/src/nsFrameUtil.cpp +++ b/mozilla/layout/base/src/nsFrameUtil.cpp @@ -440,16 +440,16 @@ nsFrameUtil::Tag::ToString(nsString& aResult) if (type == close) { aResult.Append(PRUnichar('/')); } - aResult.Append(name); + aResult.AppendWithConversion(name); if (0 != num) { PRInt32 i, n = num; for (i = 0; i < n; i++) { aResult.Append(PRUnichar(' ')); - aResult.Append(attributes[i]); + aResult.AppendWithConversion(attributes[i]); if (values[i]) { - aResult.Append("=\""); - aResult.Append(values[i]); - aResult.Append('\"'); + aResult.AppendWithConversion("=\""); + aResult.AppendWithConversion(values[i]); + aResult.AppendWithConversion('\"'); } } } diff --git a/mozilla/layout/base/src/nsGenericDOMDataNode.cpp b/mozilla/layout/base/src/nsGenericDOMDataNode.cpp index 248b6a21c98..aefec04ae56 100644 --- a/mozilla/layout/base/src/nsGenericDOMDataNode.cpp +++ b/mozilla/layout/base/src/nsGenericDOMDataNode.cpp @@ -274,7 +274,7 @@ nsGenericDOMDataNode::GetData(nsString& aData) aData.Assign(mText.Get2b(), mText.GetLength()); } else { - aData.Assign(mText.Get1b(), mText.GetLength()); + aData.AssignWithConversion(mText.Get1b(), mText.GetLength()); } return NS_OK; } @@ -334,7 +334,7 @@ nsGenericDOMDataNode::SubstringData(PRUint32 aStart, aReturn.Assign(mText.Get2b() + aStart, amount); } else { - aReturn.Assign(mText.Get1b() + aStart, amount); + aReturn.AssignWithConversion(mText.Get1b() + aStart, amount); } return NS_OK; @@ -642,15 +642,15 @@ nsGenericDOMDataNode::ToCString(nsString& aBuf, PRInt32 aOffset, while (cp < end) { PRUnichar ch = *cp++; if (ch == '\r') { - aBuf.Append("\\r"); + aBuf.AppendWithConversion("\\r"); } else if (ch == '\n') { - aBuf.Append("\\n"); + aBuf.AppendWithConversion("\\n"); } else if (ch == '\t') { - aBuf.Append("\\t"); + aBuf.AppendWithConversion("\\t"); } else if ((ch < ' ') || (ch >= 127)) { char buf[10]; PR_snprintf(buf, sizeof(buf), "\\u%04x", ch); - aBuf.Append(buf); + aBuf.AppendWithConversion(buf); } else { aBuf.Append(ch); } @@ -662,15 +662,15 @@ nsGenericDOMDataNode::ToCString(nsString& aBuf, PRInt32 aOffset, while (cp < end) { PRUnichar ch = *cp++; if (ch == '\r') { - aBuf.Append("\\r"); + aBuf.AppendWithConversion("\\r"); } else if (ch == '\n') { - aBuf.Append("\\n"); + aBuf.AppendWithConversion("\\n"); } else if (ch == '\t') { - aBuf.Append("\\t"); + aBuf.AppendWithConversion("\\t"); } else if ((ch < ' ') || (ch >= 127)) { char buf[10]; PR_snprintf(buf, sizeof(buf), "\\u%04x", ch); - aBuf.Append(buf); + aBuf.AppendWithConversion(buf); } else { aBuf.Append(ch); } @@ -971,7 +971,7 @@ nsGenericDOMDataNode::CopyText(nsString& aResult) aResult.Assign(mText.Get2b(), mText.GetLength()); } else { - aResult.Assign(mText.Get1b(), mText.GetLength()); + aResult.AssignWithConversion(mText.Get1b(), mText.GetLength()); } return NS_OK; } diff --git a/mozilla/layout/base/src/nsNameSpaceManager.cpp b/mozilla/layout/base/src/nsNameSpaceManager.cpp index eba5dabc22e..19ecacb2bfa 100644 --- a/mozilla/layout/base/src/nsNameSpaceManager.cpp +++ b/mozilla/layout/base/src/nsNameSpaceManager.cpp @@ -108,11 +108,11 @@ static void AddRefTable() gURIToIDTable = new nsHashtable(); gURIArray = new nsVoidArray(); - nsString* xmlns = new nsString(kXMLNSNameSpaceURI); - nsString* xml = new nsString(kXMLNameSpaceURI); - nsString* html = new nsString(kHTMLNameSpaceURI); - nsString* xhtml = new nsString(kXHTMLNameSpaceURI); - nsString* xlink = new nsString(kXLinkNameSpaceURI); + nsString* xmlns = new nsString( NS_ConvertToString(kXMLNSNameSpaceURI) ); + nsString* xml = new nsString( NS_ConvertToString(kXMLNameSpaceURI) ); + nsString* html = new nsString( NS_ConvertToString(kHTMLNameSpaceURI) ); + nsString* xhtml = new nsString( NS_ConvertToString(kXHTMLNameSpaceURI) ); + nsString* xlink = new nsString( NS_ConvertToString(kXLinkNameSpaceURI) ); gURIArray->AppendElement(xmlns); // ordering here needs to match IDs gURIArray->AppendElement(xml); gURIArray->AppendElement(html); diff --git a/mozilla/layout/base/src/nsPluginViewer.cpp b/mozilla/layout/base/src/nsPluginViewer.cpp index c4c9e0fe3fd..f96eb8b3392 100644 --- a/mozilla/layout/base/src/nsPluginViewer.cpp +++ b/mozilla/layout/base/src/nsPluginViewer.cpp @@ -362,7 +362,7 @@ PluginViewerImpl::CreatePlugin(nsIPluginHost* aHost, const nsRect& aBounds, rv = uri->GetSpec(&spec); NS_RELEASE(uri); if (NS_FAILED(rv)) return rv; - nsAutoString str(spec); + nsAutoString str; str.AssignWithConversion(spec); nsCRT::free(spec); char* ct; @@ -803,11 +803,11 @@ NS_IMETHODIMP pluginInstanceOwner :: GetURL(const char *aURL, const char *aTarge // Create an absolute URL char* absURIStr; rv = NS_MakeAbsoluteURI(&absURIStr, aURL, uri); - nsAutoString fullurl(absURIStr); + nsAutoString fullurl; fullurl.AssignWithConversion(absURIStr); nsCRT::free(absURIStr); if (NS_OK == rv) { - nsAutoString unitarget = nsAutoString(aTarget); + nsAutoString unitarget; unitarget.AssignWithConversion(aTarget); rv = lh->OnLinkClick(nsnull, eLinkVerb_Replace, fullurl.GetUnicode(), unitarget.GetUnicode(), nsnull); } } @@ -845,7 +845,7 @@ NS_IMETHODIMP pluginInstanceOwner :: ShowStatus(const char *aStatusMsg) if(browserChrome) { - nsAutoString msg = nsAutoString(aStatusMsg); + nsAutoString msg; msg.AssignWithConversion(aStatusMsg); browserChrome->SetJSStatus(msg.GetUnicode()); } } diff --git a/mozilla/layout/base/src/nsPresContext.cpp b/mozilla/layout/base/src/nsPresContext.cpp index d668bb8bb6d..5bdc56b68df 100644 --- a/mozilla/layout/base/src/nsPresContext.cpp +++ b/mozilla/layout/base/src/nsPresContext.cpp @@ -149,12 +149,12 @@ nsPresContext::GetFontPreferences() char* value = nsnull; mPrefs->CopyCharPref("font.default", &value); if (value) { - mDefaultFont.name = value; + mDefaultFont.name.AssignWithConversion(value); nsAllocator::Free(value); value = nsnull; } if (mLangGroup) { - nsAutoString pref("font.size.variable."); + nsAutoString pref; pref.AssignWithConversion("font.size.variable."); const PRUnichar* langGroup = nsnull; mLangGroup->GetUnicode(&langGroup); pref.Append(langGroup); @@ -162,7 +162,7 @@ nsPresContext::GetFontPreferences() pref.ToCString(name, sizeof(name)); PRInt32 variableSize = 16; mPrefs->GetIntPref(name, &variableSize); - pref = "font.size.fixed."; + pref.AssignWithConversion("font.size.fixed."); pref.Append(langGroup); pref.ToCString(name, sizeof(name)); PRInt32 fixedSize = 13; diff --git a/mozilla/layout/base/src/nsPresState.cpp b/mozilla/layout/base/src/nsPresState.cpp index 5603d353e08..3f3d8923216 100644 --- a/mozilla/layout/base/src/nsPresState.cpp +++ b/mozilla/layout/base/src/nsPresState.cpp @@ -70,7 +70,7 @@ nsPresState::GetStateProperty(const nsString& aName, nsString& aResult) aResult = data; nsAllocator::Free(data); } else { - aResult = ""; + aResult.SetLength(0); } return NS_OK; } diff --git a/mozilla/layout/base/src/nsRange.cpp b/mozilla/layout/base/src/nsRange.cpp index ac9d4052367..bd20dff7865 100644 --- a/mozilla/layout/base/src/nsRange.cpp +++ b/mozilla/layout/base/src/nsRange.cpp @@ -1862,7 +1862,7 @@ nsRange::CreateContextualFragment(const nsString& aFragment, } else { // Who're we kidding. This only works for html. - contentType.Assign("text/html"); + contentType.AssignWithConversion("text/html"); } result = parser->ParseFragment(aFragment, (void*)0, diff --git a/mozilla/layout/base/src/nsSelection.cpp b/mozilla/layout/base/src/nsSelection.cpp index 9ef2ad73f15..27d81c1c97e 100644 --- a/mozilla/layout/base/src/nsSelection.cpp +++ b/mozilla/layout/base/src/nsSelection.cpp @@ -1380,16 +1380,16 @@ nsDOMSelection::ToString(nsString& aReturn) { PRInt32 cnt; GetRangeCount(&cnt); - aReturn = "nsSelection: "; + aReturn.AssignWithConversion("nsSelection: "); aReturn += cnt; - aReturn += " items\n"; + aReturn.AppendWithConversion(" items\n"); // Get an iterator nsSelectionIterator iter(this); nsresult res = iter.First(); if (!NS_SUCCEEDED(res)) { - aReturn += " Can't get an iterator\n"; + aReturn.AppendWithConversion(" Can't get an iterator\n"); return NS_ERROR_FAILURE; } @@ -1399,7 +1399,7 @@ nsDOMSelection::ToString(nsString& aReturn) res = iter.CurrentItem(NS_STATIC_CAST(nsIDOMRange**, getter_AddRefs(range))); if (!NS_SUCCEEDED(res)) { - aReturn += " OOPS\n"; + aReturn.AppendWithConversion(" OOPS\n"); return NS_ERROR_FAILURE; } nsString rangeStr; @@ -1408,16 +1408,16 @@ nsDOMSelection::ToString(nsString& aReturn) iter.Next(); } - aReturn += "Anchor is "; + aReturn.AppendWithConversion("Anchor is "); PRInt32 theInt = (PRInt32)(nsIDOMNode*)FetchAnchorNode(); - aReturn.Append(theInt); - aReturn += ", "; + aReturn.AppendWithConversion(theInt); + aReturn.AppendWithConversion(", "); aReturn += FetchAnchorOffset(); - aReturn += "Focus is"; - aReturn.Append((long)(nsIDOMNode*)FetchFocusNode(), 16); - aReturn += ", "; + aReturn.AppendWithConversion("Focus is"); + aReturn.AppendWithConversion((long)(nsIDOMNode*)FetchFocusNode(), 16); + aReturn.AppendWithConversion(", "); aReturn += FetchFocusOffset(); - aReturn += "\n ... end of selection\n"; + aReturn.AppendWithConversion("\n ... end of selection\n"); return NS_OK; } diff --git a/mozilla/layout/base/src/nsStyleCoord.cpp b/mozilla/layout/base/src/nsStyleCoord.cpp index 0d3a98d6c30..65d7dcd5ab8 100644 --- a/mozilla/layout/base/src/nsStyleCoord.cpp +++ b/mozilla/layout/base/src/nsStyleCoord.cpp @@ -189,24 +189,24 @@ void nsStyleCoord::AppendToString(nsString& aBuffer) const (eStyleUnit_Proportional == mUnit) || (eStyleUnit_Enumerated == mUnit) || (eStyleUnit_Integer == mUnit)) { - aBuffer.Append(mValue.mInt, 10); - aBuffer.Append("[0x"); - aBuffer.Append(mValue.mInt, 16); - aBuffer.Append(']'); + aBuffer.AppendWithConversion(mValue.mInt, 10); + aBuffer.AppendWithConversion("[0x"); + aBuffer.AppendWithConversion(mValue.mInt, 16); + aBuffer.AppendWithConversion(']'); } switch (mUnit) { - case eStyleUnit_Null: aBuffer.Append("Null"); break; - case eStyleUnit_Coord: aBuffer.Append("tw"); break; - case eStyleUnit_Percent: aBuffer.Append("%"); break; - case eStyleUnit_Factor: aBuffer.Append("f"); break; - case eStyleUnit_Normal: aBuffer.Append("Normal"); break; - case eStyleUnit_Auto: aBuffer.Append("Auto"); break; - case eStyleUnit_Inherit: aBuffer.Append("Inherit"); break; - case eStyleUnit_Proportional: aBuffer.Append("*"); break; - case eStyleUnit_Enumerated: aBuffer.Append("enum"); break; - case eStyleUnit_Integer: aBuffer.Append("int"); break; - case eStyleUnit_Chars: aBuffer.Append("chars"); break; + case eStyleUnit_Null: aBuffer.AppendWithConversion("Null"); break; + case eStyleUnit_Coord: aBuffer.AppendWithConversion("tw"); break; + case eStyleUnit_Percent: aBuffer.AppendWithConversion("%"); break; + case eStyleUnit_Factor: aBuffer.AppendWithConversion("f"); break; + case eStyleUnit_Normal: aBuffer.AppendWithConversion("Normal"); break; + case eStyleUnit_Auto: aBuffer.AppendWithConversion("Auto"); break; + case eStyleUnit_Inherit: aBuffer.AppendWithConversion("Inherit"); break; + case eStyleUnit_Proportional: aBuffer.AppendWithConversion("*"); break; + case eStyleUnit_Enumerated: aBuffer.AppendWithConversion("enum"); break; + case eStyleUnit_Integer: aBuffer.AppendWithConversion("int"); break; + case eStyleUnit_Chars: aBuffer.AppendWithConversion("chars"); break; } aBuffer.Append(' '); } @@ -260,19 +260,19 @@ void nsStyleSides::AppendToString(nsString& aBuffer) const nsStyleCoord temp; GetLeft(temp); - aBuffer.Append("left: "); + aBuffer.AppendWithConversion("left: "); temp.AppendToString(aBuffer); GetTop(temp); - aBuffer.Append("top: "); + aBuffer.AppendWithConversion("top: "); temp.AppendToString(aBuffer); GetRight(temp); - aBuffer.Append("right: "); + aBuffer.AppendWithConversion("right: "); temp.AppendToString(aBuffer); GetBottom(temp); - aBuffer.Append("bottom: "); + aBuffer.AppendWithConversion("bottom: "); temp.AppendToString(aBuffer); } diff --git a/mozilla/layout/base/src/nsTextFragment.cpp b/mozilla/layout/base/src/nsTextFragment.cpp index e752e5f6588..43ea0a63c3b 100644 --- a/mozilla/layout/base/src/nsTextFragment.cpp +++ b/mozilla/layout/base/src/nsTextFragment.cpp @@ -198,7 +198,7 @@ nsTextFragment::AppendTo(nsString& aString) const aString.Append(m2b, mState.mLength); } else { - aString.Append((char*)m1b, mState.mLength); + aString.AppendWithConversion((char*)m1b, mState.mLength); } } diff --git a/mozilla/layout/base/src/nsTextNode.cpp b/mozilla/layout/base/src/nsTextNode.cpp index 9c4a4748f35..2d294d8d18e 100644 --- a/mozilla/layout/base/src/nsTextNode.cpp +++ b/mozilla/layout/base/src/nsTextNode.cpp @@ -130,7 +130,7 @@ nsTextNode::GetTag(nsIAtom*& aResult) const NS_IMETHODIMP nsTextNode::GetNodeName(nsString& aNodeName) { - aNodeName.Assign("#text"); + aNodeName.AssignWithConversion("#text"); return NS_OK; } diff --git a/mozilla/layout/base/src/nsXIFConverter.cpp b/mozilla/layout/base/src/nsXIFConverter.cpp index f051ce6d5fd..bd21d301233 100644 --- a/mozilla/layout/base/src/nsXIFConverter.cpp +++ b/mozilla/layout/base/src/nsXIFConverter.cpp @@ -34,36 +34,36 @@ nsXIFConverter::nsXIFConverter(nsString& aBuffer) char* prolog = "\n"; char* doctype = "\n"; - mBuffer.Append(prolog); - mBuffer.Append(doctype); + mBuffer.AppendWithConversion(prolog); + mBuffer.AppendWithConversion(doctype); - mAttr = "attr"; - mName = "name"; - mValue = "value"; + mAttr.AssignWithConversion("attr"); + mName.AssignWithConversion("name"); + mValue.AssignWithConversion("value"); - mContent = "content"; - mComment = "comment"; - mContainer = "container"; - mLeaf = "leaf"; - mIsa = "isa"; - mEntity = "entity"; + mContent.AssignWithConversion("content"); + mComment.AssignWithConversion("comment"); + mContainer.AssignWithConversion("container"); + mLeaf.AssignWithConversion("leaf"); + mIsa.AssignWithConversion("isa"); + mEntity.AssignWithConversion("entity"); - mSelector = "css_selector"; - mRule = "css_rule"; - mSheet = "css_stylesheet"; + mSelector.AssignWithConversion("css_selector"); + mRule.AssignWithConversion("css_rule"); + mSheet.AssignWithConversion("css_stylesheet"); - mNULL = "?NULL"; - mSpacing = " "; - mSpace = (char)' '; - mLT = (char)'<'; - mGT = (char)'>'; - mLF = (char)'\n'; - mSlash = (char)'/'; - mBeginComment = ""; - mQuote =(char)'\"'; - mEqual =(char)'='; - mMarkupDeclarationOpen="markup_declaration"; + mNULL.AssignWithConversion("?NULL"); + mSpacing.AssignWithConversion(" "); + mSpace.AssignWithConversion((char)' '); + mLT.AssignWithConversion((char)'<'); + mGT.AssignWithConversion((char)'>'); + mLF.AssignWithConversion((char)'\n'); + mSlash.AssignWithConversion((char)'/'); + mBeginComment.AssignWithConversion(""); + mQuote.AssignWithConversion((char)'\"'); + mEqual.AssignWithConversion((char)'='); + mMarkupDeclarationOpen.AssignWithConversion("markup_declaration"); mSelection = nsnull; } @@ -80,16 +80,16 @@ nsXIFConverter::~nsXIFConverter() void nsXIFConverter::SetSelection(nsIDOMSelection* aSelection) { mSelection = aSelection; - BeginStartTag("encode"); + BeginStartTag( NS_ConvertToString("encode") ); if (mSelection == nsnull) { - AddAttribute("selection","0"); + AddAttribute( NS_ConvertToString("selection"), NS_ConvertToString("0") ); } else { - AddAttribute("selection","1"); + AddAttribute( NS_ConvertToString("selection"), NS_ConvertToString("1") ); } - FinishStartTag("encode",PR_TRUE,PR_TRUE); + FinishStartTag(NS_ConvertToString("encode"),PR_TRUE,PR_TRUE); } @@ -265,9 +265,9 @@ PRBool nsXIFConverter::AddMarkupEntity(const PRUnichar aChar) switch (aChar) { - case '<': data = "lt"; break; - case '>': data = "gt"; break; - case '&': data = "amp"; break; + case '<': data.AssignWithConversion("lt"); break; + case '>': data.AssignWithConversion("gt"); break; + case '&': data.AssignWithConversion("amp"); break; default: result = PR_FALSE; break; @@ -464,35 +464,35 @@ void nsXIFConverter::EndCSSSelectors() void nsXIFConverter::AddCSSSelectors(const nsString& aSelectors) { - AddAttribute(nsString("selectors"),aSelectors); + AddAttribute(NS_ConvertToString("selectors"),aSelectors); } void nsXIFConverter::BeginCSSDeclarationList() { - AddStartTag(nsString("css_declaration_list")); + AddStartTag(NS_ConvertToString("css_declaration_list")); } void nsXIFConverter::EndCSSDeclarationList() { - AddEndTag(nsString("css_declaration_list"),PR_TRUE); + AddEndTag(NS_ConvertToString("css_declaration_list"),PR_TRUE); } void nsXIFConverter::BeginCSSDeclaration() { - BeginStartTag(nsString("css_declaration")); + BeginStartTag(NS_ConvertToString("css_declaration")); } void nsXIFConverter::AddCSSDeclaration(const nsString& aName, const nsString& aValue) { - AddAttribute(nsString("property"),aName); - AddAttribute(nsString("value"),aValue); + AddAttribute(NS_ConvertToString("property"),aName); + AddAttribute(NS_ConvertToString("value"),aValue); } void nsXIFConverter::EndCSSDeclaration() { - FinishStartTag(nsString("css_declaration"),PR_TRUE); + FinishStartTag(NS_ConvertToString("css_declaration"),PR_TRUE); } #ifdef DEBUG_XIF diff --git a/mozilla/layout/build/nsLayoutModule.cpp b/mozilla/layout/build/nsLayoutModule.cpp index 9c2f3453a12..7410362b670 100644 --- a/mozilla/layout/build/nsLayoutModule.cpp +++ b/mozilla/layout/build/nsLayoutModule.cpp @@ -137,7 +137,7 @@ LayoutScriptNameSet::AddNameSet(nsIScriptContext* aScriptContext) result = aScriptContext->GetNameSpaceManager(&manager); if (NS_OK == result) { - result = manager->RegisterGlobalName("HTMLImageElement", + result = manager->RegisterGlobalName(NS_ConvertToString("HTMLImageElement"), kHTMLImageElementCID, PR_TRUE); if (NS_FAILED(result)) { @@ -145,7 +145,7 @@ LayoutScriptNameSet::AddNameSet(nsIScriptContext* aScriptContext) return result; } - result = manager->RegisterGlobalName("HTMLOptionElement", + result = manager->RegisterGlobalName(NS_ConvertToString("HTMLOptionElement"), kHTMLOptionElementCID, PR_TRUE); if (NS_FAILED(result)) { diff --git a/mozilla/layout/events/src/nsDOMEvent.cpp b/mozilla/layout/events/src/nsDOMEvent.cpp index 849f27c68b7..e96fdf91657 100644 --- a/mozilla/layout/events/src/nsDOMEvent.cpp +++ b/mozilla/layout/events/src/nsDOMEvent.cpp @@ -111,7 +111,7 @@ NS_METHOD nsDOMEvent::GetType(nsString& aType) const char* mName = GetEventName(mEvent->message); if (nsnull != mName) { - aType = mName; + aType.AssignWithConversion(mName); return NS_OK; } diff --git a/mozilla/layout/events/src/nsEventListenerManager.cpp b/mozilla/layout/events/src/nsEventListenerManager.cpp index 219386c3759..af572b69bdd 100644 --- a/mozilla/layout/events/src/nsEventListenerManager.cpp +++ b/mozilla/layout/events/src/nsEventListenerManager.cpp @@ -433,7 +433,7 @@ nsresult nsEventListenerManager::AddEventListenerByType(nsIDOMEventListener *aLi { PRInt32 subType; nsIID iid; - nsAutoString str("on"); + nsAutoString str; str.AssignWithConversion("on"); nsIAtom* atom; str.Append(aType); @@ -454,7 +454,7 @@ nsresult nsEventListenerManager::RemoveEventListenerByType(nsIDOMEventListener * PRInt32 subType; nsIID iid; - nsAutoString str("on"); + nsAutoString str; str.AssignWithConversion("on"); nsIAtom* atom; str.Append(aType); @@ -651,7 +651,7 @@ nsEventListenerManager::HandleEventSubType(nsListenerStruct* aListenerStruct, if (NS_SUCCEEDED(result)) { nsAutoString eventString; if (NS_SUCCEEDED(aDOMEvent->GetType(eventString))) { - eventString.Insert("on", 0, 2); + eventString.InsertWithConversion("on", 0, 2); nsCOMPtr atom = getter_AddRefs(NS_NewAtom(eventString)); nsCOMPtr handlerOwner = do_QueryInterface(owner); diff --git a/mozilla/layout/events/src/nsEventStateManager.cpp b/mozilla/layout/events/src/nsEventStateManager.cpp index d5ef23b53e1..8ee9a434c7c 100644 --- a/mozilla/layout/events/src/nsEventStateManager.cpp +++ b/mozilla/layout/events/src/nsEventStateManager.cpp @@ -134,7 +134,7 @@ nsEventStateManager::Init() NS_OBSERVERSERVICE_PROGID, &rv); if (NS_SUCCEEDED(rv)) { - nsAutoString topic(NS_XPCOM_SHUTDOWN_OBSERVER_ID); + nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); observerService->AddObserver(this, topic.GetUnicode()); } @@ -181,7 +181,7 @@ nsEventStateManager::~nsEventStateManager() NS_OBSERVERSERVICE_PROGID, &rv); if (NS_SUCCEEDED(rv)) { - nsAutoString topic(NS_XPCOM_SHUTDOWN_OBSERVER_ID); + nsAutoString topic; topic.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); observerService->RemoveObserver(this, topic.GetUnicode()); } } @@ -219,7 +219,7 @@ NS_IMETHODIMP nsEventStateManager::Observe(nsISupports *aSubject, const PRUnichar *aTopic, const PRUnichar *someData) { nsAutoString topicString(aTopic); - nsAutoString shutdownString(NS_XPCOM_SHUTDOWN_OBSERVER_ID); + nsAutoString shutdownString; shutdownString.AssignWithConversion(NS_XPCOM_SHUTDOWN_OBSERVER_ID); if (topicString == shutdownString) Shutdown(); @@ -1811,7 +1811,7 @@ nsEventStateManager::GetNextTabbableContent(nsIContent* aParent, nsIContent* aCh if (focusable) { nsAutoString value; child->GetAttribute(kNameSpaceID_None, nsHTMLAtoms::disabled, value); - if (!value.Equals("true")) + if (!value.EqualsWithConversion("true")) disabled = PR_FALSE; } } diff --git a/mozilla/layout/generic/nsFrameUtil.cpp b/mozilla/layout/generic/nsFrameUtil.cpp index 1a56f25cda5..8f867440e9f 100644 --- a/mozilla/layout/generic/nsFrameUtil.cpp +++ b/mozilla/layout/generic/nsFrameUtil.cpp @@ -440,16 +440,16 @@ nsFrameUtil::Tag::ToString(nsString& aResult) if (type == close) { aResult.Append(PRUnichar('/')); } - aResult.Append(name); + aResult.AppendWithConversion(name); if (0 != num) { PRInt32 i, n = num; for (i = 0; i < n; i++) { aResult.Append(PRUnichar(' ')); - aResult.Append(attributes[i]); + aResult.AppendWithConversion(attributes[i]); if (values[i]) { - aResult.Append("=\""); - aResult.Append(values[i]); - aResult.Append('\"'); + aResult.AppendWithConversion("=\""); + aResult.AppendWithConversion(values[i]); + aResult.AppendWithConversion('\"'); } } } diff --git a/mozilla/layout/generic/nsSelection.cpp b/mozilla/layout/generic/nsSelection.cpp index 9ef2ad73f15..27d81c1c97e 100644 --- a/mozilla/layout/generic/nsSelection.cpp +++ b/mozilla/layout/generic/nsSelection.cpp @@ -1380,16 +1380,16 @@ nsDOMSelection::ToString(nsString& aReturn) { PRInt32 cnt; GetRangeCount(&cnt); - aReturn = "nsSelection: "; + aReturn.AssignWithConversion("nsSelection: "); aReturn += cnt; - aReturn += " items\n"; + aReturn.AppendWithConversion(" items\n"); // Get an iterator nsSelectionIterator iter(this); nsresult res = iter.First(); if (!NS_SUCCEEDED(res)) { - aReturn += " Can't get an iterator\n"; + aReturn.AppendWithConversion(" Can't get an iterator\n"); return NS_ERROR_FAILURE; } @@ -1399,7 +1399,7 @@ nsDOMSelection::ToString(nsString& aReturn) res = iter.CurrentItem(NS_STATIC_CAST(nsIDOMRange**, getter_AddRefs(range))); if (!NS_SUCCEEDED(res)) { - aReturn += " OOPS\n"; + aReturn.AppendWithConversion(" OOPS\n"); return NS_ERROR_FAILURE; } nsString rangeStr; @@ -1408,16 +1408,16 @@ nsDOMSelection::ToString(nsString& aReturn) iter.Next(); } - aReturn += "Anchor is "; + aReturn.AppendWithConversion("Anchor is "); PRInt32 theInt = (PRInt32)(nsIDOMNode*)FetchAnchorNode(); - aReturn.Append(theInt); - aReturn += ", "; + aReturn.AppendWithConversion(theInt); + aReturn.AppendWithConversion(", "); aReturn += FetchAnchorOffset(); - aReturn += "Focus is"; - aReturn.Append((long)(nsIDOMNode*)FetchFocusNode(), 16); - aReturn += ", "; + aReturn.AppendWithConversion("Focus is"); + aReturn.AppendWithConversion((long)(nsIDOMNode*)FetchFocusNode(), 16); + aReturn.AppendWithConversion(", "); aReturn += FetchFocusOffset(); - aReturn += "\n ... end of selection\n"; + aReturn.AppendWithConversion("\n ... end of selection\n"); return NS_OK; } diff --git a/mozilla/layout/html/style/src/nsCSSLoader.cpp b/mozilla/layout/html/style/src/nsCSSLoader.cpp index b242f2e924d..a8809691365 100644 --- a/mozilla/layout/html/style/src/nsCSSLoader.cpp +++ b/mozilla/layout/html/style/src/nsCSSLoader.cpp @@ -605,7 +605,7 @@ SheetLoadData::OnStreamComplete(nsIStreamLoader* aLoader, PRUint32 stringLen, const char* string) { - nsString aStyleData(string, stringLen); + nsString aStyleData; aStyleData.AssignWithConversion(string, stringLen); mLoader->DidLoadStyle(aLoader, aStyleData, this, aStatus); // We added a reference when the loader was created. This diff --git a/mozilla/layout/style/nsCSSLoader.cpp b/mozilla/layout/style/nsCSSLoader.cpp index b242f2e924d..a8809691365 100644 --- a/mozilla/layout/style/nsCSSLoader.cpp +++ b/mozilla/layout/style/nsCSSLoader.cpp @@ -605,7 +605,7 @@ SheetLoadData::OnStreamComplete(nsIStreamLoader* aLoader, PRUint32 stringLen, const char* string) { - nsString aStyleData(string, stringLen); + nsString aStyleData; aStyleData.AssignWithConversion(string, stringLen); mLoader->DidLoadStyle(aLoader, aStyleData, this, aStatus); // We added a reference when the loader was created. This diff --git a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp index c4c9e0fe3fd..f96eb8b3392 100644 --- a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp @@ -362,7 +362,7 @@ PluginViewerImpl::CreatePlugin(nsIPluginHost* aHost, const nsRect& aBounds, rv = uri->GetSpec(&spec); NS_RELEASE(uri); if (NS_FAILED(rv)) return rv; - nsAutoString str(spec); + nsAutoString str; str.AssignWithConversion(spec); nsCRT::free(spec); char* ct; @@ -803,11 +803,11 @@ NS_IMETHODIMP pluginInstanceOwner :: GetURL(const char *aURL, const char *aTarge // Create an absolute URL char* absURIStr; rv = NS_MakeAbsoluteURI(&absURIStr, aURL, uri); - nsAutoString fullurl(absURIStr); + nsAutoString fullurl; fullurl.AssignWithConversion(absURIStr); nsCRT::free(absURIStr); if (NS_OK == rv) { - nsAutoString unitarget = nsAutoString(aTarget); + nsAutoString unitarget; unitarget.AssignWithConversion(aTarget); rv = lh->OnLinkClick(nsnull, eLinkVerb_Replace, fullurl.GetUnicode(), unitarget.GetUnicode(), nsnull); } } @@ -845,7 +845,7 @@ NS_IMETHODIMP pluginInstanceOwner :: ShowStatus(const char *aStatusMsg) if(browserChrome) { - nsAutoString msg = nsAutoString(aStatusMsg); + nsAutoString msg; msg.AssignWithConversion(aStatusMsg); browserChrome->SetJSStatus(msg.GetUnicode()); } } diff --git a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp index c4c9e0fe3fd..f96eb8b3392 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp @@ -362,7 +362,7 @@ PluginViewerImpl::CreatePlugin(nsIPluginHost* aHost, const nsRect& aBounds, rv = uri->GetSpec(&spec); NS_RELEASE(uri); if (NS_FAILED(rv)) return rv; - nsAutoString str(spec); + nsAutoString str; str.AssignWithConversion(spec); nsCRT::free(spec); char* ct; @@ -803,11 +803,11 @@ NS_IMETHODIMP pluginInstanceOwner :: GetURL(const char *aURL, const char *aTarge // Create an absolute URL char* absURIStr; rv = NS_MakeAbsoluteURI(&absURIStr, aURL, uri); - nsAutoString fullurl(absURIStr); + nsAutoString fullurl; fullurl.AssignWithConversion(absURIStr); nsCRT::free(absURIStr); if (NS_OK == rv) { - nsAutoString unitarget = nsAutoString(aTarget); + nsAutoString unitarget; unitarget.AssignWithConversion(aTarget); rv = lh->OnLinkClick(nsnull, eLinkVerb_Replace, fullurl.GetUnicode(), unitarget.GetUnicode(), nsnull); } } @@ -845,7 +845,7 @@ NS_IMETHODIMP pluginInstanceOwner :: ShowStatus(const char *aStatusMsg) if(browserChrome) { - nsAutoString msg = nsAutoString(aStatusMsg); + nsAutoString msg; msg.AssignWithConversion(aStatusMsg); browserChrome->SetJSStatus(msg.GetUnicode()); } }