From 1bd57cb94b126e05e4b9ec1bfe87b217de8a2a03 Mon Sep 17 00:00:00 2001 From: "rickg%netscape.com" Date: Sun, 12 Mar 2000 09:14:14 +0000 Subject: [PATCH] removed calls to deprecated string methods git-svn-id: svn://10.0.0.236/trunk@62707 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsCommentNode.cpp | 2 +- mozilla/content/base/src/nsDocument.cpp | 6 +- .../content/base/src/nsDocumentFragment.cpp | 2 +- .../content/base/src/nsGenericDOMDataNode.cpp | 12 +-- mozilla/content/base/src/nsGenericElement.cpp | 4 +- mozilla/content/base/src/nsRange.cpp | 2 +- mozilla/content/base/src/nsTextNode.cpp | 2 +- .../html/content/src/nsAttributeContent.cpp | 4 +- .../html/content/src/nsHTMLButtonElement.cpp | 2 +- .../html/content/src/nsHTMLImageElement.cpp | 2 +- .../html/content/src/nsHTMLSelectElement.cpp | 4 +- .../content/src/nsHTMLTextAreaElement.cpp | 2 +- .../html/document/src/nsHTMLContentSink.cpp | 8 +- .../html/document/src/nsHTMLDocument.cpp | 8 +- .../content/html/style/src/nsCSSParser.cpp | 6 +- .../html/style/src/nsDOMCSSDeclaration.cpp | 2 +- mozilla/content/xbl/src/nsXBLBinding.cpp | 4 +- .../xml/content/src/nsXMLCDATASection.cpp | 2 +- .../xul/content/src/nsXULAttributes.cpp | 4 +- .../xul/document/src/nsXULDocument.cpp | 4 +- mozilla/docshell/base/nsDocShell.cpp | 2 +- mozilla/docshell/base/nsWebShell.cpp | 2 +- mozilla/dom/src/base/nsDOMException.cpp | 6 +- mozilla/dom/src/base/nsGlobalWindow.cpp | 26 ++--- mozilla/dom/src/base/nsHistory.cpp | 8 +- mozilla/dom/src/base/nsJSEnvironment.cpp | 4 +- mozilla/dom/src/base/nsJSMimeTypeArray.cpp | 4 +- mozilla/dom/src/base/nsJSPlugin.cpp | 4 +- mozilla/dom/src/base/nsJSPluginArray.cpp | 4 +- mozilla/dom/src/base/nsJSUtils.cpp | 2 +- mozilla/dom/src/base/nsJSWindowCollection.cpp | 4 +- mozilla/dom/src/base/nsLocation.cpp | 14 +-- mozilla/dom/src/html/nsJSHTMLCollection.cpp | 4 +- mozilla/dom/src/html/nsJSHTMLDocument.cpp | 4 +- .../dom/src/html/nsJSHTMLSelectElement.cpp | 4 +- .../src/html/nsJSNSHTMLOptionCollection.cpp | 4 +- mozilla/editor/base/nsEditor.cpp | 8 +- mozilla/editor/libeditor/base/nsEditor.cpp | 8 +- mozilla/gfx/src/nsColorNames.cpp | 17 +++- mozilla/gfx/src/windows/nsFontMetricsWin.cpp | 4 +- mozilla/htmlparser/src/CRtfDTD.cpp | 10 +- mozilla/htmlparser/src/nsExpatTokenizer.cpp | 10 +- mozilla/htmlparser/src/nsHTMLEntities.cpp | 9 +- mozilla/htmlparser/src/nsHTMLEntities.h | 6 +- mozilla/htmlparser/src/nsHTMLTags.cpp | 25 ++++- mozilla/htmlparser/src/nsHTMLTags.h | 5 +- .../htmlparser/src/nsHTMLToTXTSinkStream.cpp | 12 +-- mozilla/htmlparser/src/nsHTMLTokenizer.cpp | 8 +- mozilla/htmlparser/src/nsHTMLTokens.cpp | 14 +-- mozilla/htmlparser/src/nsScanner.cpp | 99 +------------------ mozilla/htmlparser/src/nsScanner.h | 10 +- mozilla/htmlparser/src/nsViewSourceHTML.cpp | 2 +- mozilla/intl/locale/src/nsCollation.cpp | 4 +- .../locale/src/windows/nsCollationWin.cpp | 6 +- .../src/windows/nsDateTimeFormatWin.cpp | 16 +-- .../locale/src/windows/nsDateTimeFormatWin.h | 2 +- mozilla/intl/strres/src/nsStringBundle.cpp | 2 +- .../intl/strres/tests/StringBundleTest.cpp | 2 +- .../unicharutil/src/nsEntityConverter.cpp | 2 +- .../unicharutil/tests/UnicharSelfTest.cpp | 2 +- mozilla/layout/base/src/nsCommentNode.cpp | 2 +- mozilla/layout/base/src/nsDocument.cpp | 6 +- .../layout/base/src/nsDocumentFragment.cpp | 2 +- .../layout/base/src/nsGenericDOMDataNode.cpp | 12 +-- mozilla/layout/base/src/nsGenericElement.cpp | 4 +- mozilla/layout/base/src/nsRange.cpp | 2 +- mozilla/layout/base/src/nsTextNode.cpp | 2 +- mozilla/layout/generic/nsImageMap.cpp | 10 +- mozilla/layout/html/base/src/nsImageMap.cpp | 10 +- .../html/content/src/nsAttributeContent.cpp | 4 +- .../html/content/src/nsHTMLButtonElement.cpp | 2 +- .../html/content/src/nsHTMLImageElement.cpp | 2 +- .../html/content/src/nsHTMLSelectElement.cpp | 4 +- .../content/src/nsHTMLTextAreaElement.cpp | 2 +- .../html/document/src/nsHTMLContentSink.cpp | 8 +- .../html/document/src/nsHTMLDocument.cpp | 8 +- mozilla/layout/html/style/src/nsCSSParser.cpp | 6 +- .../html/style/src/nsDOMCSSDeclaration.cpp | 2 +- mozilla/layout/style/nsCSSParser.cpp | 6 +- mozilla/layout/style/nsDOMCSSDeclaration.cpp | 2 +- mozilla/layout/xbl/src/nsXBLBinding.cpp | 4 +- .../xml/content/src/nsXMLCDATASection.cpp | 2 +- .../mailnews/compose/src/nsMsgCompUtils.cpp | 2 +- mozilla/mailnews/mime/src/mimedrft.cpp | 6 +- mozilla/mailnews/mime/src/mimehdrs.cpp | 32 +++--- mozilla/mailnews/mime/src/mimemrel.cpp | 8 +- mozilla/mailnews/mime/src/mimesun.cpp | 4 +- mozilla/mailnews/mime/src/mimethtm.cpp | 2 +- mozilla/mailnews/mime/src/mimetric.cpp | 4 +- mozilla/mailnews/mime/src/mimeunty.cpp | 6 +- .../mailnews/mime/src/nsMsgHeaderParser.cpp | 36 +++---- .../plugin/base/src/nsPluginHostImpl.cpp | 3 +- .../plugin/nglsrc/nsPluginHostImpl.cpp | 3 +- mozilla/netwerk/base/src/nsSimpleURI.cpp | 2 +- .../ftp/src/nsFtpConnectionThread.cpp | 2 +- .../protocol/http/src/nsHTTPHeaderArray.cpp | 2 +- .../converters/mozTXTToHTMLConv.cpp | 44 ++++----- .../converters/nsFTPDirListingConv.cpp | 26 ++--- .../src/nsStreamConverterService.cpp | 4 +- mozilla/parser/htmlparser/src/CRtfDTD.cpp | 10 +- .../htmlparser/src/nsExpatTokenizer.cpp | 10 +- .../parser/htmlparser/src/nsHTMLEntities.cpp | 9 +- .../parser/htmlparser/src/nsHTMLEntities.h | 6 +- mozilla/parser/htmlparser/src/nsHTMLTags.cpp | 25 ++++- mozilla/parser/htmlparser/src/nsHTMLTags.h | 5 +- .../htmlparser/src/nsHTMLToTXTSinkStream.cpp | 12 +-- .../parser/htmlparser/src/nsHTMLTokenizer.cpp | 8 +- .../parser/htmlparser/src/nsHTMLTokens.cpp | 14 +-- mozilla/parser/htmlparser/src/nsScanner.cpp | 99 +------------------ mozilla/parser/htmlparser/src/nsScanner.h | 10 +- .../htmlparser/src/nsViewSourceHTML.cpp | 2 +- .../pref-migrator/src/nsPrefMigration.cpp | 4 +- mozilla/profile/src/nsProfile.cpp | 8 +- mozilla/rdf/content/src/nsXULAttributes.cpp | 4 +- mozilla/rdf/content/src/nsXULDocument.cpp | 4 +- mozilla/webshell/src/nsWebShell.cpp | 2 +- .../webshell/tests/viewer/nsBrowserWindow.cpp | 4 +- mozilla/widget/src/windows/nsFileWidget.cpp | 6 +- .../src/xpwidgets/nsPrimitiveHelpers.cpp | 4 +- mozilla/xpcom/io/nsFileSpec.cpp | 14 +-- mozilla/xpcom/io/nsLocalFileWin.cpp | 6 +- .../bookmarks/src/nsBookmarksService.cpp | 2 +- .../directory/nsDirectoryViewer.cpp | 8 +- .../components/find/src/nsFindComponent.cpp | 18 ++-- 124 files changed, 462 insertions(+), 581 deletions(-) diff --git a/mozilla/content/base/src/nsCommentNode.cpp b/mozilla/content/base/src/nsCommentNode.cpp index 16b5e4328dd..69fd11369c4 100644 --- a/mozilla/content/base/src/nsCommentNode.cpp +++ b/mozilla/content/base/src/nsCommentNode.cpp @@ -267,7 +267,7 @@ nsCommentNode::GetTag(nsIAtom*& aResult) const NS_IMETHODIMP nsCommentNode::GetNodeName(nsString& aNodeName) { - aNodeName.SetString("#comment"); + aNodeName.Assign("#comment"); return NS_OK; } diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index 61eb6743480..09174192a99 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -2097,7 +2097,7 @@ nsDocument::GetHeight(PRInt32* aHeight) NS_IMETHODIMP nsDocument::GetNodeName(nsString& aNodeName) { - aNodeName.SetString("#document"); + aNodeName.Assign("#document"); return NS_OK; } @@ -2587,9 +2587,9 @@ PRBool nsDocument::SetProperty(JSContext *aContext, JSObject *aObj, jsval aID if (JS_TypeOfValue(aContext, *aVp) == JSTYPE_FUNCTION && JSVAL_IS_STRING(aID)) { nsAutoString mPropName, mPrefix; - mPropName.SetString(JS_GetStringChars(JS_ValueToString(aContext, aID))); + mPropName.Assign(JS_GetStringChars(JS_ValueToString(aContext, aID))); if (mPropName.Length() > 2) - mPrefix.SetString(mPropName.GetUnicode(), 2); + mPrefix.Assign(mPropName.GetUnicode(), 2); if (mPrefix == "on") { nsCOMPtr atom = getter_AddRefs(NS_NewAtom(mPropName)); nsIEventListenerManager *mManager = nsnull; diff --git a/mozilla/content/base/src/nsDocumentFragment.cpp b/mozilla/content/base/src/nsDocumentFragment.cpp index 11e17f21dad..58b78f251eb 100644 --- a/mozilla/content/base/src/nsDocumentFragment.cpp +++ b/mozilla/content/base/src/nsDocumentFragment.cpp @@ -298,7 +298,7 @@ nsDocumentFragment::QueryInterface(REFNSIID aIID, void** aInstancePtr) NS_IMETHODIMP nsDocumentFragment::GetNodeName(nsString& aNodeName) { - aNodeName.SetString("#document-fragment"); + aNodeName.Assign("#document-fragment"); return NS_OK; } diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp index c1d1c249fe0..84f9c1f90ef 100644 --- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp +++ b/mozilla/content/base/src/nsGenericDOMDataNode.cpp @@ -240,10 +240,10 @@ nsresult nsGenericDOMDataNode::GetData(nsString& aData) { if (mText.Is2b()) { - aData.SetString(mText.Get2b(), mText.GetLength()); + aData.Assign(mText.Get2b(), mText.GetLength()); } else { - aData.SetString(mText.Get1b(), mText.GetLength()); + aData.Assign(mText.Get1b(), mText.GetLength()); } return NS_OK; } @@ -297,10 +297,10 @@ nsGenericDOMDataNode::SubstringData(PRUint32 aStart, amount = textLength - aStart; } if (mText.Is2b()) { - aReturn.SetString(mText.Get2b() + aStart, amount); + aReturn.Assign(mText.Get2b() + aStart, amount); } else { - aReturn.SetString(mText.Get1b() + aStart, amount); + aReturn.Assign(mText.Get1b() + aStart, amount); } return NS_OK; @@ -993,10 +993,10 @@ nsresult nsGenericDOMDataNode::CopyText(nsString& aResult) { if (mText.Is2b()) { - aResult.SetString(mText.Get2b(), mText.GetLength()); + aResult.Assign(mText.Get2b(), mText.GetLength()); } else { - aResult.SetString(mText.Get1b(), mText.GetLength()); + aResult.Assign(mText.Get1b(), mText.GetLength()); } return NS_OK; } diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index 2333d69bbdc..f053fc1bef0 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/content/base/src/nsGenericElement.cpp @@ -1347,9 +1347,9 @@ nsGenericElement::SetProperty(JSContext *aContext, JSObject *aObj, jsval aID, js if (JS_TypeOfValue(aContext, *aVp) == JSTYPE_FUNCTION && JSVAL_IS_STRING(aID)) { nsAutoString propName, prefix; - propName.SetString(JS_GetStringChars(JS_ValueToString(aContext, aID))); + propName.Assign(JS_GetStringChars(JS_ValueToString(aContext, aID))); if (propName.Length() > 2) - prefix.SetString(propName.GetUnicode(), 2); + prefix.Assign(propName.GetUnicode(), 2); if (prefix == "on") { nsCOMPtr atom = getter_AddRefs(NS_NewAtom(propName)); nsIEventListenerManager *manager = nsnull; diff --git a/mozilla/content/base/src/nsRange.cpp b/mozilla/content/base/src/nsRange.cpp index f2ca70d58b2..0b29fb0a326 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.SetString("text/html"); + contentType.Assign("text/html"); } result = parser->ParseFragment(aFragment, (void*)0, diff --git a/mozilla/content/base/src/nsTextNode.cpp b/mozilla/content/base/src/nsTextNode.cpp index 49896125d80..6c7cf57d004 100644 --- a/mozilla/content/base/src/nsTextNode.cpp +++ b/mozilla/content/base/src/nsTextNode.cpp @@ -136,7 +136,7 @@ nsTextNode::GetTag(nsIAtom*& aResult) const NS_IMETHODIMP nsTextNode::GetNodeName(nsString& aNodeName) { - aNodeName.SetString("#text"); + aNodeName.Assign("#text"); return NS_OK; } diff --git a/mozilla/content/html/content/src/nsAttributeContent.cpp b/mozilla/content/html/content/src/nsAttributeContent.cpp index ba9f078ba25..b95c61f6027 100644 --- a/mozilla/content/html/content/src/nsAttributeContent.cpp +++ b/mozilla/content/html/content/src/nsAttributeContent.cpp @@ -454,10 +454,10 @@ nsAttributeContent::CopyText(nsString& aResult) { ValidateTextFragment(); if (mText.Is2b()) { - aResult.SetString(mText.Get2b(), mText.GetLength()); + aResult.Assign(mText.Get2b(), mText.GetLength()); } else { - aResult.SetString(mText.Get1b(), mText.GetLength()); + aResult.Assign(mText.Get1b(), mText.GetLength()); } return NS_OK; } diff --git a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp index 625c33e9b87..f90dc0c69f5 100644 --- a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp @@ -239,7 +239,7 @@ nsHTMLButtonElement::GetForm(nsIDOMHTMLFormElement** aForm) NS_IMETHODIMP nsHTMLButtonElement::GetType(nsString& aType) { - aType.SetString("button"); + aType.Assign("button"); return NS_OK; } diff --git a/mozilla/content/html/content/src/nsHTMLImageElement.cpp b/mozilla/content/html/content/src/nsHTMLImageElement.cpp index 738bb3b1bad..059693201be 100644 --- a/mozilla/content/html/content/src/nsHTMLImageElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLImageElement.cpp @@ -573,7 +573,7 @@ nsHTMLImageElement::SetProperty(JSContext *aContext, JSObject *aObj, jsval aID, // Get the parameter passed in JSString *jsstring; if ((jsstring = JS_ValueToString(aContext, *aVp)) != nsnull) { - src.SetString(JS_GetStringChars(jsstring)); + src.Assign(JS_GetStringChars(jsstring)); } else { src.Truncate(); diff --git a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp index a60c8b38788..18f32da98bc 100644 --- a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp @@ -455,10 +455,10 @@ nsHTMLSelectElement::GetType(nsString& aType) result = GetMultiple(&isMultiple); if (NS_OK == result) { if (isMultiple) { - aType.SetString("select-multiple"); + aType.Assign("select-multiple"); } else { - aType.SetString("select-one"); + aType.Assign("select-one"); } } diff --git a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp index 1e863314058..4fbeee4e4c6 100644 --- a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp @@ -373,7 +373,7 @@ NS_IMPL_INT_ATTR(nsHTMLTextAreaElement, TabIndex, tabindex) NS_IMETHODIMP nsHTMLTextAreaElement::GetType(nsString& aType) { - aType.SetString("textarea"); + aType.Assign("textarea"); return NS_OK; } diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index 94649437947..6ce675757c6 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -3333,7 +3333,7 @@ HTMLContentSink::ProcessLink(nsIHTMLContent* aElement, const nsString& aLinkData PRUnichar endCh; while (kNullCh != *start) { - while ((kNullCh != *start) && nsString::IsSpace(*start)) { // skip leading space + while ((kNullCh != *start) && nsCRT::IsAsciiSpace(*start)) { // skip leading space start++; } @@ -3389,7 +3389,7 @@ HTMLContentSink::ProcessLink(nsIHTMLContent* aElement, const nsString& aLinkData attr.StripWhitespace(); PRUnichar* value = ++equals; - while (nsString::IsSpace(*value)) { + while (nsCRT::IsAsciiSpace(*value)) { value++; } if (((kApostrophe == *value) || (kQuote == *value)) && @@ -3463,13 +3463,13 @@ static void ParseLinkTypes(const nsString& aTypes, nsStringArray& aResult) PRUnichar* end = start; while (kNullCh != *start) { - while ((kNullCh != *start) && nsString::IsSpace(*start)) { // skip leading space + while ((kNullCh != *start) && nsCRT::IsAsciiSpace(*start)) { // skip leading space start++; } end = start; - while ((kNullCh != *end) && (! nsString::IsSpace(*end))) { // look for space + while ((kNullCh != *end) && (! nsCRT::IsAsciiSpace(*end))) { // look for space end++; } *end = kNullCh; // end string here diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index 38dde7634de..15b79546d9b 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -365,7 +365,7 @@ nsHTMLDocument::Reset(nsIChannel* aChannel, nsILoadGroup* aLoadGroup) NS_IMETHODIMP nsHTMLDocument::GetContentType(nsString& aContentType) const { - aContentType.SetString("text/html"); + aContentType.Assign("text/html"); return NS_OK; } @@ -531,7 +531,7 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand, "%c", #endif &prtime); - lastModified.SetString(buf); + lastModified.Assign(buf); SetLastModified(lastModified); } @@ -1469,7 +1469,7 @@ nsHTMLDocument::GetDomain(nsString& aDomain) char *hostName; if (NS_FAILED(uri->GetHost(&hostName))) return NS_ERROR_FAILURE; - aDomain.SetString(hostName); + aDomain.Assign(hostName); nsCRT::free(hostName); return NS_OK; @@ -2288,7 +2288,7 @@ nsHTMLDocument::GetLastModified(nsString& aLastModified) aLastModified = *mLastModified; } else { - aLastModified.SetString("January 1, 1970 GMT"); + aLastModified.Assign("January 1, 1970 GMT"); } return NS_OK; diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp index 32df9f5516a..a98d45b95fd 100644 --- a/mozilla/content/html/style/src/nsCSSParser.cpp +++ b/mozilla/content/html/style/src/nsCSSParser.cpp @@ -1874,13 +1874,13 @@ PRBool CSSParserImpl::ParseColor(PRInt32& aErrorCode, nsCSSValue& aValue) char buffer[10]; switch (tk->mType) { case eCSSToken_Ident: - str.SetString(tk->mIdent); + str.Assign(tk->mIdent); break; case eCSSToken_Number: if (tk->mIntegerValid) { sprintf(buffer, "%06d", tk->mInteger); - str.SetString(buffer); + str.Assign(buffer); } break; @@ -1888,7 +1888,7 @@ PRBool CSSParserImpl::ParseColor(PRInt32& aErrorCode, nsCSSValue& aValue) if (tk->mIdent.Length() <= 6) { sprintf(buffer, "%06.0f", tk->mNumber); nsAutoString temp; - temp.SetString(buffer); + temp.Assign(buffer); temp.Right(str, 6 - tk->mIdent.Length()); str.Append(tk->mIdent); } diff --git a/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp b/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp index f81a1c4dcab..30b5f752858 100644 --- a/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp +++ b/mozilla/content/html/style/src/nsDOMCSSDeclaration.cpp @@ -188,7 +188,7 @@ nsDOMCSSDeclaration::GetPropertyPriority(const nsString& aPropertyName, } if ((NS_OK == result) && isImportant) { - aReturn.SetString("!important"); + aReturn.Assign("!important"); } else { aReturn.SetLength(0); diff --git a/mozilla/content/xbl/src/nsXBLBinding.cpp b/mozilla/content/xbl/src/nsXBLBinding.cpp index 93fb9ef37be..b8965e0b43f 100644 --- a/mozilla/content/xbl/src/nsXBLBinding.cpp +++ b/mozilla/content/xbl/src/nsXBLBinding.cpp @@ -612,13 +612,13 @@ nsXBLBinding::IsInExcludesList(nsIAtom* aTag, const nsString& aList) // found inside of 'blur'. if (indx > 0) { PRUnichar ch = aList[indx - 1]; - if (! nsString::IsSpace(ch) && ch != PRUnichar(',')) + if (! nsCRT::IsAsciiSpace(ch) && ch != PRUnichar(',')) return PR_FALSE; } if (indx + element.Length() < aList.Length()) { PRUnichar ch = aList[indx + element.Length()]; - if (! nsString::IsSpace(ch) && ch != PRUnichar(',')) + if (! nsCRT::IsAsciiSpace(ch) && ch != PRUnichar(',')) return PR_FALSE; } diff --git a/mozilla/content/xml/content/src/nsXMLCDATASection.cpp b/mozilla/content/xml/content/src/nsXMLCDATASection.cpp index 02f007da025..8f16ea067b5 100644 --- a/mozilla/content/xml/content/src/nsXMLCDATASection.cpp +++ b/mozilla/content/xml/content/src/nsXMLCDATASection.cpp @@ -143,7 +143,7 @@ nsXMLCDATASection::GetTag(nsIAtom*& aResult) const NS_IMETHODIMP nsXMLCDATASection::GetNodeName(nsString& aNodeName) { - aNodeName.SetString("#cdata-section"); + aNodeName.Assign("#cdata-section"); return NS_OK; } diff --git a/mozilla/content/xul/content/src/nsXULAttributes.cpp b/mozilla/content/xul/content/src/nsXULAttributes.cpp index 6d1799b2083..88ab7266478 100644 --- a/mozilla/content/xul/content/src/nsXULAttributes.cpp +++ b/mozilla/content/xul/content/src/nsXULAttributes.cpp @@ -287,7 +287,7 @@ nsXULAttribute::GetNodeName(nsString& aNodeName) const PRUnichar *unicodeString; mName->GetUnicode(&unicodeString); - aNodeName.SetString(unicodeString); + aNodeName.Assign(unicodeString); return NS_OK; } @@ -413,7 +413,7 @@ nsXULAttribute::GetName(nsString& aName) { const PRUnichar *unicodeString; mName->GetUnicode(&unicodeString); - aName.SetString(unicodeString); + aName.Assign(unicodeString); return NS_OK; } diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index 1ae0ee359de..4202d075547 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -612,7 +612,7 @@ nsXULDocument::GetArena() NS_IMETHODIMP nsXULDocument::GetContentType(nsString& aContentType) const { - aContentType.SetString("text/xul"); + aContentType.Assign("text/xul"); return NS_OK; } @@ -2874,7 +2874,7 @@ nsXULDocument::RemoveElementsFromMapByContent(const nsString& aID, NS_IMETHODIMP nsXULDocument::GetNodeName(nsString& aNodeName) { - aNodeName.SetString("#document"); + aNodeName.Assign("#document"); return NS_OK; } diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index a2fef01a48b..7233154615e 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -1739,7 +1739,7 @@ NS_IMETHODIMP nsDocShell::ReportScriptError(const char* aErrorString, { //XXX Needs some international work. nsAutoString error; - error.SetString("JavaScript Error: "); + error.Assign("JavaScript Error: "); error.Append(aErrorString); error += "\n"; diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 143b0337628..091c5932643 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -2161,7 +2161,7 @@ nsWebShell::HandleLinkClickEvent(nsIContent *aContent, switch(aVerb) { case eLinkVerb_New: - target.SetString("_blank"); + target.Assign("_blank"); // Fall into replace case case eLinkVerb_Replace: { diff --git a/mozilla/dom/src/base/nsDOMException.cpp b/mozilla/dom/src/base/nsDOMException.cpp index cdc3cac71e2..927118a5674 100644 --- a/mozilla/dom/src/base/nsDOMException.cpp +++ b/mozilla/dom/src/base/nsDOMException.cpp @@ -172,7 +172,7 @@ NS_IMETHODIMP nsDOMException::GetMessage(nsString& aMessage) { if (mMessage) { - aMessage.SetString(mMessage); + aMessage.Assign(mMessage); } else { aMessage.Truncate(); @@ -185,7 +185,7 @@ NS_IMETHODIMP nsDOMException::GetName(nsString& aName) { if (mName) { - aName.SetString(mName); + aName.Assign(mName); } else { aName.Truncate(); @@ -211,7 +211,7 @@ nsDOMException::ToString(nsString& aReturn) GetCode(&code); char* temp = PR_smprintf(format, msg, code, mResult, resultName, location); if (temp) { - aReturn.SetString(temp); + aReturn.Assign(temp); PR_smprintf_free(temp); } diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index 288d34dec1a..c6feb2932d8 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -1106,7 +1106,7 @@ NS_IMETHODIMP GlobalWindowImpl::Alert(JSContext* cx, jsval* argv, PRUint32 argc) if(argc > 0) nsJSUtils::nsConvertJSValToString(str, cx, argv[0]); else - str.SetString("undefined"); + str.Assign("undefined"); //XXXEMBEDDING really we should just instantiate a prompter service // don't bother calling up the stack. @@ -1134,7 +1134,7 @@ NS_IMETHODIMP GlobalWindowImpl::Confirm(JSContext* cx, jsval* argv, if(argc > 0) nsJSUtils::nsConvertJSValToString(str, cx, argv[0]); else - str.SetString("undefined"); + str.Assign("undefined"); //XXXEMBEDDING really we should just instantiate a prompter service // don't bother calling up the stack. @@ -1167,7 +1167,7 @@ NS_IMETHODIMP GlobalWindowImpl::Prompt(JSContext* cx, jsval* argv, if(argc > 1) nsJSUtils::nsConvertJSValToString(initial, cx, argv[1]); else - initial.SetString("undefined"); + initial.Assign("undefined"); } //XXXEMBEDDING really we should just instantiate a prompter service @@ -1193,7 +1193,7 @@ NS_IMETHODIMP GlobalWindowImpl::Prompt(JSContext* cx, jsval* argv, // XXX Need to check return value and return null if the // user hits cancel. Currently, we can only return a // string reference. - aReturn.SetString(""); + aReturn.Assign(""); } return ret; @@ -1685,7 +1685,7 @@ NS_IMETHODIMP GlobalWindowImpl::Escape(const nsString& aStr, nsString& aReturn) // Escape the string char* outBuf = nsEscape(dest, nsEscapeMask(url_XAlphas | url_XPAlphas | url_Path)); - aReturn.SetString(outBuf); + aReturn.Assign(outBuf); nsAllocator::Free(outBuf); nsAllocator::Free(dest); @@ -1760,7 +1760,7 @@ NS_IMETHODIMP GlobalWindowImpl::Unescape(const nsString& aStr, nsString& aReturn return result; } - aReturn.SetString(dest, destLen); + aReturn.Assign(dest, destLen); nsAllocator::Free(dest); return NS_OK; @@ -1778,9 +1778,9 @@ PRBool GlobalWindowImpl::AddProperty(JSContext* aContext, JSObject* aObj, { nsString mPropName; nsAutoString mPrefix; - mPropName.SetString(JS_GetStringChars(JS_ValueToString(aContext, aID))); + mPropName.Assign(JS_GetStringChars(JS_ValueToString(aContext, aID))); if(mPropName.Length() > 2) - mPrefix.SetString(mPropName.GetUnicode(), 2); + mPrefix.Assign(mPropName.GetUnicode(), 2); if(mPrefix == "on") return CheckForEventListener(aContext, mPropName); } @@ -1873,10 +1873,10 @@ PRBool GlobalWindowImpl::SetProperty(JSContext* aContext, JSObject* aObj, { nsAutoString propName; nsAutoString prefix; - propName.SetString(JS_GetStringChars(JS_ValueToString(aContext, aID))); + propName.Assign(JS_GetStringChars(JS_ValueToString(aContext, aID))); if(propName.Length() > 2) { - prefix.SetString(propName.GetUnicode(), 2); + prefix.Assign(propName.GetUnicode(), 2); if(prefix.EqualsIgnoreCase("on")) result = CheckForEventListener(aContext, propName); } @@ -2308,7 +2308,7 @@ NS_IMETHODIMP GlobalWindowImpl::OpenInternal(JSContext* cx, jsval* argv, NS_ENSURE_TRUE(mJSStrURL, NS_ERROR_FAILURE); nsAutoString mURL; - mURL.SetString(JS_GetStringChars(mJSStrURL)); + mURL.Assign(JS_GetStringChars(mJSStrURL)); if(mURL.Equals("")) loadURL = PR_FALSE; @@ -2332,7 +2332,7 @@ NS_IMETHODIMP GlobalWindowImpl::OpenInternal(JSContext* cx, jsval* argv, { // No document. Probably because this window's URL hasn't finished // loading. All we can do is hope the URL we've been given is absolute. - mAbsURL.SetString(JS_GetStringChars(mJSStrURL)); + mAbsURL.Assign(JS_GetStringChars(mJSStrURL)); nsCOMPtr test; // Make URI; if mAbsURL is relative (or otherwise bogus) this will fail. NS_ENSURE_SUCCESS(NS_NewURI(getter_AddRefs(test), mAbsURL), @@ -2347,7 +2347,7 @@ NS_IMETHODIMP GlobalWindowImpl::OpenInternal(JSContext* cx, jsval* argv, JSString *mJSStrName = JS_ValueToString(cx, argv[1]); NS_ENSURE_TRUE(mJSStrName, NS_ERROR_FAILURE); - name.SetString(JS_GetStringChars(mJSStrName)); + name.Assign(JS_GetStringChars(mJSStrName)); nameSpecified = PR_TRUE; NS_ENSURE_SUCCESS(CheckWindowName(cx, name), NS_ERROR_FAILURE); diff --git a/mozilla/dom/src/base/nsHistory.cpp b/mozilla/dom/src/base/nsHistory.cpp index 5785bfd4e6c..be2abe2efa4 100644 --- a/mozilla/dom/src/base/nsHistory.cpp +++ b/mozilla/dom/src/base/nsHistory.cpp @@ -101,7 +101,7 @@ HistoryImpl::GetCurrent(nsString& aCurrent) if (webShell && NS_OK == webShell->GetHistoryIndex(curIndex)) { webShell->GetURL(curIndex, &curURL); } - aCurrent.SetString(curURL); + aCurrent.Assign(curURL); return NS_OK; } @@ -116,7 +116,7 @@ HistoryImpl::GetPrevious(nsString& aPrevious) if (webShell && NS_OK == webShell->GetHistoryIndex(curIndex)) { webShell->GetURL(curIndex-1, &prevURL); } - aPrevious.SetString(prevURL); + aPrevious.Assign(prevURL); return NS_OK; } @@ -131,7 +131,7 @@ HistoryImpl::GetNext(nsString& aNext) if (webShell && NS_OK == webShell->GetHistoryIndex(curIndex)) { webShell->GetURL(curIndex+1, &nextURL); } - aNext.SetString(nextURL); + aNext.Assign(nextURL); return NS_OK; } @@ -188,7 +188,7 @@ HistoryImpl::Go(JSContext* cx, jsval* argv, PRUint32 argc) // method are not XPCOM compliant. If they were correct, // we'd be deallocating the string passed back. result = webShell->GetURL(i, &urlstr); - url.SetString(urlstr); + url.Assign(urlstr); if (-1 != url.Find(substr)) { result = webShell->GoTo(i); diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp index 8315d0bdd6e..ed2f75ff338 100644 --- a/mozilla/dom/src/base/nsJSEnvironment.cpp +++ b/mozilla/dom/src/base/nsJSEnvironment.cpp @@ -303,7 +303,7 @@ nsJSContext::EvaluateString(const nsString& aScript, *aIsUndefined = JSVAL_IS_VOID(val); JSString* jsstring = ::JS_ValueToString(mContext, val); if (jsstring) - aRetValue.SetString(::JS_GetStringChars(jsstring)); + aRetValue.Assign(::JS_GetStringChars(jsstring)); else rv = NS_ERROR_OUT_OF_MEMORY; } @@ -432,7 +432,7 @@ nsJSContext::ExecuteScript(void* aScriptObject, if (aRetValue) { JSString* jsstring = ::JS_ValueToString(mContext, val); if (jsstring) - aRetValue->SetString(::JS_GetStringChars(jsstring)); + aRetValue->Assign(::JS_GetStringChars(jsstring)); else rv = NS_ERROR_OUT_OF_MEMORY; } diff --git a/mozilla/dom/src/base/nsJSMimeTypeArray.cpp b/mozilla/dom/src/base/nsJSMimeTypeArray.cpp index 2faa0246957..96c04e6941c 100644 --- a/mozilla/dom/src/base/nsJSMimeTypeArray.cpp +++ b/mozilla/dom/src/base/nsJSMimeTypeArray.cpp @@ -104,10 +104,10 @@ GetMimeTypeArrayProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) JSString *jsstring = JS_ValueToString(cx, id); if (nsnull != jsstring) { - name.SetString(JS_GetStringChars(jsstring)); + name.Assign(JS_GetStringChars(jsstring)); } else { - name.SetString(""); + name.Assign(""); } result = a->NamedItem(name, &prop); diff --git a/mozilla/dom/src/base/nsJSPlugin.cpp b/mozilla/dom/src/base/nsJSPlugin.cpp index f963391d07a..8d264b37c90 100644 --- a/mozilla/dom/src/base/nsJSPlugin.cpp +++ b/mozilla/dom/src/base/nsJSPlugin.cpp @@ -143,10 +143,10 @@ GetPluginProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) JSString *jsstring = JS_ValueToString(cx, id); if (nsnull != jsstring) { - name.SetString(JS_GetStringChars(jsstring)); + name.Assign(JS_GetStringChars(jsstring)); } else { - name.SetString(""); + name.Assign(""); } result = a->NamedItem(name, &prop); diff --git a/mozilla/dom/src/base/nsJSPluginArray.cpp b/mozilla/dom/src/base/nsJSPluginArray.cpp index 6a61780b516..f3627512016 100644 --- a/mozilla/dom/src/base/nsJSPluginArray.cpp +++ b/mozilla/dom/src/base/nsJSPluginArray.cpp @@ -104,10 +104,10 @@ GetPluginArrayProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) JSString *jsstring = JS_ValueToString(cx, id); if (nsnull != jsstring) { - name.SetString(JS_GetStringChars(jsstring)); + name.Assign(JS_GetStringChars(jsstring)); } else { - name.SetString(""); + name.Assign(""); } result = a->NamedItem(name, &prop); diff --git a/mozilla/dom/src/base/nsJSUtils.cpp b/mozilla/dom/src/base/nsJSUtils.cpp index 56ded4a653d..10a46bc115b 100644 --- a/mozilla/dom/src/base/nsJSUtils.cpp +++ b/mozilla/dom/src/base/nsJSUtils.cpp @@ -389,7 +389,7 @@ nsJSUtils::nsConvertJSValToString(nsString& aString, { JSString *jsstring; if ((jsstring = JS_ValueToString(aContext, aValue)) != nsnull) { - aString.SetString(JS_GetStringChars(jsstring)); + aString.Assign(JS_GetStringChars(jsstring)); } else { aString.Truncate(); diff --git a/mozilla/dom/src/base/nsJSWindowCollection.cpp b/mozilla/dom/src/base/nsJSWindowCollection.cpp index f99be4660cc..adb151cbfb3 100644 --- a/mozilla/dom/src/base/nsJSWindowCollection.cpp +++ b/mozilla/dom/src/base/nsJSWindowCollection.cpp @@ -104,10 +104,10 @@ GetWindowCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) JSString *jsstring = JS_ValueToString(cx, id); if (nsnull != jsstring) { - name.SetString(JS_GetStringChars(jsstring)); + name.Assign(JS_GetStringChars(jsstring)); } else { - name.SetString(""); + name.Assign(""); } result = a->NamedItem(name, &prop); diff --git a/mozilla/dom/src/base/nsLocation.cpp b/mozilla/dom/src/base/nsLocation.cpp index 630a0f0043f..785056b3600 100644 --- a/mozilla/dom/src/base/nsLocation.cpp +++ b/mozilla/dom/src/base/nsLocation.cpp @@ -189,7 +189,7 @@ LocationImpl::GetHash(nsString& aHash) NS_RELEASE(url); } if (result == NS_OK && (nsnull != ref) && ('\0' != *ref)) { - aHash.SetString("#"); + aHash.Assign("#"); aHash.Append(ref); nsCRT::free(ref); } @@ -243,7 +243,7 @@ LocationImpl::GetHost(nsString& aHost) char* host; result = url->GetHost(&host); if (result == NS_OK) { - aHost.SetString(host); + aHost.Assign(host); nsCRT::free(host); PRInt32 port; (void)url->GetPort(&port); @@ -295,7 +295,7 @@ LocationImpl::GetHostname(nsString& aHostname) char* host; result = url->GetHost(&host); if (result == NS_OK) { - aHostname.SetString(host); + aHostname.Assign(host); nsCRT::free(host); } NS_RELEASE(url); @@ -379,7 +379,7 @@ LocationImpl::SetHrefWithBase(const nsString& aHref, char* spec; result = newUrl->GetSpec(&spec); if (NS_SUCCEEDED(result)) { - newHref.SetString(spec); + newHref.Assign(spec); nsCRT::free(spec); } } @@ -416,7 +416,7 @@ LocationImpl::GetPathname(nsString& aPathname) char* file; result = url->GetPath(&file); if (result == NS_OK) { - aPathname.SetString(file); + aPathname.Assign(file); nsCRT::free(file); } NS_IF_RELEASE(url); @@ -518,7 +518,7 @@ LocationImpl::GetProtocol(nsString& aProtocol) char* protocol; result = url->GetScheme(&protocol); if (result == NS_OK) { - aProtocol.SetString(protocol); + aProtocol.Assign(protocol); aProtocol.Append(":"); nsCRT::free(protocol); } @@ -570,7 +570,7 @@ LocationImpl::GetSearch(nsString& aSearch) NS_RELEASE(url); } if (result == NS_OK && (nsnull != search) && ('\0' != *search)) { - aSearch.SetString("?"); + aSearch.Assign("?"); aSearch.Append(search); nsCRT::free(search); } diff --git a/mozilla/dom/src/html/nsJSHTMLCollection.cpp b/mozilla/dom/src/html/nsJSHTMLCollection.cpp index 3811b9e54b8..f98b6b9f28a 100644 --- a/mozilla/dom/src/html/nsJSHTMLCollection.cpp +++ b/mozilla/dom/src/html/nsJSHTMLCollection.cpp @@ -104,10 +104,10 @@ GetHTMLCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) JSString *jsstring = JS_ValueToString(cx, id); if (nsnull != jsstring) { - name.SetString(JS_GetStringChars(jsstring)); + name.Assign(JS_GetStringChars(jsstring)); } else { - name.SetString(""); + name.Assign(""); } result = a->NamedItem(name, &prop); diff --git a/mozilla/dom/src/html/nsJSHTMLDocument.cpp b/mozilla/dom/src/html/nsJSHTMLDocument.cpp index e78c4a61545..1e31f1d9b32 100644 --- a/mozilla/dom/src/html/nsJSHTMLDocument.cpp +++ b/mozilla/dom/src/html/nsJSHTMLDocument.cpp @@ -405,10 +405,10 @@ GetHTMLDocumentProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) JSString *jsstring = JS_ValueToString(cx, id); if (nsnull != jsstring) { - name.SetString(JS_GetStringChars(jsstring)); + name.Assign(JS_GetStringChars(jsstring)); } else { - name.SetString(""); + name.Assign(""); } if (NS_OK == a->QueryInterface(kINSHTMLDocumentIID, (void **)&b)) { diff --git a/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp b/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp index db67c760cd3..acb729f7fcd 100644 --- a/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp +++ b/mozilla/dom/src/html/nsJSHTMLSelectElement.cpp @@ -252,10 +252,10 @@ GetHTMLSelectElementProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) JSString *jsstring = JS_ValueToString(cx, id); if (nsnull != jsstring) { - name.SetString(JS_GetStringChars(jsstring)); + name.Assign(JS_GetStringChars(jsstring)); } else { - name.SetString(""); + name.Assign(""); } if (NS_OK == a->QueryInterface(kINSHTMLSelectElementIID, (void **)&b)) { diff --git a/mozilla/dom/src/html/nsJSNSHTMLOptionCollection.cpp b/mozilla/dom/src/html/nsJSNSHTMLOptionCollection.cpp index 70c3406efb6..81678b7fb80 100755 --- a/mozilla/dom/src/html/nsJSNSHTMLOptionCollection.cpp +++ b/mozilla/dom/src/html/nsJSNSHTMLOptionCollection.cpp @@ -117,10 +117,10 @@ GetNSHTMLOptionCollectionProperty(JSContext *cx, JSObject *obj, jsval id, jsval JSString *jsstring = JS_ValueToString(cx, id); if (nsnull != jsstring) { - name.SetString(JS_GetStringChars(jsstring)); + name.Assign(JS_GetStringChars(jsstring)); } else { - name.SetString(""); + name.Assign(""); } result = a->NamedItem(name, &prop); diff --git a/mozilla/editor/base/nsEditor.cpp b/mozilla/editor/base/nsEditor.cpp index 3c2b3888abb..a95a8707a20 100644 --- a/mozilla/editor/base/nsEditor.cpp +++ b/mozilla/editor/base/nsEditor.cpp @@ -4082,7 +4082,7 @@ nsEditor::IsNextCharWhitespace(nsIDOMNode *aParentNode, { // easy case: next char is in same node textNode->SubstringData(aOffset,aOffset+1,tempString); - *outIsSpace = nsString::IsSpace(tempString.First()); + *outIsSpace = nsCRT::IsAsciiSpace(tempString.First()); *outIsNBSP = (tempString.First() == nbsp); if (outNode) *outNode = do_QueryInterface(aParentNode); if (outOffset) *outOffset = aOffset+1; // yes, this is _past_ the character; @@ -4105,7 +4105,7 @@ nsEditor::IsNextCharWhitespace(nsIDOMNode *aParentNode, { // you could use nsITextContent::IsOnlyWhitespace here textNode->SubstringData(0,1,tempString); - *outIsSpace = nsString::IsSpace(tempString.First()); + *outIsSpace = nsCRT::IsAsciiSpace(tempString.First()); *outIsNBSP = (tempString.First() == nbsp); if (outNode) *outNode = do_QueryInterface(node); if (outOffset) *outOffset = 1; // yes, this is _past_ the character; @@ -4152,7 +4152,7 @@ nsEditor::IsPrevCharWhitespace(nsIDOMNode *aParentNode, { // easy case: prev char is in same node textNode->SubstringData(aOffset-1,aOffset,tempString); - *outIsSpace = nsString::IsSpace(tempString.First()); + *outIsSpace = nsCRT::IsAsciiSpace(tempString.First()); *outIsNBSP = (tempString.First() == nbsp); if (outNode) *outNode = do_QueryInterface(aParentNode); if (outOffset) *outOffset = aOffset-1; @@ -4175,7 +4175,7 @@ nsEditor::IsPrevCharWhitespace(nsIDOMNode *aParentNode, { // you could use nsITextContent::IsOnlyWhitespace here textNode->SubstringData(strLength-1,strLength,tempString); - *outIsSpace = nsString::IsSpace(tempString.First()); + *outIsSpace = nsCRT::IsAsciiSpace(tempString.First()); *outIsNBSP = (tempString.First() == nbsp); if (outNode) *outNode = do_QueryInterface(aParentNode); if (outOffset) *outOffset = strLength-1; diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp index 3c2b3888abb..a95a8707a20 100644 --- a/mozilla/editor/libeditor/base/nsEditor.cpp +++ b/mozilla/editor/libeditor/base/nsEditor.cpp @@ -4082,7 +4082,7 @@ nsEditor::IsNextCharWhitespace(nsIDOMNode *aParentNode, { // easy case: next char is in same node textNode->SubstringData(aOffset,aOffset+1,tempString); - *outIsSpace = nsString::IsSpace(tempString.First()); + *outIsSpace = nsCRT::IsAsciiSpace(tempString.First()); *outIsNBSP = (tempString.First() == nbsp); if (outNode) *outNode = do_QueryInterface(aParentNode); if (outOffset) *outOffset = aOffset+1; // yes, this is _past_ the character; @@ -4105,7 +4105,7 @@ nsEditor::IsNextCharWhitespace(nsIDOMNode *aParentNode, { // you could use nsITextContent::IsOnlyWhitespace here textNode->SubstringData(0,1,tempString); - *outIsSpace = nsString::IsSpace(tempString.First()); + *outIsSpace = nsCRT::IsAsciiSpace(tempString.First()); *outIsNBSP = (tempString.First() == nbsp); if (outNode) *outNode = do_QueryInterface(node); if (outOffset) *outOffset = 1; // yes, this is _past_ the character; @@ -4152,7 +4152,7 @@ nsEditor::IsPrevCharWhitespace(nsIDOMNode *aParentNode, { // easy case: prev char is in same node textNode->SubstringData(aOffset-1,aOffset,tempString); - *outIsSpace = nsString::IsSpace(tempString.First()); + *outIsSpace = nsCRT::IsAsciiSpace(tempString.First()); *outIsNBSP = (tempString.First() == nbsp); if (outNode) *outNode = do_QueryInterface(aParentNode); if (outOffset) *outOffset = aOffset-1; @@ -4175,7 +4175,7 @@ nsEditor::IsPrevCharWhitespace(nsIDOMNode *aParentNode, { // you could use nsITextContent::IsOnlyWhitespace here textNode->SubstringData(strLength-1,strLength,tempString); - *outIsSpace = nsString::IsSpace(tempString.First()); + *outIsSpace = nsCRT::IsAsciiSpace(tempString.First()); *outIsNBSP = (tempString.First() == nbsp); if (outNode) *outNode = do_QueryInterface(aParentNode); if (outOffset) *outOffset = strLength-1; diff --git a/mozilla/gfx/src/nsColorNames.cpp b/mozilla/gfx/src/nsColorNames.cpp index 9c6112088a6..b46598469c8 100644 --- a/mozilla/gfx/src/nsColorNames.cpp +++ b/mozilla/gfx/src/nsColorNames.cpp @@ -117,7 +117,22 @@ nsColorNames::ReleaseTable(void) nsColorName -nsColorNames::LookupName(const nsStr& aColorName) +nsColorNames::LookupName(const nsCString& aColorName) +{ + NS_ASSERTION(gColorTree, "no lookup table, needs addref"); + if (gColorTree) { + ColorNode node(aColorName, eColorName_UNKNOWN); + ColorNode* found = (ColorNode*)gColorTree->FindItem(&node); + if (found) { + NS_ASSERTION(found->mStr.EqualsIgnoreCase(aColorName), "bad tree"); + return found->mEnum; + } + } + return eColorName_UNKNOWN; +} + +nsColorName +nsColorNames::LookupName(const nsString& aColorName) { NS_ASSERTION(gColorTree, "no lookup table, needs addref"); if (gColorTree) { diff --git a/mozilla/gfx/src/windows/nsFontMetricsWin.cpp b/mozilla/gfx/src/windows/nsFontMetricsWin.cpp index b2c98964f8a..be6d796fe0a 100644 --- a/mozilla/gfx/src/windows/nsFontMetricsWin.cpp +++ b/mozilla/gfx/src/windows/nsFontMetricsWin.cpp @@ -2385,7 +2385,7 @@ FontEnumCallback(const nsString& aFamily, PRBool aGeneric, void *aData) nsString* newPointer = new nsString[newSize]; if (newPointer) { for (int i = metrics->mFontsCount - 1; i >= 0; i--) { - newPointer[i].SetString(metrics->mFonts[i].GetUnicode()); + newPointer[i].Assign(metrics->mFonts[i].GetUnicode()); } delete [] metrics->mFonts; metrics->mFonts = newPointer; @@ -2395,7 +2395,7 @@ FontEnumCallback(const nsString& aFamily, PRBool aGeneric, void *aData) return PR_FALSE; // stop } } - metrics->mFonts[metrics->mFontsCount++].SetString(aFamily.GetUnicode()); + metrics->mFonts[metrics->mFontsCount++].Assign(aFamily.GetUnicode()); if (aGeneric) { return PR_FALSE; // stop diff --git a/mozilla/htmlparser/src/CRtfDTD.cpp b/mozilla/htmlparser/src/CRtfDTD.cpp index bd3bdf883dc..0abf8646d3f 100644 --- a/mozilla/htmlparser/src/CRtfDTD.cpp +++ b/mozilla/htmlparser/src/CRtfDTD.cpp @@ -888,7 +888,8 @@ nsresult CRTFControlWord::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aM if(NS_SUCCEEDED(result)) { if(('a'<=theChar) && (theChar<='z')) { - result=aScanner.ReadWhile(mTextValue,gAlphaChars,PR_TRUE,PR_FALSE); + nsAutoString temp(gAlphaChars); + result=aScanner.ReadWhile(mTextValue,temp,PR_FALSE); if(NS_OK==result) { //ok, now look for an option parameter... @@ -899,7 +900,10 @@ nsresult CRTFControlWord::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aM case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case kMinus: - result=aScanner.ReadWhile(mArgument,gDigits,PR_TRUE,PR_FALSE); + { + nsAutoString theDigits(gDigits); + result=aScanner.ReadWhile(mArgument,theDigits,PR_FALSE); + } break; case kSpace: @@ -956,7 +960,7 @@ PRInt32 CRTFContent::GetTokenType() { nsresult CRTFContent::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode) { static const char* textTerminators="\\{}\r\n"; mTextValue.Append(aChar); - PRInt32 result=aScanner.ReadUntil(mTextValue,textTerminators,PR_FALSE,PR_FALSE); + PRInt32 result=aScanner.ReadUntil(mTextValue,textTerminators,PR_FALSE); if(NS_SUCCEEDED(result)) { mTypeID=eHTMLTag_text; } diff --git a/mozilla/htmlparser/src/nsExpatTokenizer.cpp b/mozilla/htmlparser/src/nsExpatTokenizer.cpp index 0894ef807e4..6469b7d3ebd 100644 --- a/mozilla/htmlparser/src/nsExpatTokenizer.cpp +++ b/mozilla/htmlparser/src/nsExpatTokenizer.cpp @@ -400,7 +400,7 @@ void nsExpatTokenizer::HandleStartElement(void *userData, const XML_Char *name, CToken* theToken = state->tokenRecycler->CreateTokenOfType(eToken_start,eHTMLTag_unknown); if(theToken) { nsString& theString=theToken->GetStringValueXXX(); - theString.SetString((PRUnichar *) name); + theString.Assign((PRUnichar *) name); AddToken(theToken, NS_OK, state->tokenDeque, state->tokenRecycler); int theAttrCount=0; while(*atts){ @@ -409,9 +409,9 @@ void nsExpatTokenizer::HandleStartElement(void *userData, const XML_Char *name, state->tokenRecycler->CreateTokenOfType(eToken_attribute, eHTMLTag_unknown); if(theAttrToken){ nsString& theKey=theAttrToken->GetKey(); - theKey.SetString((PRUnichar *) (*atts++)); + theKey.Assign((PRUnichar *) (*atts++)); nsString& theValue=theAttrToken->GetStringValueXXX(); - theValue.SetString((PRUnichar *) (*atts++)); + theValue.Assign((PRUnichar *) (*atts++)); } CToken* theTok=(CToken*)theAttrToken; AddToken(theTok, NS_OK, state->tokenDeque, state->tokenRecycler); @@ -428,7 +428,7 @@ void nsExpatTokenizer::HandleEndElement(void *userData, const XML_Char *name) { CToken* theToken = state->tokenRecycler->CreateTokenOfType(eToken_end,eHTMLTag_unknown); if(theToken) { nsString& theString=theToken->GetStringValueXXX(); - theString.SetString((PRUnichar *) name); + theString.Assign((PRUnichar *) name); AddToken(theToken, NS_OK, state->tokenDeque, state->tokenRecycler); } else{ @@ -479,7 +479,7 @@ void nsExpatTokenizer::HandleComment(void *userData, const XML_Char *name) { CToken* theToken = state->tokenRecycler->CreateTokenOfType(eToken_comment, eHTMLTag_unknown); if(theToken) { nsString& theString=theToken->GetStringValueXXX(); - theString.SetString((PRUnichar *) name); + theString.Assign((PRUnichar *) name); AddToken(theToken, NS_OK, state->tokenDeque, state->tokenRecycler); } else{ diff --git a/mozilla/htmlparser/src/nsHTMLEntities.cpp b/mozilla/htmlparser/src/nsHTMLEntities.cpp index 17a24e4f2be..4aeffeb4063 100644 --- a/mozilla/htmlparser/src/nsHTMLEntities.cpp +++ b/mozilla/htmlparser/src/nsHTMLEntities.cpp @@ -33,7 +33,7 @@ struct EntityNode { mUnicode(-1) {} - EntityNode(const nsStr& aStringValue) + EntityNode(const nsString& aStringValue) : mStr(), mUnicode(-1) { // point to the incomming buffer @@ -146,9 +146,8 @@ nsHTMLEntities::ReleaseTable(void) } } - PRInt32 -nsHTMLEntities::EntityToUnicode(const nsStr& aEntity) +nsHTMLEntities::EntityToUnicode(const nsString& aEntity) { NS_ASSERTION(gEntityToCodeTree, "no lookup table, needs addref"); if (gEntityToCodeTree) { @@ -167,7 +166,7 @@ nsHTMLEntities::EntityToUnicode(const nsStr& aEntity) EntityNode node(aEntity); EntityNode* found = (EntityNode*)gEntityToCodeTree->FindItem(&node); if (found) { - NS_ASSERTION(found->mStr.Equals(aEntity), "bad tree"); + NS_ASSERTION(found->mStr.Equals(aEntity.mUStr,PR_FALSE,aEntity.mLength), "bad tree"); return found->mUnicode; } } @@ -213,7 +212,7 @@ public: NS_ASSERTION(value == gEntityArray[i].mUnicode, "bad unicode value"); entity = nsHTMLEntities::UnicodeToEntity(value); - NS_ASSERTION(entity.Equals(gEntityArray[i].mStr), "bad entity name"); + NS_ASSERTION(entity.Equals(gEntityArray[i].mStr.mStr), "bad entity name"); } // Make sure we don't find things that aren't there diff --git a/mozilla/htmlparser/src/nsHTMLEntities.h b/mozilla/htmlparser/src/nsHTMLEntities.h index 6da76800dc7..033535728c2 100644 --- a/mozilla/htmlparser/src/nsHTMLEntities.h +++ b/mozilla/htmlparser/src/nsHTMLEntities.h @@ -23,9 +23,7 @@ #define nsHTMLEntities_h___ #include "nshtmlpars.h" - -struct nsStr; -class nsCString; +#include "nsString.h" class NS_HTMLPARS nsHTMLEntities { public: @@ -39,7 +37,7 @@ public: * passed in must NOT have the leading "&" nor the trailing ";" * in it. */ - static PRInt32 EntityToUnicode(const nsStr& aEntity); + static PRInt32 EntityToUnicode(const nsString& aEntity); /** * Translate an entity string into it's unicode value. This call diff --git a/mozilla/htmlparser/src/nsHTMLTags.cpp b/mozilla/htmlparser/src/nsHTMLTags.cpp index f3fc74cbac3..11e04dad1f3 100644 --- a/mozilla/htmlparser/src/nsHTMLTags.cpp +++ b/mozilla/htmlparser/src/nsHTMLTags.cpp @@ -111,7 +111,30 @@ nsHTMLTags::ReleaseTable(void) nsHTMLTag -nsHTMLTags::LookupTag(const nsStr& aTag) +nsHTMLTags::LookupTag(const nsString& aTag) +{ + NS_ASSERTION(gTagTree, "no lookup table, needs addref"); + if (gTagTree) { + TagNode node(aTag); + TagNode* found = (TagNode*)gTagTree->FindItem(&node); + if (found) { + NS_ASSERTION(found->mStr.EqualsIgnoreCase(aTag), "bad tree"); + return found->mEnum; + } + else { + // hack: this can come out when rickg provides a way for the editor to ask + // CanContain() questions without having to first fetch the parsers + // internal enum values for a tag name. + nsAutoString textTag("__moz_text"); + if (textTag==aTag) + return eHTMLTag_text; + } + } + return eHTMLTag_userdefined; +} + +nsHTMLTag +nsHTMLTags::LookupTag(const nsCString& aTag) { NS_ASSERTION(gTagTree, "no lookup table, needs addref"); if (gTagTree) { diff --git a/mozilla/htmlparser/src/nsHTMLTags.h b/mozilla/htmlparser/src/nsHTMLTags.h index 62591230a96..d98163b9160 100644 --- a/mozilla/htmlparser/src/nsHTMLTags.h +++ b/mozilla/htmlparser/src/nsHTMLTags.h @@ -25,7 +25,7 @@ #include "nshtmlpars.h" -struct nsStr; +class nsString; class nsCString; /* @@ -55,7 +55,8 @@ public: static void AddRefTable(void); static void ReleaseTable(void); - static nsHTMLTag LookupTag(const nsStr& aTag); + static nsHTMLTag LookupTag(const nsString& aTag); + static nsHTMLTag LookupTag(const nsCString& aTag); static const nsCString& GetStringValue(nsHTMLTag aEnum); static const char* GetCStringValue(nsHTMLTag aEnum); }; diff --git a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp index c1f77fbb878..e947276b92d 100644 --- a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp +++ b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp @@ -899,7 +899,7 @@ nsHTMLToTXTSinkStream::FlushLine() WriteSimple(mCurrentLine); mColPos += mCurrentLine.Length(); - mCurrentLine.SetString(""); + mCurrentLine.Truncate(); } } @@ -986,7 +986,7 @@ nsHTMLToTXTSinkStream::AddToLine(const PRUnichar * aLineFragment, PRInt32 aLineF // Must wrap. Let's find a good place to do that. PRInt32 goodSpace = mWrapColumn-prefixwidth; while (goodSpace >= 0 && - !nsString::IsSpace(mCurrentLine.CharAt(goodSpace))) { + !nsCRT::IsAsciiSpace(mCurrentLine.CharAt(goodSpace))) { goodSpace--; } @@ -996,7 +996,7 @@ nsHTMLToTXTSinkStream::AddToLine(const PRUnichar * aLineFragment, PRInt32 aLineF // try to find another place to break goodSpace=mWrapColumn-prefixwidth; while (goodSpace < linelength && - !nsString::IsSpace(mCurrentLine.CharAt(goodSpace))) { + !nsCRT::IsAsciiSpace(mCurrentLine.CharAt(goodSpace))) { goodSpace++; } } @@ -1006,7 +1006,7 @@ nsHTMLToTXTSinkStream::AddToLine(const PRUnichar * aLineFragment, PRInt32 aLineF mCurrentLine.Right(restOfLine, linelength-goodSpace-1); mCurrentLine.Cut(goodSpace, linelength-goodSpace); EndLine(PR_TRUE); - mCurrentLine.SetString(""); + mCurrentLine.Truncate(); // Space stuff new line? if(mFlags & nsIDocumentEncoder::OutputFormatFlowed) { if((restOfLine[0] == '>') || @@ -1050,7 +1050,7 @@ nsHTMLToTXTSinkStream::EndLine(PRBool softlinebreak) } mCurrentLine.Append(NS_LINEBREAK); WriteSimple(mCurrentLine); - mCurrentLine.SetString(""); + mCurrentLine.Truncate(); mColPos=0; mEmptyLines=0; mInWhitespace=PR_TRUE; @@ -1067,7 +1067,7 @@ nsHTMLToTXTSinkStream::EndLine(PRBool softlinebreak) mCurrentLine.SetLength(mCurrentLine.Length()-1); mCurrentLine.Append(NS_LINEBREAK); WriteSimple(mCurrentLine); - mCurrentLine.SetString(""); + mCurrentLine.Truncate(); mColPos=0; mEmptyLines++; mInWhitespace=PR_TRUE; diff --git a/mozilla/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/htmlparser/src/nsHTMLTokenizer.cpp index 3e74ae6e8f2..5f8f7898676 100644 --- a/mozilla/htmlparser/src/nsHTMLTokenizer.cpp +++ b/mozilla/htmlparser/src/nsHTMLTokenizer.cpp @@ -316,7 +316,7 @@ nsresult nsHTMLTokenizer::ConsumeToken(nsScanner& aScanner,PRBool& aFlushTokens) return ConsumeNewline(theChar,theToken,aScanner); } else { - if(!nsString::IsSpace(theChar)) { + if(!nsCRT::IsAsciiSpace(theChar)) { nsAutoString temp(theChar); result=ConsumeText(temp,theToken,aScanner); break; @@ -352,7 +352,7 @@ nsresult nsHTMLTokenizer::ConsumeTag(PRUnichar aChar,CToken*& aToken,nsScanner& PRUnichar ch; result=aScanner.Peek(ch); if(NS_OK==result) { - if(nsString::IsAlpha(ch)||(kGreaterThan==ch)) { + if(nsCRT::IsAsciiAlpha(ch)||(kGreaterThan==ch)) { result=ConsumeEndTag(aChar,aToken,aScanner); } else result=ConsumeComment(aChar,aToken,aScanner); @@ -376,7 +376,7 @@ nsresult nsHTMLTokenizer::ConsumeTag(PRUnichar aChar,CToken*& aToken,nsScanner& break; default: - if(nsString::IsAlpha(aChar)) + if(nsCRT::IsAsciiAlpha(aChar)) result=ConsumeStartTag(aChar,aToken,aScanner,aFlushTokens); else if(kEOF!=aChar) { // We are not dealing with a tag. So, put back the char @@ -583,7 +583,7 @@ nsresult nsHTMLTokenizer::ConsumeEntity(PRUnichar aChar,CToken*& aToken,nsScanne CTokenRecycler* theRecycler=(CTokenRecycler*)GetTokenRecycler(); if(NS_OK==result) { - if(nsString::IsAlpha(theChar)) { //handle common enity references &xxx; or �. + if(nsCRT::IsAsciiAlpha(theChar)) { //handle common enity references &xxx; or �. aToken = theRecycler->CreateTokenOfType(eToken_entity,eHTMLTag_entity); result = aToken->Consume(theChar,aScanner,mParseMode); //tell new token to finish consuming text... } diff --git a/mozilla/htmlparser/src/nsHTMLTokens.cpp b/mozilla/htmlparser/src/nsHTMLTokens.cpp index 9a895a07a42..e823b8f0e0b 100644 --- a/mozilla/htmlparser/src/nsHTMLTokens.cpp +++ b/mozilla/htmlparser/src/nsHTMLTokens.cpp @@ -492,7 +492,7 @@ nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode) PRBool done=PR_FALSE; while((NS_OK==result) && (!done)) { - result=aScanner.ReadUntil(mTextValue,theTerminals,PR_TRUE,PR_FALSE); + result=aScanner.ReadUntil(mTextValue,theTerminals,PR_FALSE); if(NS_OK==result) { result=aScanner.Peek(aChar); @@ -683,7 +683,7 @@ nsresult CCDATASectionToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt3 PRBool done=PR_FALSE; while((NS_OK==result) && (!done)) { - result=aScanner.ReadUntil(mTextValue,theTerminals,PR_TRUE,PR_FALSE); + result=aScanner.ReadUntil(mTextValue,theTerminals,PR_FALSE); if(NS_OK==result) { result=aScanner.Peek(aChar); if((kCR==aChar) && (NS_OK==result)) { @@ -793,7 +793,7 @@ nsresult ConsumeStrictComment(PRUnichar aChar, nsScanner& aScanner,nsString& aSt if(NS_OK==result) { if(NS_OK==result) { temp="->"; - result=aScanner.ReadUntil(aString,temp,PR_FALSE,PR_FALSE); + result=aScanner.ReadUntil(aString,temp,PR_FALSE); } } } @@ -1143,7 +1143,7 @@ void CAttributeToken::SanitizeKey() { PRInt32 length=mTextKey.Length(); if(length > 0) { PRUnichar theChar=mTextKey.Last(); - while(!nsString::IsAlpha(theChar) && !nsString::IsDigit(theChar)) { + while(!nsCRT::IsAsciiAlpha(theChar) && !nsCRT::IsAsciiDigit(theChar)) { mTextKey.Truncate(length-1); length = mTextKey.Length(); if(length <= 0) break; @@ -1227,7 +1227,7 @@ nsresult ConsumeQuotedString(PRUnichar aChar,nsString& aString,nsScanner& aScann static nsresult ConsumeAttributeValueText(PRUnichar,nsString& aString,nsScanner& aScanner){ static nsString theTerminals("\b\t\n\r >",6); - nsresult result=aScanner.ReadUntil(aString,theTerminals,PR_TRUE,PR_FALSE); + nsresult result=aScanner.ReadUntil(aString,theTerminals,PR_FALSE); //Let's force quotes if either the first or last char is quoted. PRUnichar theLast=aString.Last(); @@ -1266,7 +1266,7 @@ nsresult CAttributeToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 a if(NS_OK==result) { result=aScanner.Peek(aChar); //peek ahead to make sure the next char is a legal attr-key if(NS_OK==result) { - if(nsString::IsAlpha(aChar) || nsString::IsDigit(aChar)){ + if(nsCRT::IsAsciiAlpha(aChar) || nsCRT::IsAsciiDigit(aChar)){ mTextKey=aChar; result=ConsumeQuotedString(aChar,mTextKey,aScanner); } @@ -1287,7 +1287,7 @@ nsresult CAttributeToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 a //If you're here, handle an unquoted key. //Don't forget to reduce entities inline! static nsString theTerminals("\b\t\n\r \"<=>",9); - result=aScanner.ReadUntil(mTextKey,theTerminals,PR_TRUE,PR_FALSE); + result=aScanner.ReadUntil(mTextKey,theTerminals,PR_FALSE); } //now it's time to Consume the (optional) value... diff --git a/mozilla/htmlparser/src/nsScanner.cpp b/mozilla/htmlparser/src/nsScanner.cpp index 07efff12a5a..abc06eca41d 100644 --- a/mozilla/htmlparser/src/nsScanner.cpp +++ b/mozilla/htmlparser/src/nsScanner.cpp @@ -845,6 +845,7 @@ nsresult nsScanner::ReadWhitespace(nsString& aString) { return result; } + /** * Consume chars as long as they are in the * given validSet of input chars. @@ -857,11 +858,8 @@ nsresult nsScanner::ReadWhitespace(nsString& aString) { */ nsresult nsScanner::ReadWhile(nsString& aString, nsString& aValidSet, - PRBool anOrderedSet, PRBool addTerminal){ - NS_ASSERTION(((PR_FALSE==anOrderedSet) || aValidSet.IsOrdered()),kUnorderedStringError); - PRUnichar theChar=0; nsresult result=Peek(theChar); const PRUnichar* theBuf=mBuffer.GetUnicode(); @@ -871,7 +869,7 @@ nsresult nsScanner::ReadWhile(nsString& aString, theChar=theBuf[mOffset++]; if(theChar) { - PRInt32 pos=(anOrderedSet) ? aValidSet.BinarySearch(theChar) : aValidSet.FindChar(theChar); + PRInt32 pos=aValidSet.FindChar(theChar); if(kNotFound==pos) { if(!addTerminal) mOffset-=1; @@ -894,85 +892,6 @@ nsresult nsScanner::ReadWhile(nsString& aString, } -/** - * Consume chars as long as they are in the - * given validSet of input chars. - * - * @update gess 3/25/98 - * @param aString will contain the result of this method - * @param aValidSet is an ordered string that contains the - * valid characters - * @return error code - */ -nsresult nsScanner::ReadWhile(nsString& aString, - nsCString& aValidSet, - PRBool anOrderedSet, - PRBool addTerminal){ - - NS_ASSERTION(((PR_FALSE==anOrderedSet) || aValidSet.IsOrdered()),kUnorderedStringError); - - PRUnichar theChar=0; - nsresult result=Peek(theChar); - const PRUnichar* theBuf=mBuffer.GetUnicode(); - PRInt32 theOrigin=mOffset; - - while(NS_OK==result) { - - theChar=theBuf[mOffset++]; - if(theChar) { - PRInt32 pos=(anOrderedSet) ? aValidSet.BinarySearch(theChar) : aValidSet.FindChar(theChar); - if(kNotFound==pos) { - if(!addTerminal) - mOffset-=1; - aString.Append(&theBuf[theOrigin],mOffset-theOrigin); - break; - } - } - else if ((PRUint32)mBuffer.Length()<=mOffset) { - mOffset -= 1; - aString.Append(&theBuf[theOrigin],mOffset-theOrigin); - result=Peek(theChar); - theBuf=mBuffer.GetUnicode(); - theOrigin=mOffset; - } - } - - //DoErrTest(aString); - - return result; - -} - -/** - * Consume chars as long as they are in the - * given validSet of input chars. - * - * @update gess 3/25/98 - * @param aString will contain the result of this method - * @param anInputSet contains the legal input chars - * valid characters - * @return error code - */ -nsresult nsScanner::ReadWhile(nsString& aString, - const char* anInputSet, - PRBool anOrderedSet, - PRBool addTerminal) -{ - - nsresult result=NS_OK; - if(anInputSet) { - PRInt32 len=nsCRT::strlen(anInputSet); - if(0GetStringValueXXX(); if(!theEntity.EqualsIgnoreCase("XI",2)) { PRUnichar theChar=theEntity.CharAt(0); - if((nsString::IsDigit(theChar)) || ('X'==theChar) || ('x'==theChar)){ + if((nsCRT::IsAsciiDigit(theChar)) || ('X'==theChar) || ('x'==theChar)){ theStr.Append("#"); } theStr.Append(theEntity); diff --git a/mozilla/intl/locale/src/nsCollation.cpp b/mozilla/intl/locale/src/nsCollation.cpp index a2b08a2d440..611cf4d5441 100644 --- a/mozilla/intl/locale/src/nsCollation.cpp +++ b/mozilla/intl/locale/src/nsCollation.cpp @@ -150,7 +150,7 @@ nsresult nsCollation::CreateSortKey(nsICollation *inst, const nsCollationStrengt if (aKeyInUnichar[aLengthUnichar-1] == 0) aLengthUnichar--; - key.SetString(aKeyInUnichar, aLengthUnichar); + key.Assign(aKeyInUnichar, aLengthUnichar); } delete [] aKey; } @@ -203,7 +203,7 @@ nsresult nsCollation::NormalizeString(nsAutoString& stringInOut) return NS_ERROR_OUT_OF_MEMORY; } mCaseConversion->ToLower(stringInOut.GetUnicode(), aBuffer, aLength); - stringInOut.SetString(aBuffer, aLength); + stringInOut.Assign(aBuffer, aLength); delete [] aBuffer; } return NS_OK; diff --git a/mozilla/intl/locale/src/windows/nsCollationWin.cpp b/mozilla/intl/locale/src/windows/nsCollationWin.cpp index f8610cc08de..16220b7d6b9 100644 --- a/mozilla/intl/locale/src/windows/nsCollationWin.cpp +++ b/mozilla/intl/locale/src/windows/nsCollationWin.cpp @@ -79,7 +79,7 @@ nsresult nsCollationWin::Initialize(nsILocale* locale) } // default charset name - mCharset.SetString("ISO-8859-1"); + mCharset.Assign("ISO-8859-1"); // default LCID (en-US) mLCID = 1033; @@ -106,7 +106,7 @@ nsresult nsCollationWin::Initialize(nsILocale* locale) // Get LCID and charset name from locale, if available if (NS_SUCCEEDED(res)) { nsString aLocale; - aLocale.SetString(aLocaleUnichar); + aLocale.Assign(aLocaleUnichar); if (NULL != aLocaleUnichar) { nsAllocator::Free(aLocaleUnichar); } @@ -128,7 +128,7 @@ nsresult nsCollationWin::Initialize(nsILocale* locale) PRUnichar* mappedCharset = NULL; res = platformCharset->GetDefaultCharsetForLocale(aLocale.GetUnicode(), &mappedCharset); if (NS_SUCCEEDED(res) && mappedCharset) { - mCharset.SetString(mappedCharset); + mCharset.Assign(mappedCharset); nsAllocator::Free(mappedCharset); } } diff --git a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp index b373bfe1078..da806a5aa3b 100644 --- a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp +++ b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.cpp @@ -86,7 +86,7 @@ nsresult nsDateTimeFormatWin::Initialize(nsILocale* locale) } // default charset name - mCharset.SetString("ISO-8859-1"); + mCharset.Assign("ISO-8859-1"); // default LCID (en-US) mLCID = 1033; @@ -100,7 +100,7 @@ nsresult nsDateTimeFormatWin::Initialize(nsILocale* locale) if (NS_SUCCEEDED(res)) { res = appLocale->GetCategory(aCategory.GetUnicode(), &aLocaleUnichar); if (NS_SUCCEEDED(res) && NULL != aLocaleUnichar) { - mAppLocale.SetString(aLocaleUnichar); // cache app locale name + mAppLocale.Assign(aLocaleUnichar); // cache app locale name } appLocale->Release(); } @@ -112,7 +112,7 @@ nsresult nsDateTimeFormatWin::Initialize(nsILocale* locale) // Get LCID and charset name from locale, if available if (NS_SUCCEEDED(res) && NULL != aLocaleUnichar) { - mLocale.SetString(aLocaleUnichar); // cache locale name + mLocale.Assign(aLocaleUnichar); // cache locale name nsAllocator::Free(aLocaleUnichar); nsCOMPtr win32Locale; @@ -128,7 +128,7 @@ nsresult nsDateTimeFormatWin::Initialize(nsILocale* locale) PRUnichar* mappedCharset = NULL; res = platformCharset->GetDefaultCharsetForLocale(mLocale.GetUnicode(), &mappedCharset); if (NS_SUCCEEDED(res) && mappedCharset) { - mCharset.SetString(mappedCharset); + mCharset.Assign(mappedCharset); nsAllocator::Free(mappedCharset); } } @@ -242,17 +242,17 @@ nsresult nsDateTimeFormatWin::FormatTMTime(nsILocale* locale, NS_ASSERTION(NSDATETIMEFORMAT_BUFFER_LEN >= (PRUint32) (timeLen + 1), "internal time buffer is not large enough"); // Copy the result - stringOut.SetString(""); + stringOut.Assign(""); if (dateLen != 0 && timeLen != 0) { - stringOut.SetString(dateBuffer, dateLen); + stringOut.Assign(dateBuffer, dateLen); stringOut.Append((PRUnichar *)(L" "), 1); stringOut.Append(timeBuffer, timeLen); } else if (dateLen != 0 && timeLen == 0) { - stringOut.SetString(dateBuffer, dateLen); + stringOut.Assign(dateBuffer, dateLen); } else if (dateLen == 0 && timeLen != 0) { - stringOut.SetString(timeBuffer, timeLen); + stringOut.Assign(timeBuffer, timeLen); } return NS_OK; diff --git a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.h b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.h index 2bfdc446fd7..0f3fd220858 100644 --- a/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.h +++ b/mozilla/intl/locale/src/windows/nsDateTimeFormatWin.h @@ -64,7 +64,7 @@ public: nsString& stringOut); nsDateTimeFormatWin() {NS_INIT_REFCNT(); - mLocale.SetString("");mAppLocale.SetString("");} + mLocale.Assign("");mAppLocale.Assign("");} virtual ~nsDateTimeFormatWin() {} diff --git a/mozilla/intl/strres/src/nsStringBundle.cpp b/mozilla/intl/strres/src/nsStringBundle.cpp index a9da1426654..406afe8e4c8 100644 --- a/mozilla/intl/strres/src/nsStringBundle.cpp +++ b/mozilla/intl/strres/src/nsStringBundle.cpp @@ -295,7 +295,7 @@ nsStringBundle::GetLangCountry(nsILocale* aLocale, nsString2& lang, nsString2& c nsString lc_name; nsString category("NSILOCALE_MESSAGES"); nsresult result = aLocale->GetCategory(category.GetUnicode(), &lc_name_unichar); - lc_name.SetString(lc_name_unichar); + lc_name.Assign(lc_name_unichar); nsAllocator::Free(lc_name_unichar); NS_ASSERTION(NS_SUCCEEDED(result),"nsStringBundle::GetLangCountry: locale.GetCategory failed"); diff --git a/mozilla/intl/strres/tests/StringBundleTest.cpp b/mozilla/intl/strres/tests/StringBundleTest.cpp index 4b8a4147d52..90405637892 100644 --- a/mozilla/intl/strres/tests/StringBundleTest.cpp +++ b/mozilla/intl/strres/tests/StringBundleTest.cpp @@ -112,7 +112,7 @@ get_applocale(void) value = new nsString(); result = locale->GetCategory(category->GetUnicode(),&lc_name_unichar); - value->SetString(lc_name_unichar); + value->Assign(lc_name_unichar); NS_ASSERTION(NS_SUCCEEDED(result),"nsLocaleTest: factory_get_locale failed"); NS_ASSERTION(value->Length()>0,"nsLocaleTest: factory_get_locale failed"); diff --git a/mozilla/intl/unicharutil/src/nsEntityConverter.cpp b/mozilla/intl/unicharutil/src/nsEntityConverter.cpp index f637020adb0..13bb3b1f1d1 100644 --- a/mozilla/intl/unicharutil/src/nsEntityConverter.cpp +++ b/mozilla/intl/unicharutil/src/nsEntityConverter.cpp @@ -84,7 +84,7 @@ nsEntityConverter::LoadVersionPropertyFile() if (NULL == mVersionList) {rv = NS_ERROR_OUT_OF_MEMORY; goto done;} for (PRUint32 i = 0; i < mVersionListLength && NS_SUCCEEDED(rv); i++) { - key.SetString(""); + key.Assign(""); key.Append(i+1, 10); rv = entityProperties->GetStringProperty(key, value); PRUint32 len = value.Length(); diff --git a/mozilla/intl/unicharutil/tests/UnicharSelfTest.cpp b/mozilla/intl/unicharutil/tests/UnicharSelfTest.cpp index bdd344425c5..a03aa3719e1 100644 --- a/mozilla/intl/unicharutil/tests/UnicharSelfTest.cpp +++ b/mozilla/intl/unicharutil/tests/UnicharSelfTest.cpp @@ -371,7 +371,7 @@ static void TestEntityConversion(PRUint32 version) nsresult res; - inString.SetString("\xA0\xA1\xA2\xA3"); + inString.Assign("\xA0\xA1\xA2\xA3"); uChar = (PRUnichar) 8364; //euro inString.Append(&uChar, 1); uChar = (PRUnichar) 9830; // diff --git a/mozilla/layout/base/src/nsCommentNode.cpp b/mozilla/layout/base/src/nsCommentNode.cpp index 16b5e4328dd..69fd11369c4 100644 --- a/mozilla/layout/base/src/nsCommentNode.cpp +++ b/mozilla/layout/base/src/nsCommentNode.cpp @@ -267,7 +267,7 @@ nsCommentNode::GetTag(nsIAtom*& aResult) const NS_IMETHODIMP nsCommentNode::GetNodeName(nsString& aNodeName) { - aNodeName.SetString("#comment"); + aNodeName.Assign("#comment"); return NS_OK; } diff --git a/mozilla/layout/base/src/nsDocument.cpp b/mozilla/layout/base/src/nsDocument.cpp index 61eb6743480..09174192a99 100644 --- a/mozilla/layout/base/src/nsDocument.cpp +++ b/mozilla/layout/base/src/nsDocument.cpp @@ -2097,7 +2097,7 @@ nsDocument::GetHeight(PRInt32* aHeight) NS_IMETHODIMP nsDocument::GetNodeName(nsString& aNodeName) { - aNodeName.SetString("#document"); + aNodeName.Assign("#document"); return NS_OK; } @@ -2587,9 +2587,9 @@ PRBool nsDocument::SetProperty(JSContext *aContext, JSObject *aObj, jsval aID if (JS_TypeOfValue(aContext, *aVp) == JSTYPE_FUNCTION && JSVAL_IS_STRING(aID)) { nsAutoString mPropName, mPrefix; - mPropName.SetString(JS_GetStringChars(JS_ValueToString(aContext, aID))); + mPropName.Assign(JS_GetStringChars(JS_ValueToString(aContext, aID))); if (mPropName.Length() > 2) - mPrefix.SetString(mPropName.GetUnicode(), 2); + mPrefix.Assign(mPropName.GetUnicode(), 2); if (mPrefix == "on") { nsCOMPtr atom = getter_AddRefs(NS_NewAtom(mPropName)); nsIEventListenerManager *mManager = nsnull; diff --git a/mozilla/layout/base/src/nsDocumentFragment.cpp b/mozilla/layout/base/src/nsDocumentFragment.cpp index 11e17f21dad..58b78f251eb 100644 --- a/mozilla/layout/base/src/nsDocumentFragment.cpp +++ b/mozilla/layout/base/src/nsDocumentFragment.cpp @@ -298,7 +298,7 @@ nsDocumentFragment::QueryInterface(REFNSIID aIID, void** aInstancePtr) NS_IMETHODIMP nsDocumentFragment::GetNodeName(nsString& aNodeName) { - aNodeName.SetString("#document-fragment"); + aNodeName.Assign("#document-fragment"); return NS_OK; } diff --git a/mozilla/layout/base/src/nsGenericDOMDataNode.cpp b/mozilla/layout/base/src/nsGenericDOMDataNode.cpp index c1d1c249fe0..84f9c1f90ef 100644 --- a/mozilla/layout/base/src/nsGenericDOMDataNode.cpp +++ b/mozilla/layout/base/src/nsGenericDOMDataNode.cpp @@ -240,10 +240,10 @@ nsresult nsGenericDOMDataNode::GetData(nsString& aData) { if (mText.Is2b()) { - aData.SetString(mText.Get2b(), mText.GetLength()); + aData.Assign(mText.Get2b(), mText.GetLength()); } else { - aData.SetString(mText.Get1b(), mText.GetLength()); + aData.Assign(mText.Get1b(), mText.GetLength()); } return NS_OK; } @@ -297,10 +297,10 @@ nsGenericDOMDataNode::SubstringData(PRUint32 aStart, amount = textLength - aStart; } if (mText.Is2b()) { - aReturn.SetString(mText.Get2b() + aStart, amount); + aReturn.Assign(mText.Get2b() + aStart, amount); } else { - aReturn.SetString(mText.Get1b() + aStart, amount); + aReturn.Assign(mText.Get1b() + aStart, amount); } return NS_OK; @@ -993,10 +993,10 @@ nsresult nsGenericDOMDataNode::CopyText(nsString& aResult) { if (mText.Is2b()) { - aResult.SetString(mText.Get2b(), mText.GetLength()); + aResult.Assign(mText.Get2b(), mText.GetLength()); } else { - aResult.SetString(mText.Get1b(), mText.GetLength()); + aResult.Assign(mText.Get1b(), mText.GetLength()); } return NS_OK; } diff --git a/mozilla/layout/base/src/nsGenericElement.cpp b/mozilla/layout/base/src/nsGenericElement.cpp index 2333d69bbdc..f053fc1bef0 100644 --- a/mozilla/layout/base/src/nsGenericElement.cpp +++ b/mozilla/layout/base/src/nsGenericElement.cpp @@ -1347,9 +1347,9 @@ nsGenericElement::SetProperty(JSContext *aContext, JSObject *aObj, jsval aID, js if (JS_TypeOfValue(aContext, *aVp) == JSTYPE_FUNCTION && JSVAL_IS_STRING(aID)) { nsAutoString propName, prefix; - propName.SetString(JS_GetStringChars(JS_ValueToString(aContext, aID))); + propName.Assign(JS_GetStringChars(JS_ValueToString(aContext, aID))); if (propName.Length() > 2) - prefix.SetString(propName.GetUnicode(), 2); + prefix.Assign(propName.GetUnicode(), 2); if (prefix == "on") { nsCOMPtr atom = getter_AddRefs(NS_NewAtom(propName)); nsIEventListenerManager *manager = nsnull; diff --git a/mozilla/layout/base/src/nsRange.cpp b/mozilla/layout/base/src/nsRange.cpp index f2ca70d58b2..0b29fb0a326 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.SetString("text/html"); + contentType.Assign("text/html"); } result = parser->ParseFragment(aFragment, (void*)0, diff --git a/mozilla/layout/base/src/nsTextNode.cpp b/mozilla/layout/base/src/nsTextNode.cpp index 49896125d80..6c7cf57d004 100644 --- a/mozilla/layout/base/src/nsTextNode.cpp +++ b/mozilla/layout/base/src/nsTextNode.cpp @@ -136,7 +136,7 @@ nsTextNode::GetTag(nsIAtom*& aResult) const NS_IMETHODIMP nsTextNode::GetNodeName(nsString& aNodeName) { - aNodeName.SetString("#text"); + aNodeName.Assign("#text"); return NS_OK; } diff --git a/mozilla/layout/generic/nsImageMap.cpp b/mozilla/layout/generic/nsImageMap.cpp index f3facac842f..d38e6058928 100644 --- a/mozilla/layout/generic/nsImageMap.cpp +++ b/mozilla/layout/generic/nsImageMap.cpp @@ -396,23 +396,23 @@ void Area::BeginConvertToXIF(nsXIFConverter& aConverter) const } } } - name.SetString("coords"); + name.Assign("coords"); aConverter.AddAttribute(name,coords); - name.SetString("href"); + name.Assign("href"); aConverter.AddAttribute(name,href); if (0 < target.Length()) { - name.SetString("target"); + name.Assign("target"); aConverter.AddAttribute(name,target); } if (0 < altText.Length()) { - name.SetString("alt"); + name.Assign("alt"); aConverter.AddAttribute(name,altText); } if (mSuppressFeedback) { - name.SetString("suppress"); + name.Assign("suppress"); aConverter.AddAttribute(name); } } diff --git a/mozilla/layout/html/base/src/nsImageMap.cpp b/mozilla/layout/html/base/src/nsImageMap.cpp index f3facac842f..d38e6058928 100644 --- a/mozilla/layout/html/base/src/nsImageMap.cpp +++ b/mozilla/layout/html/base/src/nsImageMap.cpp @@ -396,23 +396,23 @@ void Area::BeginConvertToXIF(nsXIFConverter& aConverter) const } } } - name.SetString("coords"); + name.Assign("coords"); aConverter.AddAttribute(name,coords); - name.SetString("href"); + name.Assign("href"); aConverter.AddAttribute(name,href); if (0 < target.Length()) { - name.SetString("target"); + name.Assign("target"); aConverter.AddAttribute(name,target); } if (0 < altText.Length()) { - name.SetString("alt"); + name.Assign("alt"); aConverter.AddAttribute(name,altText); } if (mSuppressFeedback) { - name.SetString("suppress"); + name.Assign("suppress"); aConverter.AddAttribute(name); } } diff --git a/mozilla/layout/html/content/src/nsAttributeContent.cpp b/mozilla/layout/html/content/src/nsAttributeContent.cpp index ba9f078ba25..b95c61f6027 100644 --- a/mozilla/layout/html/content/src/nsAttributeContent.cpp +++ b/mozilla/layout/html/content/src/nsAttributeContent.cpp @@ -454,10 +454,10 @@ nsAttributeContent::CopyText(nsString& aResult) { ValidateTextFragment(); if (mText.Is2b()) { - aResult.SetString(mText.Get2b(), mText.GetLength()); + aResult.Assign(mText.Get2b(), mText.GetLength()); } else { - aResult.SetString(mText.Get1b(), mText.GetLength()); + aResult.Assign(mText.Get1b(), mText.GetLength()); } return NS_OK; } diff --git a/mozilla/layout/html/content/src/nsHTMLButtonElement.cpp b/mozilla/layout/html/content/src/nsHTMLButtonElement.cpp index 625c33e9b87..f90dc0c69f5 100644 --- a/mozilla/layout/html/content/src/nsHTMLButtonElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLButtonElement.cpp @@ -239,7 +239,7 @@ nsHTMLButtonElement::GetForm(nsIDOMHTMLFormElement** aForm) NS_IMETHODIMP nsHTMLButtonElement::GetType(nsString& aType) { - aType.SetString("button"); + aType.Assign("button"); return NS_OK; } diff --git a/mozilla/layout/html/content/src/nsHTMLImageElement.cpp b/mozilla/layout/html/content/src/nsHTMLImageElement.cpp index 738bb3b1bad..059693201be 100644 --- a/mozilla/layout/html/content/src/nsHTMLImageElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLImageElement.cpp @@ -573,7 +573,7 @@ nsHTMLImageElement::SetProperty(JSContext *aContext, JSObject *aObj, jsval aID, // Get the parameter passed in JSString *jsstring; if ((jsstring = JS_ValueToString(aContext, *aVp)) != nsnull) { - src.SetString(JS_GetStringChars(jsstring)); + src.Assign(JS_GetStringChars(jsstring)); } else { src.Truncate(); diff --git a/mozilla/layout/html/content/src/nsHTMLSelectElement.cpp b/mozilla/layout/html/content/src/nsHTMLSelectElement.cpp index a60c8b38788..18f32da98bc 100644 --- a/mozilla/layout/html/content/src/nsHTMLSelectElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLSelectElement.cpp @@ -455,10 +455,10 @@ nsHTMLSelectElement::GetType(nsString& aType) result = GetMultiple(&isMultiple); if (NS_OK == result) { if (isMultiple) { - aType.SetString("select-multiple"); + aType.Assign("select-multiple"); } else { - aType.SetString("select-one"); + aType.Assign("select-one"); } } diff --git a/mozilla/layout/html/content/src/nsHTMLTextAreaElement.cpp b/mozilla/layout/html/content/src/nsHTMLTextAreaElement.cpp index 1e863314058..4fbeee4e4c6 100644 --- a/mozilla/layout/html/content/src/nsHTMLTextAreaElement.cpp +++ b/mozilla/layout/html/content/src/nsHTMLTextAreaElement.cpp @@ -373,7 +373,7 @@ NS_IMPL_INT_ATTR(nsHTMLTextAreaElement, TabIndex, tabindex) NS_IMETHODIMP nsHTMLTextAreaElement::GetType(nsString& aType) { - aType.SetString("textarea"); + aType.Assign("textarea"); return NS_OK; } diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp index 94649437947..6ce675757c6 100644 --- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp @@ -3333,7 +3333,7 @@ HTMLContentSink::ProcessLink(nsIHTMLContent* aElement, const nsString& aLinkData PRUnichar endCh; while (kNullCh != *start) { - while ((kNullCh != *start) && nsString::IsSpace(*start)) { // skip leading space + while ((kNullCh != *start) && nsCRT::IsAsciiSpace(*start)) { // skip leading space start++; } @@ -3389,7 +3389,7 @@ HTMLContentSink::ProcessLink(nsIHTMLContent* aElement, const nsString& aLinkData attr.StripWhitespace(); PRUnichar* value = ++equals; - while (nsString::IsSpace(*value)) { + while (nsCRT::IsAsciiSpace(*value)) { value++; } if (((kApostrophe == *value) || (kQuote == *value)) && @@ -3463,13 +3463,13 @@ static void ParseLinkTypes(const nsString& aTypes, nsStringArray& aResult) PRUnichar* end = start; while (kNullCh != *start) { - while ((kNullCh != *start) && nsString::IsSpace(*start)) { // skip leading space + while ((kNullCh != *start) && nsCRT::IsAsciiSpace(*start)) { // skip leading space start++; } end = start; - while ((kNullCh != *end) && (! nsString::IsSpace(*end))) { // look for space + while ((kNullCh != *end) && (! nsCRT::IsAsciiSpace(*end))) { // look for space end++; } *end = kNullCh; // end string here diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp index 38dde7634de..15b79546d9b 100644 --- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp @@ -365,7 +365,7 @@ nsHTMLDocument::Reset(nsIChannel* aChannel, nsILoadGroup* aLoadGroup) NS_IMETHODIMP nsHTMLDocument::GetContentType(nsString& aContentType) const { - aContentType.SetString("text/html"); + aContentType.Assign("text/html"); return NS_OK; } @@ -531,7 +531,7 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand, "%c", #endif &prtime); - lastModified.SetString(buf); + lastModified.Assign(buf); SetLastModified(lastModified); } @@ -1469,7 +1469,7 @@ nsHTMLDocument::GetDomain(nsString& aDomain) char *hostName; if (NS_FAILED(uri->GetHost(&hostName))) return NS_ERROR_FAILURE; - aDomain.SetString(hostName); + aDomain.Assign(hostName); nsCRT::free(hostName); return NS_OK; @@ -2288,7 +2288,7 @@ nsHTMLDocument::GetLastModified(nsString& aLastModified) aLastModified = *mLastModified; } else { - aLastModified.SetString("January 1, 1970 GMT"); + aLastModified.Assign("January 1, 1970 GMT"); } return NS_OK; diff --git a/mozilla/layout/html/style/src/nsCSSParser.cpp b/mozilla/layout/html/style/src/nsCSSParser.cpp index 32df9f5516a..a98d45b95fd 100644 --- a/mozilla/layout/html/style/src/nsCSSParser.cpp +++ b/mozilla/layout/html/style/src/nsCSSParser.cpp @@ -1874,13 +1874,13 @@ PRBool CSSParserImpl::ParseColor(PRInt32& aErrorCode, nsCSSValue& aValue) char buffer[10]; switch (tk->mType) { case eCSSToken_Ident: - str.SetString(tk->mIdent); + str.Assign(tk->mIdent); break; case eCSSToken_Number: if (tk->mIntegerValid) { sprintf(buffer, "%06d", tk->mInteger); - str.SetString(buffer); + str.Assign(buffer); } break; @@ -1888,7 +1888,7 @@ PRBool CSSParserImpl::ParseColor(PRInt32& aErrorCode, nsCSSValue& aValue) if (tk->mIdent.Length() <= 6) { sprintf(buffer, "%06.0f", tk->mNumber); nsAutoString temp; - temp.SetString(buffer); + temp.Assign(buffer); temp.Right(str, 6 - tk->mIdent.Length()); str.Append(tk->mIdent); } diff --git a/mozilla/layout/html/style/src/nsDOMCSSDeclaration.cpp b/mozilla/layout/html/style/src/nsDOMCSSDeclaration.cpp index f81a1c4dcab..30b5f752858 100644 --- a/mozilla/layout/html/style/src/nsDOMCSSDeclaration.cpp +++ b/mozilla/layout/html/style/src/nsDOMCSSDeclaration.cpp @@ -188,7 +188,7 @@ nsDOMCSSDeclaration::GetPropertyPriority(const nsString& aPropertyName, } if ((NS_OK == result) && isImportant) { - aReturn.SetString("!important"); + aReturn.Assign("!important"); } else { aReturn.SetLength(0); diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp index 32df9f5516a..a98d45b95fd 100644 --- a/mozilla/layout/style/nsCSSParser.cpp +++ b/mozilla/layout/style/nsCSSParser.cpp @@ -1874,13 +1874,13 @@ PRBool CSSParserImpl::ParseColor(PRInt32& aErrorCode, nsCSSValue& aValue) char buffer[10]; switch (tk->mType) { case eCSSToken_Ident: - str.SetString(tk->mIdent); + str.Assign(tk->mIdent); break; case eCSSToken_Number: if (tk->mIntegerValid) { sprintf(buffer, "%06d", tk->mInteger); - str.SetString(buffer); + str.Assign(buffer); } break; @@ -1888,7 +1888,7 @@ PRBool CSSParserImpl::ParseColor(PRInt32& aErrorCode, nsCSSValue& aValue) if (tk->mIdent.Length() <= 6) { sprintf(buffer, "%06.0f", tk->mNumber); nsAutoString temp; - temp.SetString(buffer); + temp.Assign(buffer); temp.Right(str, 6 - tk->mIdent.Length()); str.Append(tk->mIdent); } diff --git a/mozilla/layout/style/nsDOMCSSDeclaration.cpp b/mozilla/layout/style/nsDOMCSSDeclaration.cpp index f81a1c4dcab..30b5f752858 100644 --- a/mozilla/layout/style/nsDOMCSSDeclaration.cpp +++ b/mozilla/layout/style/nsDOMCSSDeclaration.cpp @@ -188,7 +188,7 @@ nsDOMCSSDeclaration::GetPropertyPriority(const nsString& aPropertyName, } if ((NS_OK == result) && isImportant) { - aReturn.SetString("!important"); + aReturn.Assign("!important"); } else { aReturn.SetLength(0); diff --git a/mozilla/layout/xbl/src/nsXBLBinding.cpp b/mozilla/layout/xbl/src/nsXBLBinding.cpp index 93fb9ef37be..b8965e0b43f 100644 --- a/mozilla/layout/xbl/src/nsXBLBinding.cpp +++ b/mozilla/layout/xbl/src/nsXBLBinding.cpp @@ -612,13 +612,13 @@ nsXBLBinding::IsInExcludesList(nsIAtom* aTag, const nsString& aList) // found inside of 'blur'. if (indx > 0) { PRUnichar ch = aList[indx - 1]; - if (! nsString::IsSpace(ch) && ch != PRUnichar(',')) + if (! nsCRT::IsAsciiSpace(ch) && ch != PRUnichar(',')) return PR_FALSE; } if (indx + element.Length() < aList.Length()) { PRUnichar ch = aList[indx + element.Length()]; - if (! nsString::IsSpace(ch) && ch != PRUnichar(',')) + if (! nsCRT::IsAsciiSpace(ch) && ch != PRUnichar(',')) return PR_FALSE; } diff --git a/mozilla/layout/xml/content/src/nsXMLCDATASection.cpp b/mozilla/layout/xml/content/src/nsXMLCDATASection.cpp index 02f007da025..8f16ea067b5 100644 --- a/mozilla/layout/xml/content/src/nsXMLCDATASection.cpp +++ b/mozilla/layout/xml/content/src/nsXMLCDATASection.cpp @@ -143,7 +143,7 @@ nsXMLCDATASection::GetTag(nsIAtom*& aResult) const NS_IMETHODIMP nsXMLCDATASection::GetNodeName(nsString& aNodeName) { - aNodeName.SetString("#cdata-section"); + aNodeName.Assign("#cdata-section"); return NS_OK; } diff --git a/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp b/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp index 18820614dba..f7ecce6abf1 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp @@ -1033,7 +1033,7 @@ msg_generate_message_id (nsIMsgIdentity *identity) if (host) { const char *s; for (s = ++host; *s; s++) - if (!nsString::IsAlpha(*s) && !nsString::IsDigit(*s) && + if (!nsCRT::IsAsciiAlpha(*s) && !nsString::IsDigit(*s) && *s != '-' && *s != '_' && *s != '.') { host = 0; break; diff --git a/mozilla/mailnews/mime/src/mimedrft.cpp b/mozilla/mailnews/mime/src/mimedrft.cpp index 7a954eb2540..933a879dc65 100644 --- a/mozilla/mailnews/mime/src/mimedrft.cpp +++ b/mozilla/mailnews/mime/src/mimedrft.cpp @@ -647,18 +647,18 @@ mime_insert_all_headers(char **body, /* Back up over whitespace before the colon. */ ocolon = colon; - for (; colon > head && nsString::IsSpace(colon[-1]); colon--) + for (; colon > head && nsCRT::IsAsciiSpace(colon[-1]); colon--) ; contents = ocolon + 1; } /* Skip over whitespace after colon. */ - while (contents <= end && nsString::IsSpace(*contents)) + while (contents <= end && nsCRT::IsAsciiSpace(*contents)) contents++; /* Take off trailing whitespace... */ - while (end > contents && nsString::IsSpace(end[-1])) + while (end > contents && nsCRT::IsAsciiSpace(end[-1])) end--; name = (char *)PR_MALLOC(colon - head + 1); diff --git a/mozilla/mailnews/mime/src/mimehdrs.cpp b/mozilla/mailnews/mime/src/mimehdrs.cpp index 91357d3aea1..da2b2010879 100644 --- a/mozilla/mailnews/mime/src/mimehdrs.cpp +++ b/mozilla/mailnews/mime/src/mimehdrs.cpp @@ -366,7 +366,7 @@ MimeHeaders_get (MimeHeaders *hdrs, const char *header_name, /* Back up over whitespace before the colon. */ ocolon = colon; - for (; colon > head && nsString::IsSpace(colon[-1]); colon--) + for (; colon > head && nsCRT::IsAsciiSpace(colon[-1]); colon--) ; /* If the strings aren't the same length, it doesn't match. */ @@ -383,7 +383,7 @@ MimeHeaders_get (MimeHeaders *hdrs, const char *header_name, char *s; /* Skip over whitespace after colon. */ - while (contents <= end && nsString::IsSpace(*contents)) + while (contents <= end && nsCRT::IsAsciiSpace(*contents)) contents++; /* If we're supposed to strip at the frist token, pull `end' back to @@ -392,7 +392,7 @@ MimeHeaders_get (MimeHeaders *hdrs, const char *header_name, if (strip_p) { for (s = contents; - s <= end && *s != ';' && *s != ',' && !nsString::IsSpace(*s); + s <= end && *s != ';' && *s != ',' && !nsCRT::IsAsciiSpace(*s); s++) ; end = s; @@ -435,7 +435,7 @@ MimeHeaders_get (MimeHeaders *hdrs, const char *header_name, } /* Take off trailing whitespace... */ - while (end > contents && nsString::IsSpace(end[-1])) + while (end > contents && nsCRT::IsAsciiSpace(end[-1])) end--; if (end > contents) @@ -490,7 +490,7 @@ MimeHeaders_get_parameter (const char *header_value, const char *parm_name, if (*str) str++; /* Skip over following whitespace */ - for (; *str && nsString::IsSpace(*str); str++) + for (; *str && nsCRT::IsAsciiSpace(*str); str++) ; if (!*str) return 0; @@ -502,24 +502,24 @@ MimeHeaders_get_parameter (const char *header_value, const char *parm_name, const char *value_start = str; const char *value_end = 0; - PR_ASSERT(!nsString::IsSpace(*str)); /* should be after whitespace already */ + PR_ASSERT(!nsCRT::IsAsciiSpace(*str)); /* should be after whitespace already */ /* Skip forward to the end of this token. */ - for (; *str && !nsString::IsSpace(*str) && *str != '=' && *str != ';'; str++) + for (; *str && !nsCRT::IsAsciiSpace(*str) && *str != '=' && *str != ';'; str++) ; token_end = str; /* Skip over whitespace, '=', and whitespace */ - while (nsString::IsSpace (*str)) str++; + while (nsCRT::IsAsciiSpace (*str)) str++; if (*str == '=') str++; - while (nsString::IsSpace (*str)) str++; + while (nsCRT::IsAsciiSpace (*str)) str++; if (*str != '"') { /* The value is a token, not a quoted string. */ value_start = str; for (value_end = str; - *value_end && !nsString::IsSpace (*value_end) && *value_end != ';'; + *value_end && !nsCRT::IsAsciiSpace (*value_end) && *value_end != ';'; value_end++) ; str = value_end; @@ -645,9 +645,9 @@ MimeHeaders_get_parameter (const char *header_value, const char *parm_name, /* str now points after the end of the value. skip over whitespace, ';', whitespace. */ - while (nsString::IsSpace (*str)) str++; + while (nsCRT::IsAsciiSpace (*str)) str++; if (*str == ';') str++; - while (nsString::IsSpace (*str)) str++; + while (nsCRT::IsAsciiSpace (*str)) str++; } return s; } @@ -756,18 +756,18 @@ MimeHeaders_write_all_headers (MimeHeaders *hdrs, MimeDisplayOptions *opt, PRBoo /* Back up over whitespace before the colon. */ ocolon = colon; - for (; colon > head && nsString::IsSpace(colon[-1]); colon--) + for (; colon > head && nsCRT::IsAsciiSpace(colon[-1]); colon--) ; contents = ocolon + 1; } /* Skip over whitespace after colon. */ - while (contents <= end && nsString::IsSpace(*contents)) + while (contents <= end && nsCRT::IsAsciiSpace(*contents)) contents++; /* Take off trailing whitespace... */ - while (end > contents && nsString::IsSpace(end[-1])) + while (end > contents && nsCRT::IsAsciiSpace(end[-1])) end--; name = (char *)PR_MALLOC(colon - head + 1); @@ -831,7 +831,7 @@ MIME_StripContinuations(char *original) { p2++; } - while((*p2 == CR) || (*p2 == LF) || nsString::IsSpace(*p2)); + while((*p2 == CR) || (*p2 == LF) || nsCRT::IsAsciiSpace(*p2)); if (*p2 == '\0') continue; /* drop out of loop at end of string*/ } diff --git a/mozilla/mailnews/mime/src/mimemrel.cpp b/mozilla/mailnews/mime/src/mimemrel.cpp index 6caf39d6e63..e74af1b5d99 100644 --- a/mozilla/mailnews/mime/src/mimemrel.cpp +++ b/mozilla/mailnews/mime/src/mimemrel.cpp @@ -741,7 +741,7 @@ flush_tag(MimeMultipartRelated* relobj) isquote = PR_TRUE; /* Take up the double quote and leading space here as well. */ /* Safe because there's a '>' at the end */ - do {ptr++;} while (nsString::IsSpace(*ptr)); + do {ptr++;} while (nsCRT::IsAsciiSpace(*ptr)); } } status = real_write(relobj, buf, ptr - buf); @@ -753,7 +753,7 @@ flush_tag(MimeMultipartRelated* relobj) ptr = mime_strnchr(buf, '"', length - (buf - relobj->curtag)); } else { for (ptr = buf; *ptr ; ptr++) { - if (*ptr == '>' || nsString::IsSpace(*ptr)) break; + if (*ptr == '>' || nsCRT::IsAsciiSpace(*ptr)) break; } PR_ASSERT(*ptr); } @@ -766,7 +766,7 @@ flush_tag(MimeMultipartRelated* relobj) substitute the appropriate mailbox part URL in its place. */ ptr2=buf; /* walk from the left end rightward */ - while((ptr2 4) && @@ -832,7 +832,7 @@ flush_tag(MimeMultipartRelated* relobj) /* Advance to the beginning of the next word, or to the end of the value string. */ - while((ptr2 start && *prev != ','; prev--) ; diff --git a/mozilla/mailnews/mime/src/mimethtm.cpp b/mozilla/mailnews/mime/src/mimethtm.cpp index 789ab22ef84..057cb9657ce 100644 --- a/mozilla/mailnews/mime/src/mimethtm.cpp +++ b/mozilla/mailnews/mime/src/mimethtm.cpp @@ -110,7 +110,7 @@ MimeInlineTextHTML_parse_begin (MimeObject *obj) for (in = base_hdr; *in; in++) /* ignore whitespace and quotes */ - if (!nsString::IsSpace(*in) && *in != '"') + if (!nsCRT::IsAsciiSpace(*in) && *in != '"') *out++ = *in; /* Close the tag and argument. */ diff --git a/mozilla/mailnews/mime/src/mimetric.cpp b/mozilla/mailnews/mime/src/mimetric.cpp index 9e9ededaf96..42b3ccacee5 100644 --- a/mozilla/mailnews/mime/src/mimetric.cpp +++ b/mozilla/mailnews/mime/src/mimetric.cpp @@ -97,7 +97,7 @@ MimeRichtextConvert (char *line, PRInt32 length, if (enriched_p) { for (this_start = line; this_start < line + length; this_start++) - if (!nsString::IsSpace (*this_start)) break; + if (!nsCRT::IsAsciiSpace (*this_start)) break; if (this_start >= line + length) /* blank line */ { PL_strcpy (*obufferP, "
"); @@ -127,7 +127,7 @@ MimeRichtextConvert (char *line, PRInt32 length, { this_end++; while (this_end < data_end && - !nsString::IsSpace (*this_end) && + !nsCRT::IsAsciiSpace (*this_end) && *this_end != '<' && *this_end != '>' && *this_end != '&') this_end++; diff --git a/mozilla/mailnews/mime/src/mimeunty.cpp b/mozilla/mailnews/mime/src/mimeunty.cpp index 51bcc36b743..84c01797496 100644 --- a/mozilla/mailnews/mime/src/mimeunty.cpp +++ b/mozilla/mailnews/mime/src/mimeunty.cpp @@ -396,7 +396,7 @@ MimeUntypedText_uu_begin_line_p(const char *line, PRInt32 length, if (*s != ' ') return PR_FALSE; } - while (nsString::IsSpace(*s)) + while (nsCRT::IsAsciiSpace(*s)) s++; name = (char *) PR_MALLOC(((line+length)-s) + 1); @@ -436,7 +436,7 @@ MimeUntypedText_uu_end_line_p(const char *line, PRInt32 length) return (line[0] == 'e' && line[1] == 'n' && line[2] == 'd' && - (line[3] == 0 || nsString::IsSpace(line[3]))); + (line[3] == 0 || nsCRT::IsAsciiSpace(line[3]))); #else /* ...but, why don't we accept any line that begins with the three letters "END" in any case: I've seen lots of partial messages @@ -471,7 +471,7 @@ MimeUntypedText_binhex_begin_line_p(const char *line, PRInt32 length, if (length <= BINHEX_MAGIC_LEN) return PR_FALSE; - while(length > 0 && nsString::IsSpace(line[length-1])) + while(length > 0 && nsCRT::IsAsciiSpace(line[length-1])) length--; if (length != BINHEX_MAGIC_LEN) diff --git a/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp b/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp index 2fb1b4a9eaa..6589c76cf64 100644 --- a/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp +++ b/mozilla/mailnews/mime/src/nsMsgHeaderParser.cpp @@ -193,7 +193,7 @@ NS_IMETHODIMP nsMsgHeaderParserResult::GetNext(nsISupports ** aNextResultPair) nsCRT::memcpy(_D,_S,_LEN); _D += _LEN; } } while (0) //#define NEXT_CHAR(_STR) (_STR = (* (char *) _STR < 128) ? (char *) _STR + 1 : NextChar_UTF8((char *)_STR)) #define NEXT_CHAR(_STR) (_STR = NextChar_UTF8((char *)_STR)) -#define TRIM_WHITESPACE(_S,_E,_T) do { while (_E > _S && nsString::IsSpace(_E[-1])) _E--;\ +#define TRIM_WHITESPACE(_S,_E,_T) do { while (_E > _S && nsCRT::IsAsciiSpace(_E[-1])) _E--;\ *_E++ = _T; } while (0) /* @@ -621,7 +621,7 @@ static int msg_parse_Header_addresses (const char *line, char **names, char **ad /* Skip over extra whitespace or commas before addresses. */ - while (*line_end && (nsString::IsSpace(*line_end) || *line_end == ',')) + while (*line_end && (nsCRT::IsAsciiSpace(*line_end) || *line_end == ',')) NEXT_CHAR(line_end); while (*line_end) @@ -712,12 +712,12 @@ static int msg_parse_Header_addresses (const char *line, char **names, char **ad /* Push out some whitespace before the paren, if * there is non-whitespace there already. */ - if (name_out > name_start && !nsString::IsSpace(name_out [-1])) + if (name_out > name_start && !nsCRT::IsAsciiSpace(name_out [-1])) *name_out++ = ' '; /* Skip leading whitespace. */ - while (nsString::IsSpace(*s) && s < line_end) + while (nsCRT::IsAsciiSpace(*s) && s < line_end) s++; while (s < line_end) @@ -733,7 +733,7 @@ static int msg_parse_Header_addresses (const char *line, char **names, char **ad if (*s == '\\') /* remove one \ */ s++; - if (nsString::IsSpace(*s) && name_out > name_start && nsString::IsSpace(name_out[-1])) + if (nsCRT::IsAsciiSpace(*s) && name_out > name_start && nsCRT::IsAsciiSpace(name_out[-1])) /* collapse consecutive whitespace */; else COPY_CHAR(name_out, s); @@ -753,8 +753,8 @@ static int msg_parse_Header_addresses (const char *line, char **names, char **ad /* Eat whitespace at the beginning of the line, * and eat consecutive whitespace within the line. */ - if ( nsString::IsSpace(*line_end) - && (addr_out == addr_start || nsString::IsSpace(addr_out[-1]))) + if ( nsCRT::IsAsciiSpace(*line_end) + && (addr_out == addr_start || nsCRT::IsAsciiSpace(addr_out[-1]))) /* skip it */; else COPY_CHAR(addr_out, line_end); @@ -793,7 +793,7 @@ static int msg_parse_Header_addresses (const char *line, char **names, char **ad /* Skip leading whitespace. */ - while (nsString::IsSpace(*s) && s < mailbox_start) + while (nsCRT::IsAsciiSpace(*s) && s < mailbox_start) s++; /* Copy up to (not including) the < @@ -812,7 +812,7 @@ static int msg_parse_Header_addresses (const char *line, char **names, char **ad else s++; } - if (nsString::IsSpace(*s) && name_out > name_start && nsString::IsSpace(name_out[-1])) + if (nsCRT::IsAsciiSpace(*s) && name_out > name_start && nsCRT::IsAsciiSpace(name_out[-1])) /* collapse consecutive whitespace */; else COPY_CHAR(name_out, s); @@ -827,7 +827,7 @@ static int msg_parse_Header_addresses (const char *line, char **names, char **ad /* Skip whitespace after > */ - while (nsString::IsSpace(*s) && s < line_end) + while (nsCRT::IsAsciiSpace(*s) && s < line_end) s++; /* Copy from just after > to the end. @@ -846,7 +846,7 @@ static int msg_parse_Header_addresses (const char *line, char **names, char **ad else s++; } - if (nsString::IsSpace (*s) && name_out > name_start && nsString::IsSpace (name_out[-1])) + if (nsCRT::IsAsciiSpace (*s) && name_out > name_start && nsCRT::IsAsciiSpace (name_out[-1])) /* collapse consecutive whitespace */; else COPY_CHAR(name_out, s); @@ -864,7 +864,7 @@ static int msg_parse_Header_addresses (const char *line, char **names, char **ad /* Skip leading whitespace. */ - while (nsString::IsSpace(*s) && s < mailbox_end) + while (nsCRT::IsAsciiSpace(*s) && s < mailbox_end) s++; /* Copy up to (not including) the > @@ -910,7 +910,7 @@ static int msg_parse_Header_addresses (const char *line, char **names, char **ad { if (*s == '\\') s++; - else if (!space && nsString::IsSpace(*s)) + else if (!space && nsCRT::IsAsciiSpace(*s)) space = s; else if (*s == '\"') { @@ -924,7 +924,7 @@ static int msg_parse_Header_addresses (const char *line, char **names, char **ad { if (*s == '\\') s++; - else if (nsString::IsSpace(*s)) + else if (nsCRT::IsAsciiSpace(*s)) { *s = 0; *name_out++ = 0; @@ -966,7 +966,7 @@ static int msg_parse_Header_addresses (const char *line, char **names, char **ad NEXT_CHAR(line_end); /* Skip over extra whitespace or commas between addresses. */ - while (*line_end && (nsString::IsSpace(*line_end) || *line_end == ',')) + while (*line_end && (nsCRT::IsAsciiSpace(*line_end) || *line_end == ',')) line_end++; this_start = line_end; @@ -980,10 +980,10 @@ static int msg_parse_Header_addresses (const char *line, char **names, char **ad { char *s; for (s = name_buf; s < name_out; NEXT_CHAR(s)) - if (nsString::IsSpace(*s) && *s != ' ') + if (nsCRT::IsAsciiSpace(*s) && *s != ' ') *s = ' '; for (s = addr_buf; s < addr_out; NEXT_CHAR(s)) - if (nsString::IsSpace(*s) && *s != ' ') + if (nsCRT::IsAsciiSpace(*s) && *s != ' ') *s = ' '; } @@ -1034,7 +1034,7 @@ msg_quote_phrase_or_addr(char *address, PRInt32 length, PRBool addr_p) address = in; break; } - else if (!nsString::IsDigit(*in) && !nsString::IsAlpha(*in) && *in != '@' && *in != '.') + else if (!nsCRT::IsAsciiDigit(*in) && !nsCRT::IsAsciiAlpha(*in) && *in != '@' && *in != '.') break; } } diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index 24934e5bb7c..5d1a6dfb29c 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -2519,8 +2519,7 @@ NS_IMETHODIMP nsPluginHostImpl::SetCookie(const char* inCookieURL, const void* i return NS_ERROR_FAILURE; } - cookieString.SetString((const char *) inCookieBuffer, - (PRInt32) inCookieSize); + cookieString.Assign((const char *) inCookieBuffer,(PRInt32) inCookieSize); rv = cookieService->SetCookieString(uriIn, cookieString); diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp index 24934e5bb7c..5d1a6dfb29c 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -2519,8 +2519,7 @@ NS_IMETHODIMP nsPluginHostImpl::SetCookie(const char* inCookieURL, const void* i return NS_ERROR_FAILURE; } - cookieString.SetString((const char *) inCookieBuffer, - (PRInt32) inCookieSize); + cookieString.Assign((const char *) inCookieBuffer,(PRInt32) inCookieSize); rv = cookieService->SetCookieString(uriIn, cookieString); diff --git a/mozilla/netwerk/base/src/nsSimpleURI.cpp b/mozilla/netwerk/base/src/nsSimpleURI.cpp index d0022358662..3eb145a27f4 100644 --- a/mozilla/netwerk/base/src/nsSimpleURI.cpp +++ b/mozilla/netwerk/base/src/nsSimpleURI.cpp @@ -80,7 +80,7 @@ nsSimpleURI::GetSpec(char* *result) nsAutoString string; // NS_LOCK_INSTANCE(); - string.SetString(mScheme); + string.Assign(mScheme); string.Append(':'); string.Append(mPath); diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp index 27cd39dd755..62e6fb6cf68 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp @@ -1630,7 +1630,7 @@ nsFtpConnectionThread::Init(nsIProtocolHandler* aHandler, if (port > 0) mPort = port; - mCacheKey.SetString(host); + mCacheKey.Assign(host); mCacheKey.Append(port); NS_WITH_SERVICE(nsIEventQueueService, eqs, kEventQueueServiceCID, &rv); diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.cpp index 8d150674ec7..bddc3ec8416 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPHeaderArray.cpp @@ -165,7 +165,7 @@ nsresult nsHTTPHeaderArray::SetHeader(nsIAtom* aHeader, // Replace the existing string with the new value // else { - entry->mValue.SetString(aValue); + entry->mValue.Assign(aValue); } NS_RELEASE(entry); diff --git a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp index cb26b3dfe05..56aecd485d2 100644 --- a/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp +++ b/mozilla/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp @@ -204,14 +204,14 @@ mozTXTToHTMLConv::FindURLStart(const PRUnichar * aInString, PRInt32 aInLength, c { PRInt32 i = pos - 1; for (; i >= 0 && ( - nsString::IsAlpha(aInString[PRUint32(i)]) || - nsString::IsDigit(aInString[PRUint32(i)]) || + nsCRT::IsAsciiAlpha(aInString[PRUint32(i)]) || + nsCRT::IsAsciiDigit(aInString[PRUint32(i)]) || aInString[PRUint32(i)] == '+' || aInString[PRUint32(i)] == '-' || aInString[PRUint32(i)] == '.' ); i--) ; - if (nsString::IsAlpha(aInString[PRUint32(++i)])) + if (nsCRT::IsAsciiAlpha(aInString[PRUint32(++i)])) { start = PRUint32(i); return PR_TRUE; @@ -229,13 +229,13 @@ mozTXTToHTMLConv::FindURLStart(const PRUnichar * aInString, PRInt32 aInLength, c && aInString[PRUint32(i)] != '{' && aInString[PRUint32(i)] != '[' && aInString[PRUint32(i)] != '(' && aInString[PRUint32(i)] != '|' && aInString[PRUint32(i)] != '\\' - && !nsString::IsSpace(aInString[PRUint32(i)]) + && !nsCRT::IsAsciiSpace(aInString[PRUint32(i)]) ; i--) ; if ( - nsString::IsAlpha(aInString[PRUint32(++i)]) || - nsString::IsDigit(aInString[PRUint32(i)]) + nsCRT::IsAsciiAlpha(aInString[PRUint32(++i)]) || + nsCRT::IsAsciiDigit(aInString[PRUint32(i)]) ) { start = PRUint32(i); @@ -280,7 +280,7 @@ mozTXTToHTMLConv::FindURLEnd(const PRUnichar * aInString, PRInt32 aInStringLengt && aInString[i] != '`' && aInString[i] != '}' && aInString[i] != ']' && aInString[i] != ')' && aInString[i] != '|' - && !nsString::IsSpace(aInString[i]) + && !nsCRT::IsAsciiSpace(aInString[i]) ; i++) ; while (--i > pos && ( @@ -494,25 +494,25 @@ mozTXTToHTMLConv::ItMatchesDelimited(const PRUnichar * aInString, PRInt32 aInLen if ( before == LT_ALPHA - && !nsString::IsAlpha(text0) || + && !nsCRT::IsAsciiAlpha(text0) || before == LT_DIGIT - && !nsString::IsDigit(text0) || + && !nsCRT::IsAsciiDigit(text0) || before == LT_DELIMITER && ( - nsString::IsAlpha(text0) || - nsString::IsDigit(text0) || + nsCRT::IsAsciiAlpha(text0) || + nsCRT::IsAsciiDigit(text0) || text0 == *rep ) || after == LT_ALPHA - && !nsString::IsAlpha(textAfterPos) || + && !nsCRT::IsAsciiAlpha(textAfterPos) || after == LT_DIGIT - && !nsString::IsDigit(textAfterPos) || + && !nsCRT::IsAsciiDigit(textAfterPos) || after == LT_DELIMITER && ( - nsString::IsAlpha(textAfterPos) || - nsString::IsDigit(textAfterPos) || + nsCRT::IsAsciiAlpha(textAfterPos) || + nsCRT::IsAsciiDigit(textAfterPos) || textAfterPos == *rep ) || !(before == LT_IGNORE ? !nsCRT::strncasecmp(aInString, rep, aRepLen) : @@ -605,11 +605,11 @@ mozTXTToHTMLConv::SmilyHit(const PRUnichar * aInString, PRInt32 aLength, PRBool PRUint32 delim = (col0 ? 0 : 1) + tagLen; if ( - (col0 || nsString::IsSpace(aInString[0])) + (col0 || nsCRT::IsAsciiSpace(aInString[0])) && ( aLength <= PRInt32(delim) || - nsString::IsSpace(aInString[delim]) || + nsCRT::IsAsciiSpace(aInString[delim]) || aLength > PRInt32(delim + 1) && ( @@ -619,7 +619,7 @@ mozTXTToHTMLConv::SmilyHit(const PRUnichar * aInString, PRInt32 aLength, PRBool aInString[delim] == '!' || aInString[delim] == '?' ) - && nsString::IsSpace(aInString[delim + 1]) + && nsCRT::IsAsciiSpace(aInString[delim + 1]) ) && ItMatchesDelimited(aInString, aLength, tagTXT, aTagTxtLength, col0 ? LT_IGNORE : LT_DELIMITER, LT_IGNORE) @@ -753,11 +753,11 @@ mozTXTToHTMLConv::GlyphHit(const PRUnichar * aInString, PRInt32 aInLength, PRBoo // Find first non-digit PRInt32 delimPos = 3; // 3 = Position after first digit after "^" for (; delimPos < aInLength && - nsString::IsDigit(aInString[PRUint32(delimPos)]); delimPos++) + nsCRT::IsAsciiDigit(aInString[PRUint32(delimPos)]); delimPos++) ; // Note: (delimPos == text.Length()) could be true - if (nsString::IsAlpha(aInString[PRUint32(delimPos)])) + if (nsCRT::IsAsciiAlpha(aInString[PRUint32(delimPos)])) { MOZ_TIMER_STOP(mGlyphHitTimer); return PR_FALSE; @@ -842,9 +842,9 @@ mozTXTToHTMLConv::CiteLevelTXT(const PRUnichar *line, logLineStart is the position of "t" in this example */ PRUint32 i = logLineStart; - for (; PRInt32(i) < lineLength && nsString::IsSpace(line[i]); i++) + for (; PRInt32(i) < lineLength && nsCRT::IsAsciiSpace(line[i]); i++) ; - for (; PRInt32(i) < lineLength && nsString::IsAlpha(line[i]); i++) + for (; PRInt32(i) < lineLength && nsCRT::IsAsciiAlpha(line[i]); i++) ; if (line[i] == '>' || line[i] == ']') { diff --git a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp index 7dea551c284..6889d493904 100644 --- a/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp +++ b/mozilla/netwerk/streamconv/converters/nsFTPDirListingConv.cpp @@ -482,7 +482,7 @@ PRBool nsFTPDirListingConv::IsLSDate(char *aCStr) { /* must start with three alpha characters */ - if (!nsString::IsAlpha(*aCStr++) || !nsString::IsAlpha(*aCStr++) || !nsString::IsAlpha(*aCStr++)) + if (!nsCRT::IsAsciiAlpha(*aCStr++) || !nsCRT::IsAsciiAlpha(*aCStr++) || !nsCRT::IsAsciiAlpha(*aCStr++)) return PR_FALSE; /* space */ @@ -491,12 +491,12 @@ nsFTPDirListingConv::IsLSDate(char *aCStr) { aCStr++; /* space or digit */ - if ((*aCStr != ' ') && !nsString::IsDigit(*aCStr)) + if ((*aCStr != ' ') && !nsCRT::IsAsciiDigit(*aCStr)) return PR_FALSE; aCStr++; /* digit */ - if (!nsString::IsDigit(*aCStr)) + if (!nsCRT::IsAsciiDigit(*aCStr)) return PR_FALSE; aCStr++; @@ -506,27 +506,27 @@ nsFTPDirListingConv::IsLSDate(char *aCStr) { aCStr++; /* space or digit */ - if ((*aCStr != ' ') && !nsString::IsDigit(*aCStr)) + if ((*aCStr != ' ') && !nsCRT::IsAsciiDigit(*aCStr)) return PR_FALSE; aCStr++; /* digit */ - if (!nsString::IsDigit(*aCStr)) + if (!nsCRT::IsAsciiDigit(*aCStr)) return PR_FALSE; aCStr++; /* colon or digit */ - if ((*aCStr != ':') && !nsString::IsDigit(*aCStr)) + if ((*aCStr != ':') && !nsCRT::IsAsciiDigit(*aCStr)) return PR_FALSE; aCStr++; /* digit */ - if (!nsString::IsDigit(*aCStr)) + if (!nsCRT::IsAsciiDigit(*aCStr)) return PR_FALSE; aCStr++; /* space or digit */ - if ((*aCStr != ' ') && !nsString::IsDigit(*aCStr)) + if ((*aCStr != ' ') && !nsCRT::IsAsciiDigit(*aCStr)) return PR_FALSE; aCStr++; @@ -653,7 +653,7 @@ nsFTPDirListingConv::ParseLSLine(char *aLine, indexEntry *aEntry) { char *ptr, *escName; for (ptr = &aLine[PL_strlen(aLine) - 1]; - (ptr > aLine+13) && (!nsString::IsSpace(*ptr) || !IsLSDate(ptr-12)); ptr--) + (ptr > aLine+13) && (!nsCRT::IsAsciiSpace(*ptr) || !IsLSDate(ptr-12)); ptr--) ; /* null body */ save_char = *ptr; *ptr = '\0'; @@ -665,7 +665,7 @@ nsFTPDirListingConv::ParseLSLine(char *aLine, indexEntry *aEntry) { *ptr = save_char; // find the first whitespace and terminate for(ptr=aLine; *ptr != '\0'; ptr++) - if(nsString::IsSpace(*ptr)) { + if(nsCRT::IsAsciiSpace(*ptr)) { *ptr = '\0'; break; } @@ -683,7 +683,7 @@ nsFTPDirListingConv::ParseLSLine(char *aLine, indexEntry *aEntry) { // parse size if(ptr > aLine+15) { ptr -= 14; - while (nsString::IsDigit(*ptr)) { + while (nsCRT::IsAsciiDigit(*ptr)) { size_num += ((PRInt32) (*ptr - '0')) * base; base *= 10; ptr--; @@ -734,7 +734,7 @@ nsFTPDirListingConv::DigestBufferLines(char *aBuffer, nsCAutoString &aString) { // XXX we need to handle comments in the raw stream. // special case windows servers who masquerade as unix servers - if (NT == mServerType && !nsString::IsSpace(line[8])) + if (NT == mServerType && !nsCRT::IsAsciiSpace(line[8])) mServerType = UNIX; @@ -771,7 +771,7 @@ nsFTPDirListingConv::DigestBufferLines(char *aBuffer, nsCAutoString &aString) { /* strip off " -> pathname" */ PRInt32 i; - for (i = len - 1; (i > 3) && (!nsString::IsSpace(line[i]) + for (i = len - 1; (i > 3) && (!nsCRT::IsAsciiSpace(line[i]) || (line[i-1] != '>') || (line[i-2] != '-') || (line[i-3] != ' ')); i--) diff --git a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp index a048f379bd9..99ee988c1a4 100644 --- a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp +++ b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp @@ -269,8 +269,8 @@ nsStreamConverterService::ParseFromTo(const char *aProgID, nsCString &aFromRes, ProgIDStr.Mid(fromStr, fromLoc, toLoc - 4 - fromLoc); ProgIDStr.Mid(toStr, toLoc, ProgIDStr.Length() - toLoc); - aFromRes.SetString(fromStr); - aToRes.SetString(toStr); + aFromRes.Assign(fromStr); + aToRes.Assign(toStr); return NS_OK; } diff --git a/mozilla/parser/htmlparser/src/CRtfDTD.cpp b/mozilla/parser/htmlparser/src/CRtfDTD.cpp index bd3bdf883dc..0abf8646d3f 100644 --- a/mozilla/parser/htmlparser/src/CRtfDTD.cpp +++ b/mozilla/parser/htmlparser/src/CRtfDTD.cpp @@ -888,7 +888,8 @@ nsresult CRTFControlWord::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aM if(NS_SUCCEEDED(result)) { if(('a'<=theChar) && (theChar<='z')) { - result=aScanner.ReadWhile(mTextValue,gAlphaChars,PR_TRUE,PR_FALSE); + nsAutoString temp(gAlphaChars); + result=aScanner.ReadWhile(mTextValue,temp,PR_FALSE); if(NS_OK==result) { //ok, now look for an option parameter... @@ -899,7 +900,10 @@ nsresult CRTFControlWord::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aM case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case kMinus: - result=aScanner.ReadWhile(mArgument,gDigits,PR_TRUE,PR_FALSE); + { + nsAutoString theDigits(gDigits); + result=aScanner.ReadWhile(mArgument,theDigits,PR_FALSE); + } break; case kSpace: @@ -956,7 +960,7 @@ PRInt32 CRTFContent::GetTokenType() { nsresult CRTFContent::Consume(PRUnichar aChar,nsScanner& aScanner,PRInt32 aMode) { static const char* textTerminators="\\{}\r\n"; mTextValue.Append(aChar); - PRInt32 result=aScanner.ReadUntil(mTextValue,textTerminators,PR_FALSE,PR_FALSE); + PRInt32 result=aScanner.ReadUntil(mTextValue,textTerminators,PR_FALSE); if(NS_SUCCEEDED(result)) { mTypeID=eHTMLTag_text; } diff --git a/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp b/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp index 0894ef807e4..6469b7d3ebd 100644 --- a/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp +++ b/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp @@ -400,7 +400,7 @@ void nsExpatTokenizer::HandleStartElement(void *userData, const XML_Char *name, CToken* theToken = state->tokenRecycler->CreateTokenOfType(eToken_start,eHTMLTag_unknown); if(theToken) { nsString& theString=theToken->GetStringValueXXX(); - theString.SetString((PRUnichar *) name); + theString.Assign((PRUnichar *) name); AddToken(theToken, NS_OK, state->tokenDeque, state->tokenRecycler); int theAttrCount=0; while(*atts){ @@ -409,9 +409,9 @@ void nsExpatTokenizer::HandleStartElement(void *userData, const XML_Char *name, state->tokenRecycler->CreateTokenOfType(eToken_attribute, eHTMLTag_unknown); if(theAttrToken){ nsString& theKey=theAttrToken->GetKey(); - theKey.SetString((PRUnichar *) (*atts++)); + theKey.Assign((PRUnichar *) (*atts++)); nsString& theValue=theAttrToken->GetStringValueXXX(); - theValue.SetString((PRUnichar *) (*atts++)); + theValue.Assign((PRUnichar *) (*atts++)); } CToken* theTok=(CToken*)theAttrToken; AddToken(theTok, NS_OK, state->tokenDeque, state->tokenRecycler); @@ -428,7 +428,7 @@ void nsExpatTokenizer::HandleEndElement(void *userData, const XML_Char *name) { CToken* theToken = state->tokenRecycler->CreateTokenOfType(eToken_end,eHTMLTag_unknown); if(theToken) { nsString& theString=theToken->GetStringValueXXX(); - theString.SetString((PRUnichar *) name); + theString.Assign((PRUnichar *) name); AddToken(theToken, NS_OK, state->tokenDeque, state->tokenRecycler); } else{ @@ -479,7 +479,7 @@ void nsExpatTokenizer::HandleComment(void *userData, const XML_Char *name) { CToken* theToken = state->tokenRecycler->CreateTokenOfType(eToken_comment, eHTMLTag_unknown); if(theToken) { nsString& theString=theToken->GetStringValueXXX(); - theString.SetString((PRUnichar *) name); + theString.Assign((PRUnichar *) name); AddToken(theToken, NS_OK, state->tokenDeque, state->tokenRecycler); } else{ diff --git a/mozilla/parser/htmlparser/src/nsHTMLEntities.cpp b/mozilla/parser/htmlparser/src/nsHTMLEntities.cpp index 17a24e4f2be..4aeffeb4063 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLEntities.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLEntities.cpp @@ -33,7 +33,7 @@ struct EntityNode { mUnicode(-1) {} - EntityNode(const nsStr& aStringValue) + EntityNode(const nsString& aStringValue) : mStr(), mUnicode(-1) { // point to the incomming buffer @@ -146,9 +146,8 @@ nsHTMLEntities::ReleaseTable(void) } } - PRInt32 -nsHTMLEntities::EntityToUnicode(const nsStr& aEntity) +nsHTMLEntities::EntityToUnicode(const nsString& aEntity) { NS_ASSERTION(gEntityToCodeTree, "no lookup table, needs addref"); if (gEntityToCodeTree) { @@ -167,7 +166,7 @@ nsHTMLEntities::EntityToUnicode(const nsStr& aEntity) EntityNode node(aEntity); EntityNode* found = (EntityNode*)gEntityToCodeTree->FindItem(&node); if (found) { - NS_ASSERTION(found->mStr.Equals(aEntity), "bad tree"); + NS_ASSERTION(found->mStr.Equals(aEntity.mUStr,PR_FALSE,aEntity.mLength), "bad tree"); return found->mUnicode; } } @@ -213,7 +212,7 @@ public: NS_ASSERTION(value == gEntityArray[i].mUnicode, "bad unicode value"); entity = nsHTMLEntities::UnicodeToEntity(value); - NS_ASSERTION(entity.Equals(gEntityArray[i].mStr), "bad entity name"); + NS_ASSERTION(entity.Equals(gEntityArray[i].mStr.mStr), "bad entity name"); } // Make sure we don't find things that aren't there diff --git a/mozilla/parser/htmlparser/src/nsHTMLEntities.h b/mozilla/parser/htmlparser/src/nsHTMLEntities.h index 6da76800dc7..033535728c2 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLEntities.h +++ b/mozilla/parser/htmlparser/src/nsHTMLEntities.h @@ -23,9 +23,7 @@ #define nsHTMLEntities_h___ #include "nshtmlpars.h" - -struct nsStr; -class nsCString; +#include "nsString.h" class NS_HTMLPARS nsHTMLEntities { public: @@ -39,7 +37,7 @@ public: * passed in must NOT have the leading "&" nor the trailing ";" * in it. */ - static PRInt32 EntityToUnicode(const nsStr& aEntity); + static PRInt32 EntityToUnicode(const nsString& aEntity); /** * Translate an entity string into it's unicode value. This call diff --git a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp index f3fc74cbac3..11e04dad1f3 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLTags.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLTags.cpp @@ -111,7 +111,30 @@ nsHTMLTags::ReleaseTable(void) nsHTMLTag -nsHTMLTags::LookupTag(const nsStr& aTag) +nsHTMLTags::LookupTag(const nsString& aTag) +{ + NS_ASSERTION(gTagTree, "no lookup table, needs addref"); + if (gTagTree) { + TagNode node(aTag); + TagNode* found = (TagNode*)gTagTree->FindItem(&node); + if (found) { + NS_ASSERTION(found->mStr.EqualsIgnoreCase(aTag), "bad tree"); + return found->mEnum; + } + else { + // hack: this can come out when rickg provides a way for the editor to ask + // CanContain() questions without having to first fetch the parsers + // internal enum values for a tag name. + nsAutoString textTag("__moz_text"); + if (textTag==aTag) + return eHTMLTag_text; + } + } + return eHTMLTag_userdefined; +} + +nsHTMLTag +nsHTMLTags::LookupTag(const nsCString& aTag) { NS_ASSERTION(gTagTree, "no lookup table, needs addref"); if (gTagTree) { diff --git a/mozilla/parser/htmlparser/src/nsHTMLTags.h b/mozilla/parser/htmlparser/src/nsHTMLTags.h index 62591230a96..d98163b9160 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLTags.h +++ b/mozilla/parser/htmlparser/src/nsHTMLTags.h @@ -25,7 +25,7 @@ #include "nshtmlpars.h" -struct nsStr; +class nsString; class nsCString; /* @@ -55,7 +55,8 @@ public: static void AddRefTable(void); static void ReleaseTable(void); - static nsHTMLTag LookupTag(const nsStr& aTag); + static nsHTMLTag LookupTag(const nsString& aTag); + static nsHTMLTag LookupTag(const nsCString& aTag); static const nsCString& GetStringValue(nsHTMLTag aEnum); static const char* GetCStringValue(nsHTMLTag aEnum); }; diff --git a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp index c1f77fbb878..e947276b92d 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp @@ -899,7 +899,7 @@ nsHTMLToTXTSinkStream::FlushLine() WriteSimple(mCurrentLine); mColPos += mCurrentLine.Length(); - mCurrentLine.SetString(""); + mCurrentLine.Truncate(); } } @@ -986,7 +986,7 @@ nsHTMLToTXTSinkStream::AddToLine(const PRUnichar * aLineFragment, PRInt32 aLineF // Must wrap. Let's find a good place to do that. PRInt32 goodSpace = mWrapColumn-prefixwidth; while (goodSpace >= 0 && - !nsString::IsSpace(mCurrentLine.CharAt(goodSpace))) { + !nsCRT::IsAsciiSpace(mCurrentLine.CharAt(goodSpace))) { goodSpace--; } @@ -996,7 +996,7 @@ nsHTMLToTXTSinkStream::AddToLine(const PRUnichar * aLineFragment, PRInt32 aLineF // try to find another place to break goodSpace=mWrapColumn-prefixwidth; while (goodSpace < linelength && - !nsString::IsSpace(mCurrentLine.CharAt(goodSpace))) { + !nsCRT::IsAsciiSpace(mCurrentLine.CharAt(goodSpace))) { goodSpace++; } } @@ -1006,7 +1006,7 @@ nsHTMLToTXTSinkStream::AddToLine(const PRUnichar * aLineFragment, PRInt32 aLineF mCurrentLine.Right(restOfLine, linelength-goodSpace-1); mCurrentLine.Cut(goodSpace, linelength-goodSpace); EndLine(PR_TRUE); - mCurrentLine.SetString(""); + mCurrentLine.Truncate(); // Space stuff new line? if(mFlags & nsIDocumentEncoder::OutputFormatFlowed) { if((restOfLine[0] == '>') || @@ -1050,7 +1050,7 @@ nsHTMLToTXTSinkStream::EndLine(PRBool softlinebreak) } mCurrentLine.Append(NS_LINEBREAK); WriteSimple(mCurrentLine); - mCurrentLine.SetString(""); + mCurrentLine.Truncate(); mColPos=0; mEmptyLines=0; mInWhitespace=PR_TRUE; @@ -1067,7 +1067,7 @@ nsHTMLToTXTSinkStream::EndLine(PRBool softlinebreak) mCurrentLine.SetLength(mCurrentLine.Length()-1); mCurrentLine.Append(NS_LINEBREAK); WriteSimple(mCurrentLine); - mCurrentLine.SetString(""); + mCurrentLine.Truncate(); mColPos=0; mEmptyLines++; mInWhitespace=PR_TRUE; diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp index 3e74ae6e8f2..5f8f7898676 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp @@ -316,7 +316,7 @@ nsresult nsHTMLTokenizer::ConsumeToken(nsScanner& aScanner,PRBool& aFlushTokens) return ConsumeNewline(theChar,theToken,aScanner); } else { - if(!nsString::IsSpace(theChar)) { + if(!nsCRT::IsAsciiSpace(theChar)) { nsAutoString temp(theChar); result=ConsumeText(temp,theToken,aScanner); break; @@ -352,7 +352,7 @@ nsresult nsHTMLTokenizer::ConsumeTag(PRUnichar aChar,CToken*& aToken,nsScanner& PRUnichar ch; result=aScanner.Peek(ch); if(NS_OK==result) { - if(nsString::IsAlpha(ch)||(kGreaterThan==ch)) { + if(nsCRT::IsAsciiAlpha(ch)||(kGreaterThan==ch)) { result=ConsumeEndTag(aChar,aToken,aScanner); } else result=ConsumeComment(aChar,aToken,aScanner); @@ -376,7 +376,7 @@ nsresult nsHTMLTokenizer::ConsumeTag(PRUnichar aChar,CToken*& aToken,nsScanner& break; default: - if(nsString::IsAlpha(aChar)) + if(nsCRT::IsAsciiAlpha(aChar)) result=ConsumeStartTag(aChar,aToken,aScanner,aFlushTokens); else if(kEOF!=aChar) { // We are not dealing with a tag. So, put back the char @@ -583,7 +583,7 @@ nsresult nsHTMLTokenizer::ConsumeEntity(PRUnichar aChar,CToken*& aToken,nsScanne CTokenRecycler* theRecycler=(CTokenRecycler*)GetTokenRecycler(); if(NS_OK==result) { - if(nsString::IsAlpha(theChar)) { //handle common enity references &xxx; or �. + if(nsCRT::IsAsciiAlpha(theChar)) { //handle common enity references &xxx; or �. aToken = theRecycler->CreateTokenOfType(eToken_entity,eHTMLTag_entity); result = aToken->Consume(theChar,aScanner,mParseMode); //tell new token to finish consuming text... } diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp index 9a895a07a42..e823b8f0e0b 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp @@ -492,7 +492,7 @@ nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode) PRBool done=PR_FALSE; while((NS_OK==result) && (!done)) { - result=aScanner.ReadUntil(mTextValue,theTerminals,PR_TRUE,PR_FALSE); + result=aScanner.ReadUntil(mTextValue,theTerminals,PR_FALSE); if(NS_OK==result) { result=aScanner.Peek(aChar); @@ -683,7 +683,7 @@ nsresult CCDATASectionToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt3 PRBool done=PR_FALSE; while((NS_OK==result) && (!done)) { - result=aScanner.ReadUntil(mTextValue,theTerminals,PR_TRUE,PR_FALSE); + result=aScanner.ReadUntil(mTextValue,theTerminals,PR_FALSE); if(NS_OK==result) { result=aScanner.Peek(aChar); if((kCR==aChar) && (NS_OK==result)) { @@ -793,7 +793,7 @@ nsresult ConsumeStrictComment(PRUnichar aChar, nsScanner& aScanner,nsString& aSt if(NS_OK==result) { if(NS_OK==result) { temp="->"; - result=aScanner.ReadUntil(aString,temp,PR_FALSE,PR_FALSE); + result=aScanner.ReadUntil(aString,temp,PR_FALSE); } } } @@ -1143,7 +1143,7 @@ void CAttributeToken::SanitizeKey() { PRInt32 length=mTextKey.Length(); if(length > 0) { PRUnichar theChar=mTextKey.Last(); - while(!nsString::IsAlpha(theChar) && !nsString::IsDigit(theChar)) { + while(!nsCRT::IsAsciiAlpha(theChar) && !nsCRT::IsAsciiDigit(theChar)) { mTextKey.Truncate(length-1); length = mTextKey.Length(); if(length <= 0) break; @@ -1227,7 +1227,7 @@ nsresult ConsumeQuotedString(PRUnichar aChar,nsString& aString,nsScanner& aScann static nsresult ConsumeAttributeValueText(PRUnichar,nsString& aString,nsScanner& aScanner){ static nsString theTerminals("\b\t\n\r >",6); - nsresult result=aScanner.ReadUntil(aString,theTerminals,PR_TRUE,PR_FALSE); + nsresult result=aScanner.ReadUntil(aString,theTerminals,PR_FALSE); //Let's force quotes if either the first or last char is quoted. PRUnichar theLast=aString.Last(); @@ -1266,7 +1266,7 @@ nsresult CAttributeToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 a if(NS_OK==result) { result=aScanner.Peek(aChar); //peek ahead to make sure the next char is a legal attr-key if(NS_OK==result) { - if(nsString::IsAlpha(aChar) || nsString::IsDigit(aChar)){ + if(nsCRT::IsAsciiAlpha(aChar) || nsCRT::IsAsciiDigit(aChar)){ mTextKey=aChar; result=ConsumeQuotedString(aChar,mTextKey,aScanner); } @@ -1287,7 +1287,7 @@ nsresult CAttributeToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 a //If you're here, handle an unquoted key. //Don't forget to reduce entities inline! static nsString theTerminals("\b\t\n\r \"<=>",9); - result=aScanner.ReadUntil(mTextKey,theTerminals,PR_TRUE,PR_FALSE); + result=aScanner.ReadUntil(mTextKey,theTerminals,PR_FALSE); } //now it's time to Consume the (optional) value... diff --git a/mozilla/parser/htmlparser/src/nsScanner.cpp b/mozilla/parser/htmlparser/src/nsScanner.cpp index 07efff12a5a..abc06eca41d 100644 --- a/mozilla/parser/htmlparser/src/nsScanner.cpp +++ b/mozilla/parser/htmlparser/src/nsScanner.cpp @@ -845,6 +845,7 @@ nsresult nsScanner::ReadWhitespace(nsString& aString) { return result; } + /** * Consume chars as long as they are in the * given validSet of input chars. @@ -857,11 +858,8 @@ nsresult nsScanner::ReadWhitespace(nsString& aString) { */ nsresult nsScanner::ReadWhile(nsString& aString, nsString& aValidSet, - PRBool anOrderedSet, PRBool addTerminal){ - NS_ASSERTION(((PR_FALSE==anOrderedSet) || aValidSet.IsOrdered()),kUnorderedStringError); - PRUnichar theChar=0; nsresult result=Peek(theChar); const PRUnichar* theBuf=mBuffer.GetUnicode(); @@ -871,7 +869,7 @@ nsresult nsScanner::ReadWhile(nsString& aString, theChar=theBuf[mOffset++]; if(theChar) { - PRInt32 pos=(anOrderedSet) ? aValidSet.BinarySearch(theChar) : aValidSet.FindChar(theChar); + PRInt32 pos=aValidSet.FindChar(theChar); if(kNotFound==pos) { if(!addTerminal) mOffset-=1; @@ -894,85 +892,6 @@ nsresult nsScanner::ReadWhile(nsString& aString, } -/** - * Consume chars as long as they are in the - * given validSet of input chars. - * - * @update gess 3/25/98 - * @param aString will contain the result of this method - * @param aValidSet is an ordered string that contains the - * valid characters - * @return error code - */ -nsresult nsScanner::ReadWhile(nsString& aString, - nsCString& aValidSet, - PRBool anOrderedSet, - PRBool addTerminal){ - - NS_ASSERTION(((PR_FALSE==anOrderedSet) || aValidSet.IsOrdered()),kUnorderedStringError); - - PRUnichar theChar=0; - nsresult result=Peek(theChar); - const PRUnichar* theBuf=mBuffer.GetUnicode(); - PRInt32 theOrigin=mOffset; - - while(NS_OK==result) { - - theChar=theBuf[mOffset++]; - if(theChar) { - PRInt32 pos=(anOrderedSet) ? aValidSet.BinarySearch(theChar) : aValidSet.FindChar(theChar); - if(kNotFound==pos) { - if(!addTerminal) - mOffset-=1; - aString.Append(&theBuf[theOrigin],mOffset-theOrigin); - break; - } - } - else if ((PRUint32)mBuffer.Length()<=mOffset) { - mOffset -= 1; - aString.Append(&theBuf[theOrigin],mOffset-theOrigin); - result=Peek(theChar); - theBuf=mBuffer.GetUnicode(); - theOrigin=mOffset; - } - } - - //DoErrTest(aString); - - return result; - -} - -/** - * Consume chars as long as they are in the - * given validSet of input chars. - * - * @update gess 3/25/98 - * @param aString will contain the result of this method - * @param anInputSet contains the legal input chars - * valid characters - * @return error code - */ -nsresult nsScanner::ReadWhile(nsString& aString, - const char* anInputSet, - PRBool anOrderedSet, - PRBool addTerminal) -{ - - nsresult result=NS_OK; - if(anInputSet) { - PRInt32 len=nsCRT::strlen(anInputSet); - if(0GetStringValueXXX(); if(!theEntity.EqualsIgnoreCase("XI",2)) { PRUnichar theChar=theEntity.CharAt(0); - if((nsString::IsDigit(theChar)) || ('X'==theChar) || ('x'==theChar)){ + if((nsCRT::IsAsciiDigit(theChar)) || ('X'==theChar) || ('x'==theChar)){ theStr.Append("#"); } theStr.Append(theEntity); diff --git a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp index 7d73d3ba826..197270ab68e 100644 --- a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp +++ b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp @@ -1995,7 +1995,7 @@ ConvertStringToUTF8(nsAutoString& aCharset, const char* inString, char** outStri rv = decoder->Convert(inString, &srcLength, unichars, &uniLength); if (NS_SUCCEEDED(rv)) { nsAutoString aString; - aString.SetString(unichars, uniLength); + aString.Assign(unichars, uniLength); // convert to UTF-8 *outString = aString.ToNewUTF8String(); } @@ -2166,7 +2166,7 @@ nsPrefConverter::GetPlatformCharset(nsAutoString& aCharset) rv = platformCharset->GetCharset(kPlatformCharsetSel_FileName, aCharset); } if (NS_FAILED(rv)) { - aCharset.SetString("ISO-8859-1"); // use ISO-8859-1 in case of any error + aCharset.Assign("ISO-8859-1"); // use ISO-8859-1 in case of any error } return rv; diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp index 9a1d2100fbe..bdac9b9eba7 100644 --- a/mozilla/profile/src/nsProfile.cpp +++ b/mozilla/profile/src/nsProfile.cpp @@ -1349,11 +1349,11 @@ NS_IMETHODIMP nsProfile::ProcessPREGInfo(const char* data) nsAutoString serviceState; if (profileName) - pName.SetString(profileName); + pName.Assign(profileName); if (userEmail) - emailAddress.SetString(userEmail); + emailAddress.Assign(userEmail); if (service_denial) - serviceState.SetString(service_denial); + serviceState.Assign(service_denial); PRInt32 profileNameIndex, delimIndex; PRInt32 serviceIndex; @@ -1403,7 +1403,7 @@ NS_IMETHODIMP nsProfile::ProcessPREGInfo(const char* data) // If user denies registration, ignore the information entered. if (userServiceDenial.mLength > 0) - userProfileName.SetString(""); + userProfileName.Assign(""); char *curProfile = nsnull; rv = GetCurrentProfile(&curProfile); diff --git a/mozilla/rdf/content/src/nsXULAttributes.cpp b/mozilla/rdf/content/src/nsXULAttributes.cpp index 6d1799b2083..88ab7266478 100644 --- a/mozilla/rdf/content/src/nsXULAttributes.cpp +++ b/mozilla/rdf/content/src/nsXULAttributes.cpp @@ -287,7 +287,7 @@ nsXULAttribute::GetNodeName(nsString& aNodeName) const PRUnichar *unicodeString; mName->GetUnicode(&unicodeString); - aNodeName.SetString(unicodeString); + aNodeName.Assign(unicodeString); return NS_OK; } @@ -413,7 +413,7 @@ nsXULAttribute::GetName(nsString& aName) { const PRUnichar *unicodeString; mName->GetUnicode(&unicodeString); - aName.SetString(unicodeString); + aName.Assign(unicodeString); return NS_OK; } diff --git a/mozilla/rdf/content/src/nsXULDocument.cpp b/mozilla/rdf/content/src/nsXULDocument.cpp index 1ae0ee359de..4202d075547 100644 --- a/mozilla/rdf/content/src/nsXULDocument.cpp +++ b/mozilla/rdf/content/src/nsXULDocument.cpp @@ -612,7 +612,7 @@ nsXULDocument::GetArena() NS_IMETHODIMP nsXULDocument::GetContentType(nsString& aContentType) const { - aContentType.SetString("text/xul"); + aContentType.Assign("text/xul"); return NS_OK; } @@ -2874,7 +2874,7 @@ nsXULDocument::RemoveElementsFromMapByContent(const nsString& aID, NS_IMETHODIMP nsXULDocument::GetNodeName(nsString& aNodeName) { - aNodeName.SetString("#document"); + aNodeName.Assign("#document"); return NS_OK; } diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 143b0337628..091c5932643 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -2161,7 +2161,7 @@ nsWebShell::HandleLinkClickEvent(nsIContent *aContent, switch(aVerb) { case eLinkVerb_New: - target.SetString("_blank"); + target.Assign("_blank"); // Fall into replace case case eLinkVerb_Replace: { diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index e44b88ad5ac..657e773f58f 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -2162,12 +2162,12 @@ nsBrowserWindow::PromptUsernameAndPassword(const PRUnichar *text, printf("%cUser: ", '\007'); scanf("%s", buf); - response.SetString(buf); + response.Assign(buf); *user = response.ToNewUnicode(); printf("%cPassword: ", '\007'); scanf("%s", buf); - response.SetString(buf); + response.Assign(buf); *pwd = response.ToNewUnicode(); } diff --git a/mozilla/widget/src/windows/nsFileWidget.cpp b/mozilla/widget/src/windows/nsFileWidget.cpp index e7b45f59efe..934ab5611b8 100644 --- a/mozilla/widget/src/windows/nsFileWidget.cpp +++ b/mozilla/widget/src/windows/nsFileWidget.cpp @@ -332,9 +332,9 @@ nsFileDlgResults nsFileWidget::GetFolder(nsIWidget * aParent, nsAutoString pathStr; PRUnichar *unichar = ConvertFromFileSystemCharset(path); if (nsnull == unichar) - pathStr.SetString(path); + pathStr.Assign(path); else { - pathStr.SetString(unichar); + pathStr.Assign(unichar); delete [] unichar; } //printf("[%s]\n", path); @@ -385,7 +385,7 @@ void nsFileWidget::GetFileSystemCharset(nsString & fileSystemCharset) NS_ASSERTION(NS_SUCCEEDED(rv), "error getting platform charset"); if (NS_FAILED(rv)) - aCharset.SetString("ISO-8859-1"); + aCharset.Assign("ISO-8859-1"); } fileSystemCharset = aCharset; } diff --git a/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp b/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp index 6f37d46e37d..32bd4ffd8fd 100644 --- a/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp +++ b/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp @@ -152,7 +152,7 @@ nsPrimitiveHelpers :: ConvertUnicodeToPlatformPlainText ( PRUnichar* inUnicode, if (NS_SUCCEEDED(res)) res = platformCharsetService->GetCharset(kPlatformCharsetSel_PlainTextInClipboard, platformCharset); if (NS_FAILED(res)) - platformCharset.SetString("ISO-8859-1"); + platformCharset.Assign("ISO-8859-1"); // get the encoder NS_WITH_SERVICE(nsICharsetConverterManager, ccm, NS_CHARSETCONVERTERMANAGER_PROGID, &rv); @@ -207,7 +207,7 @@ nsPrimitiveHelpers :: ConvertPlatformPlainTextToUnicode ( const char* inText, PR if (NS_SUCCEEDED(res)) res = platformCharsetService->GetCharset(kPlatformCharsetSel_PlainTextInClipboard, platformCharset); if (NS_FAILED(res)) - platformCharset.SetString("ISO-8859-1"); + platformCharset.Assign("ISO-8859-1"); // get the decoder NS_WITH_SERVICE(nsICharsetConverterManager, ccm, NS_CHARSETCONVERTERMANAGER_PROGID, &rv); diff --git a/mozilla/xpcom/io/nsFileSpec.cpp b/mozilla/xpcom/io/nsFileSpec.cpp index c4b6a409f9c..ca7045208c0 100644 --- a/mozilla/xpcom/io/nsFileSpec.cpp +++ b/mozilla/xpcom/io/nsFileSpec.cpp @@ -1148,7 +1148,7 @@ void nsFileSpec::GetFileSystemCharset(nsString & fileSystemCharset) NS_ASSERTION(NS_SUCCEEDED(rv), "error getting platform charset"); if (NS_FAILED(rv)) - aCharset.SetString("ISO-8859-1"); + aCharset.Assign("ISO-8859-1"); } fileSystemCharset = aCharset; } @@ -1200,17 +1200,17 @@ void nsFileSpec::GetNativePathString(nsString &nativePathString) { const char *path = GetCString(); if (nsnull == path) { - nativePathString.SetString(""); + nativePathString.Assign(""); return; } else { PRUnichar *converted = ConvertFromFileSystemCharset(path); if (nsnull != converted) { - nativePathString.SetString(converted); + nativePathString.Assign(converted); delete [] converted; } else - nativePathString.SetString(path); + nativePathString.Assign(path); } } @@ -1221,16 +1221,16 @@ void nsFileSpec::GetLeafName(nsString &nativePathString) { char * path = GetLeafName(); if (nsnull == path) { - nativePathString.SetString(""); + nativePathString.Assign(""); return; } else { PRUnichar *converted = ConvertFromFileSystemCharset(path); if (nsnull != converted) { - nativePathString.SetString(converted); + nativePathString.Assign(converted); delete [] converted; } else - nativePathString.SetString(path); + nativePathString.Assign(path); nsCRT::free(path); } diff --git a/mozilla/xpcom/io/nsLocalFileWin.cpp b/mozilla/xpcom/io/nsLocalFileWin.cpp index 813018ed73d..543608cc9d1 100644 --- a/mozilla/xpcom/io/nsLocalFileWin.cpp +++ b/mozilla/xpcom/io/nsLocalFileWin.cpp @@ -522,7 +522,7 @@ nsLocalFile::ResolveAndStat(PRBool resolveTerminal) PRStatus status = PR_GetFileInfo64(nsprPath, &mFileInfo64); if ( status == PR_SUCCESS ) { - mResolvedPath.SetString(workingFilePath); + mResolvedPath.Assign(workingFilePath); mDirty = PR_FALSE; return NS_OK; } @@ -537,7 +537,7 @@ nsLocalFile::ResolveAndStat(PRBool resolveTerminal) if (NS_FAILED(result)) return result; - mResolvedPath.SetString(resolvePath); + mResolvedPath.Assign(resolvePath); nsAllocator::Free(resolvePath); // if we are not resolving the terminal node, we have to "fake" windows @@ -607,7 +607,7 @@ nsLocalFile::InitWithPath(const char *filePath) if(temp[len] == '\\') temp[len] = '\0'; - mWorkingPath.SetString(nativeFilePath); + mWorkingPath.Assign(nativeFilePath); nsAllocator::Free( nativeFilePath ); return NS_OK; } diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp index b713625b0ba..761bb5845a1 100644 --- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -622,7 +622,7 @@ BookmarkParser::ProcessLine(nsIRDFContainer *container, nsIRDFResource *nodeType rv = ParseMetaTag(line, getter_AddRefs(mUnicodeDecoder)); } else if ((offset = line.Find(kOpenHeading, PR_TRUE)) >= 0 && - nsString::IsDigit(line.CharAt(offset + 2))) + nsCRT::IsAsciiDigit(line.CharAt(offset + 2))) { // XXX Ignore

so that bookmarks root _is_

if (line.CharAt(offset + 2) != PRUnichar('1')) diff --git a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp index 349fa3947e5..3637c024eb2 100644 --- a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp @@ -535,7 +535,7 @@ nsHTTPIndexParser::ParseFormat(const char* aFormatStr) mFormat.Clear(); do { - while (*aFormatStr && nsString::IsSpace(PRUnichar(*aFormatStr))) + while (*aFormatStr && nsCRT::IsAsciiSpace(PRUnichar(*aFormatStr))) ++aFormatStr; if (! *aFormatStr) @@ -543,7 +543,7 @@ nsHTTPIndexParser::ParseFormat(const char* aFormatStr) nsCAutoString name; PRInt32 len = 0; - while (aFormatStr[len] && !nsString::IsSpace(PRUnichar(aFormatStr[len]))) + while (aFormatStr[len] && !nsCRT::IsAsciiSpace(PRUnichar(aFormatStr[len]))) ++len; name.SetCapacity(len + 1); name.Append(aFormatStr, len); @@ -627,7 +627,7 @@ nsHTTPIndexParser::ParseData(const char* aDataStr) if (! *aDataStr) break; - while (*aDataStr && nsString::IsSpace(PRUnichar(*aDataStr))) + while (*aDataStr && nsCRT::IsAsciiSpace(PRUnichar(*aDataStr))) ++aDataStr; nsCAutoString value; @@ -650,7 +650,7 @@ nsHTTPIndexParser::ParseData(const char* aDataStr) else { // it's unquoted. snarf until we see whitespace. len = 0; - while (aDataStr[len] && !nsString::IsSpace(aDataStr[len])) + while (aDataStr[len] && !nsCRT::IsAsciiSpace(aDataStr[len])) ++len; value.SetCapacity(len + 1); value.Append(aDataStr, len); diff --git a/mozilla/xpfe/components/find/src/nsFindComponent.cpp b/mozilla/xpfe/components/find/src/nsFindComponent.cpp index 59c93adbdc9..38629f55b20 100644 --- a/mozilla/xpfe/components/find/src/nsFindComponent.cpp +++ b/mozilla/xpfe/components/find/src/nsFindComponent.cpp @@ -173,7 +173,7 @@ nsFindComponent::Context::MakeTSDocument(nsIWebShell* aWebShell, nsITextServices inline static PRBool CharsMatch(PRUnichar c1, PRUnichar c2) { - return (nsString::IsSpace(c1) && nsString::IsSpace(c2)) || + return (nsCRT::IsAsciiSpace(c1) && nsCRT::IsAsciiSpace(c2)) || (c1 == c2); } @@ -240,20 +240,20 @@ static PRInt32 FindInString(const nsString &searchStr, const nsString &patternSt const PRUnichar *t = s; const PRUnichar *p = patternBuf; PRInt32 curMatchOffset = t - searchBuf; - PRBool inWhitespace = nsString::IsSpace(*p); + PRBool inWhitespace = nsCRT::IsAsciiSpace(*p); while (p < patEnd && CharsMatch(*p, *t)) { - if (inWhitespace && !nsString::IsSpace(*p)) + if (inWhitespace && !nsCRT::IsAsciiSpace(*p)) { // leaving p whitespace. Eat up addition whitespace in s - while (t < searchEnd - 1 && nsString::IsSpace(*(t + 1))) + while (t < searchEnd - 1 && nsCRT::IsAsciiSpace(*(t + 1))) t ++; inWhitespace = PR_FALSE; } else - inWhitespace = nsString::IsSpace(*p); + inWhitespace = nsCRT::IsAsciiSpace(*p); t ++; p ++; @@ -285,20 +285,20 @@ static PRInt32 FindInString(const nsString &searchStr, const nsString &patternSt const PRUnichar *t = s; const PRUnichar *p = patternBuf; PRInt32 curMatchOffset = t - searchBuf; - PRBool inWhitespace = nsString::IsSpace(*p); + PRBool inWhitespace = nsCRT::IsAsciiSpace(*p); while (p < patEnd && CharsMatch(*p, *t)) { - if (inWhitespace && !nsString::IsSpace(*p)) + if (inWhitespace && !nsCRT::IsAsciiSpace(*p)) { // leaving p whitespace. Eat up addition whitespace in s - while (t < searchEnd - 1 && nsString::IsSpace(*(t + 1))) + while (t < searchEnd - 1 && nsCRT::IsAsciiSpace(*(t + 1))) t ++; inWhitespace = PR_FALSE; } else - inWhitespace = nsString::IsSpace(*p); + inWhitespace = nsCRT::IsAsciiSpace(*p); t ++; p ++;