From bdc7e5f59b03cd62724f6623ac1bbe59f34b33e0 Mon Sep 17 00:00:00 2001 From: "roc+%cs.cmu.edu" Date: Sat, 22 May 2004 22:15:22 +0000 Subject: [PATCH] Bug 226439. Convert Seamonkey to EqualsLiteral. rs=darin git-svn-id: svn://10.0.0.236/trunk@156785 18797224-902f-48f8-a5cc-f745e15eee43 --- .../src/base/nsAccessibilityService.cpp | 2 +- .../accessible/src/base/nsRootAccessible.cpp | 2 +- .../src/xul/nsXULMenuAccessible.cpp | 8 +- .../src/xul/nsXULSelectAccessible.cpp | 4 +- .../src/xul/nsXULTreeAccessible.cpp | 8 +- mozilla/caps/src/nsScriptSecurityManager.cpp | 8 +- .../base/src/nsContentAreaDragDrop.cpp | 2 +- mozilla/content/base/src/nsDocument.cpp | 14 +- .../content/base/src/nsDocumentEncoder.cpp | 2 +- mozilla/content/base/src/nsDocumentViewer.cpp | 2 +- mozilla/content/base/src/nsFrameLoader.cpp | 4 +- mozilla/content/base/src/nsGenericElement.cpp | 2 +- .../base/src/nsImageLoadingContent.cpp | 2 +- .../base/src/nsPlainTextSerializer.cpp | 4 +- mozilla/content/base/src/nsTextNode.cpp | 2 +- .../events/src/nsEventStateManager.cpp | 38 +++--- .../html/content/src/nsFormSubmission.cpp | 4 +- .../html/content/src/nsHTMLInputElement.cpp | 4 +- .../html/document/src/nsHTMLDocument.cpp | 4 +- .../html/document/src/nsImageDocument.cpp | 6 +- .../html/style/src/nsCSSDeclaration.cpp | 4 +- .../content/html/style/src/nsCSSLoader.cpp | 4 +- .../content/html/style/src/nsStyleUtil.cpp | 2 +- mozilla/content/xbl/src/nsXBLBinding.cpp | 2 +- mozilla/content/xbl/src/nsXBLContentSink.cpp | 2 +- .../content/xbl/src/nsXBLPrototypeBinding.cpp | 2 +- .../content/xbl/src/nsXBLPrototypeHandler.cpp | 10 +- .../content/xbl/src/nsXBLWindowHandler.cpp | 2 +- .../content/xml/content/src/nsXMLElement.cpp | 14 +- .../src/nsXMLProcessingInstruction.cpp | 2 +- .../xml/content/src/nsXMLStylesheetPI.cpp | 2 +- .../xml/document/src/nsXMLContentSink.cpp | 6 +- .../xml/document/src/nsXMLDocument.cpp | 4 +- .../xml/document/src/nsXMLPrettyPrinter.cpp | 2 +- .../content/xul/content/src/nsXULElement.cpp | 20 +-- .../xul/content/src/nsXULPopupListener.cpp | 26 ++-- .../document/src/nsXULCommandDispatcher.cpp | 2 +- .../xul/document/src/nsXULContentSink.cpp | 8 +- .../xul/document/src/nsXULDocument.cpp | 14 +- .../xul/templates/src/nsXULContentBuilder.cpp | 6 +- .../xul/templates/src/nsXULSortService.cpp | 10 +- .../templates/src/nsXULTemplateBuilder.cpp | 20 +-- .../xul/templates/src/nsXULTreeBuilder.cpp | 18 +-- mozilla/docshell/base/nsDocShell.cpp | 6 +- mozilla/dom/src/base/nsGlobalWindow.cpp | 4 +- mozilla/dom/src/events/nsJSEventListener.cpp | 8 +- .../composer/src/nsComposerCommands.cpp | 22 ++-- .../src/nsComposerCommandsUpdater.cpp | 8 +- .../editor/composer/src/nsEditingSession.cpp | 10 +- .../libeditor/html/nsHTMLAbsPosition.cpp | 16 +-- .../libeditor/html/nsHTMLAnonymousUtils.cpp | 8 +- .../editor/libeditor/html/nsHTMLCSSUtils.cpp | 122 +++++++++--------- .../editor/libeditor/html/nsHTMLEditRules.cpp | 44 +++---- .../editor/libeditor/html/nsHTMLEditUtils.cpp | 4 +- .../editor/libeditor/html/nsHTMLEditor.cpp | 36 +++--- .../html/nsHTMLInlineTableEditor.cpp | 12 +- .../libeditor/html/nsHTMLObjectResizer.cpp | 4 +- .../editor/libeditor/html/nsTableEditor.cpp | 4 +- .../libeditor/text/nsPlaintextEditor.cpp | 4 +- .../editor/libeditor/text/nsTextEditRules.cpp | 8 +- .../powerplant/source/CBrowserShell.cpp | 2 +- .../browser/webBrowser/nsContextMenuInfo.cpp | 12 +- .../webBrowser/nsDocShellTreeOwner.cpp | 2 +- .../printingui/src/win/nsPrintDialogUtil.cpp | 2 +- .../src/nsWebBrowserPersist.cpp | 6 +- .../embedding/lite/nsEmbedChromeRegistry.cpp | 8 +- .../mfcembed/components/nsPrintDialogUtil.cpp | 2 +- .../accessproxy/nsAccessProxy.cpp | 6 +- .../extensions/cookie/nsPermissionManager.cpp | 4 +- .../inspector/base/src/inDOMView.cpp | 12 +- .../extensions/p3p/src/nsPolicyReference.cpp | 2 +- .../spellcheck/myspell/src/mozMySpell.cpp | 2 +- .../extensions/sql/base/src/mozSqlResult.cpp | 4 +- .../transformiix/source/main/testXalan.cpp | 6 +- .../transformiix/source/main/transformiix.cpp | 2 +- .../typeaheadfind/src/nsTypeAheadFind.cpp | 18 +-- mozilla/extensions/wallet/src/singsign.cpp | 2 +- mozilla/extensions/wallet/src/wallet.cpp | 4 +- .../webservices/proxy/tests/wspproxytest.cpp | 6 +- .../webservices/schema/src/nsSchema.cpp | 2 +- .../webservices/schema/src/nsSchemaLoader.cpp | 48 +++---- .../webservices/wsdl/src/nsWSDLLoader.cpp | 18 +-- .../xmlextras/base/src/nsXMLHttpRequest.cpp | 6 +- .../xmlextras/ls/src/nsLSParser.cpp | 8 +- .../extensions/xmlterm/base/mozLineTerm.cpp | 2 +- .../xmlterm/base/mozXMLTermSession.cpp | 2 +- mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp | 18 +-- mozilla/gfx/src/os2/nsFontMetricsOS2.cpp | 12 +- mozilla/gfx/src/shared/nsNativeTheme.cpp | 2 +- mozilla/gfx/src/shared/nsNativeTheme.h | 4 +- .../src/windows/nsDeviceContextSpecWin.cpp | 2 +- .../chardet/src/nsMetaCharsetObserver.cpp | 20 +-- .../intl/locale/src/nsLanguageAtomService.cpp | 6 +- mozilla/intl/locale/tests/nsLocaleTest.cpp | 6 +- mozilla/intl/lwbrk/src/nsLWBreakerFImp.cpp | 8 +- mozilla/intl/uconv/src/nsCharsetAliasImp.cpp | 8 +- mozilla/intl/uconv/src/nsOS2Charset.cpp | 4 +- mozilla/intl/uconv/src/nsWinCharset.cpp | 4 +- mozilla/layout/base/nsDocumentViewer.cpp | 2 +- mozilla/layout/style/nsCSSDeclaration.cpp | 4 +- mozilla/layout/style/nsCSSLoader.cpp | 4 +- mozilla/layout/style/nsStyleUtil.cpp | 2 +- .../addrbook/src/nsAbAutoCompleteSession.cpp | 2 +- mozilla/mailnews/addrbook/src/nsAbView.cpp | 10 +- mozilla/mailnews/base/src/nsMessenger.cpp | 2 +- .../base/src/nsMsgAccountManagerDS.cpp | 2 +- mozilla/mailnews/base/src/nsMsgDBView.cpp | 4 +- .../mailnews/base/src/nsMsgMailSession.cpp | 4 +- mozilla/mailnews/base/util/nsMsgI18N.cpp | 4 +- mozilla/mailnews/compose/src/nsMsgCompose.cpp | 20 +-- .../compose/src/nsMsgComposeService.cpp | 2 +- mozilla/mailnews/compose/src/nsURLFetcher.cpp | 2 +- .../mailnews/db/msgdb/src/nsDBFolderInfo.cpp | 4 +- .../imap/src/nsImapIncomingServer.cpp | 8 +- mozilla/mailnews/imap/src/nsImapProtocol.cpp | 2 +- .../import/eudora/src/nsEudoraWin32.cpp | 8 +- .../mailnews/import/outlook/src/MapiApi.cpp | 12 +- .../import/outlook/src/nsOutlookMail.cpp | 4 +- mozilla/mailnews/mime/src/mimetpfl.cpp | 4 +- mozilla/mailnews/mime/src/mimetpla.cpp | 2 +- .../oji/src/nsJVMConfigManagerUnix.cpp | 2 +- .../base/src/nsProtocolProxyService.cpp | 8 +- .../netwerk/cookie/src/nsCookieService.cpp | 2 +- .../ftp/src/nsFtpConnectionThread.cpp | 2 +- .../protocol/http/src/nsHttpChannel.cpp | 10 +- .../parser/htmlparser/robot/nsDebugRobot.cpp | 8 +- .../parser/htmlparser/robot/nsRobotSink.cpp | 4 +- mozilla/parser/htmlparser/src/CNavDTD.cpp | 8 +- mozilla/parser/htmlparser/src/nsParser.cpp | 24 ++-- .../htmlparser/tests/outsinks/Convert.cpp | 6 +- mozilla/rdf/base/src/nsRDFContentSink.cpp | 6 +- mozilla/rdf/chrome/src/nsChromeRegistry.cpp | 12 +- mozilla/security/manager/ssl/src/nsCrypto.cpp | 6 +- .../manager/ssl/src/nsKeygenHandler.cpp | 2 +- .../src/nsAutoCompleteController.cpp | 4 +- .../history/src/nsGlobalHistory.cpp | 12 +- .../satchel/src/nsFormFillController.cpp | 2 +- mozilla/uriloader/base/nsURILoader.cpp | 2 +- .../exthandler/os2/nsOSHelperAppService.cpp | 26 ++-- .../exthandler/unix/nsOSHelperAppService.cpp | 6 +- mozilla/widget/src/cocoa/nsMenuBarX.cpp | 4 +- mozilla/widget/src/cocoa/nsMenuItemX.cpp | 2 +- mozilla/widget/src/cocoa/nsMenuX.cpp | 28 ++-- mozilla/widget/src/gtk/nsClipboard.cpp | 4 +- mozilla/widget/src/gtk2/nsClipboard.cpp | 4 +- mozilla/widget/src/mac/nsDragService.cpp | 2 +- mozilla/widget/src/mac/nsMenu.cpp | 28 ++-- mozilla/widget/src/mac/nsMenuBar.cpp | 4 +- mozilla/widget/src/mac/nsMenuBarX.cpp | 4 +- mozilla/widget/src/mac/nsMenuItem.cpp | 2 +- mozilla/widget/src/mac/nsMenuItemX.cpp | 4 +- mozilla/widget/src/mac/nsMenuX.cpp | 28 ++-- mozilla/widget/src/windows/nsFilePicker.cpp | 4 +- .../xpcom/components/nsComponentManager.cpp | 2 +- mozilla/xpcom/io/nsLocalFileUnix.cpp | 4 +- mozilla/xpcom/io/nsLocalFileWin.cpp | 2 +- .../xpfe/appshell/src/nsAppShellService.cpp | 2 +- .../xpfe/appshell/src/nsChromeTreeOwner.cpp | 2 +- .../xpfe/appshell/src/nsContentTreeOwner.cpp | 4 +- .../xpfe/appshell/src/nsWebShellWindow.cpp | 28 ++-- .../bootstrap/appleevents/nsWindowUtils.cpp | 12 +- .../bookmarks/src/nsBookmarksService.cpp | 2 +- .../src/nsDownloadManager.cpp | 2 +- .../history/src/nsGlobalHistory.cpp | 14 +- .../xpfe/components/intl/nsCharsetMenu.cpp | 16 +-- .../components/intl/nsFontPackageHandler.cpp | 4 +- .../search/src/nsInternetSearchService.cpp | 2 +- .../search/src/nsLocalSearchService.cpp | 28 ++-- .../winhooks/nsWindowsHooksUtil.cpp | 4 +- mozilla/xpinstall/src/nsInstall.cpp | 4 +- 170 files changed, 708 insertions(+), 708 deletions(-) diff --git a/mozilla/accessible/src/base/nsAccessibilityService.cpp b/mozilla/accessible/src/base/nsAccessibilityService.cpp index 4c8163345dd..69f521e6579 100644 --- a/mozilla/accessible/src/base/nsAccessibilityService.cpp +++ b/mozilla/accessible/src/base/nsAccessibilityService.cpp @@ -1551,7 +1551,7 @@ nsresult nsAccessibilityService::GetAccessible(nsIDOMNode *aNode, nsCOMPtr element(do_QueryInterface(aNode)); if (element) { element->GetAttribute(NS_LITERAL_STRING("type"), attrib); - if (attrib.Equals(NS_LITERAL_STRING("checkbox"))) + if (attrib.EqualsLiteral("checkbox")) printf("## aaronl debugging attribute\n"); } #endif diff --git a/mozilla/accessible/src/base/nsRootAccessible.cpp b/mozilla/accessible/src/base/nsRootAccessible.cpp index ff95f6093ec..7f24e19195f 100644 --- a/mozilla/accessible/src/base/nsRootAccessible.cpp +++ b/mozilla/accessible/src/base/nsRootAccessible.cpp @@ -130,7 +130,7 @@ NS_IMETHODIMP nsRootAccessible::GetRole(PRUint32 *aRole) if (rootElement) { nsAutoString name; rootElement->GetLocalName(name); - if (name.Equals(NS_LITERAL_STRING("dialog"))) + if (name.EqualsLiteral("dialog")) *aRole = ROLE_DIALOG; } } diff --git a/mozilla/accessible/src/xul/nsXULMenuAccessible.cpp b/mozilla/accessible/src/xul/nsXULMenuAccessible.cpp index 5208a96b1af..ff017f81bec 100644 --- a/mozilla/accessible/src/xul/nsXULMenuAccessible.cpp +++ b/mozilla/accessible/src/xul/nsXULMenuAccessible.cpp @@ -67,7 +67,7 @@ NS_IMETHODIMP nsXULMenuitemAccessible::GetState(PRUint32 *_retval) // Has Popup? nsAutoString tagName; element->GetLocalName(tagName); - if (tagName.Equals(NS_LITERAL_STRING("menu"))) + if (tagName.EqualsLiteral("menu")) *_retval |= STATE_HASPOPUP; nsAutoString menuItemType; @@ -75,7 +75,7 @@ NS_IMETHODIMP nsXULMenuitemAccessible::GetState(PRUint32 *_retval) if (!menuItemType.IsEmpty()) { // Selectable? - if (menuItemType.Equals(NS_LITERAL_STRING("radio"))) + if (menuItemType.EqualsLiteral("radio")) *_retval |= STATE_SELECTABLE; // Checked? @@ -189,7 +189,7 @@ NS_IMETHODIMP nsXULMenuitemAccessible::GetChildCount(PRInt32 *aAccChildCount) nodeList->Item(childIndex, getter_AddRefs(childNode)); nsAutoString nodeName; childNode->GetNodeName(nodeName); - if (nodeName.Equals(NS_LITERAL_STRING("menupopup"))) { + if (nodeName.EqualsLiteral("menupopup")) { break; } } @@ -199,7 +199,7 @@ NS_IMETHODIMP nsXULMenuitemAccessible::GetChildCount(PRInt32 *aAccChildCount) if (element) { nsAutoString attr; element->GetAttribute(NS_LITERAL_STRING("menugenerated"), attr); - if (!attr.Equals(NS_LITERAL_STRING("true"))) { + if (!attr.EqualsLiteral("true")) { element->SetAttribute(NS_LITERAL_STRING("menugenerated"), NS_LITERAL_STRING("true")); } } diff --git a/mozilla/accessible/src/xul/nsXULSelectAccessible.cpp b/mozilla/accessible/src/xul/nsXULSelectAccessible.cpp index e6458fffcf0..222c57ccfe8 100644 --- a/mozilla/accessible/src/xul/nsXULSelectAccessible.cpp +++ b/mozilla/accessible/src/xul/nsXULSelectAccessible.cpp @@ -364,7 +364,7 @@ NS_IMETHODIMP nsXULListboxAccessible::GetState(PRUint32 *_retval) if (element) { nsAutoString selType; element->GetAttribute(NS_LITERAL_STRING("seltype"), selType); - if (!selType.IsEmpty() && selType.Equals(NS_LITERAL_STRING("multiple"))) + if (!selType.IsEmpty() && selType.EqualsLiteral("multiple")) *_retval |= STATE_MULTISELECTABLE; } @@ -419,7 +419,7 @@ NS_IMETHODIMP nsXULListitemAccessible::GetName(nsAString& _retval) if (childElement) { nsAutoString tagName; childElement->GetLocalName(tagName); - if (tagName.Equals(NS_LITERAL_STRING("listcell"))) { + if (tagName.EqualsLiteral("listcell")) { childElement->GetAttribute(NS_LITERAL_STRING("label"), _retval); return NS_OK; } diff --git a/mozilla/accessible/src/xul/nsXULTreeAccessible.cpp b/mozilla/accessible/src/xul/nsXULTreeAccessible.cpp index fe91c9a4a29..961db6cb5a1 100644 --- a/mozilla/accessible/src/xul/nsXULTreeAccessible.cpp +++ b/mozilla/accessible/src/xul/nsXULTreeAccessible.cpp @@ -70,7 +70,7 @@ void nsXULTreeAccessible::GetTreeBoxObject(nsIDOMNode *aDOMNode, nsITreeBoxObjec currentNode = aDOMNode; while (currentNode) { currentNode->GetLocalName(name); - if (name.Equals(NS_LITERAL_STRING("tree"))) { + if (name.EqualsLiteral("tree")) { // We will get the nsITreeBoxObject from the tree node nsCOMPtr xulElement(do_QueryInterface(currentNode)); if (xulElement) { @@ -102,7 +102,7 @@ NS_IMETHODIMP nsXULTreeAccessible::GetState(PRUint32 *_retval) // the default selection type is multiple nsAutoString selType; element->GetAttribute(NS_LITERAL_STRING("seltype"), selType); - if (selType.IsEmpty() || !selType.Equals(NS_LITERAL_STRING("single"))) + if (selType.IsEmpty() || !selType.EqualsLiteral("single")) *_retval |= STATE_MULTISELECTABLE; } @@ -343,7 +343,7 @@ NS_IMETHODIMP nsXULTreeAccessible::SelectAllSelection(PRBool *_retval) if (element) { nsAutoString selType; element->GetAttribute(NS_LITERAL_STRING("seltype"), selType); - if (selType.IsEmpty() || !selType.Equals(NS_LITERAL_STRING("single"))) { + if (selType.IsEmpty() || !selType.EqualsLiteral("single")) { *_retval = PR_TRUE; nsCOMPtr selection; mTreeView->GetSelection(getter_AddRefs(selection)); @@ -630,7 +630,7 @@ NS_IMETHODIMP nsXULTreeitemAccessible::GetBounds(PRInt32 *x, PRInt32 *y, PRInt32 for (childIndex = 0; childIndex < childCount; childIndex++) { childNodes->Item(childIndex, getter_AddRefs(childNode)); childNode->GetLocalName(name); - if (name.Equals(NS_LITERAL_STRING("treechildren"))) { + if (name.EqualsLiteral("treechildren")) { nsCOMPtr xulElement(do_QueryInterface(childNode)); if (xulElement) { nsCOMPtr box; diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp index fd8d926e288..9d37c056fb7 100644 --- a/mozilla/caps/src/nsScriptSecurityManager.cpp +++ b/mozilla/caps/src/nsScriptSecurityManager.cpp @@ -252,14 +252,14 @@ nsScriptSecurityManager::SecurityCompareURIs(nsIURI* aSourceURI, rv = sourceBaseURI->GetScheme(sourceScheme); if (NS_SUCCEEDED(rv) && targetScheme.Equals(sourceScheme)) { - if (targetScheme.Equals(NS_LITERAL_CSTRING("file"))) + if (targetScheme.EqualsLiteral("file")) { // All file: urls are considered to have the same origin. *result = PR_TRUE; } - else if (targetScheme.Equals(NS_LITERAL_CSTRING("imap")) || - targetScheme.Equals(NS_LITERAL_CSTRING("mailbox")) || - targetScheme.Equals(NS_LITERAL_CSTRING("news"))) + else if (targetScheme.EqualsLiteral("imap") || + targetScheme.EqualsLiteral("mailbox") || + targetScheme.EqualsLiteral("news")) { // Each message is a distinct trust domain; use the // whole spec for comparison diff --git a/mozilla/content/base/src/nsContentAreaDragDrop.cpp b/mozilla/content/base/src/nsContentAreaDragDrop.cpp index 62ad2afd6e0..9b90ef2636e 100644 --- a/mozilla/content/base/src/nsContentAreaDragDrop.cpp +++ b/mozilla/content/base/src/nsContentAreaDragDrop.cpp @@ -964,7 +964,7 @@ nsTransferableFactory::GetAnchorURL(nsIDOMNode* inNode, nsAString& outURL) nsCOMPtr content(do_QueryInterface(inNode)); nsAutoString value; content->GetAttr(kNameSpaceID_XLink, nsHTMLAtoms::type, value); - if (value.Equals(NS_LITERAL_STRING("simple"))) { + if (value.EqualsLiteral("simple")) { content->GetAttr(kNameSpaceID_XLink, nsHTMLAtoms::href, value); if (!value.IsEmpty()) { nsCOMPtr baseURI = content->GetBaseURI(); diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index 2ae34d76a82..4191ab54dd5 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -370,8 +370,8 @@ nsDOMImplementation::CreateDocument(const nsAString& aNamespaceURI, if (colon && (DOMStringIsNull(aNamespaceURI) || - (Substring(qName.get(), colon).Equals(NS_LITERAL_STRING("xml")) && - !aNamespaceURI.Equals(NS_LITERAL_STRING("http://www.w3.org/XML/1998/namespace"))))) { + (Substring(qName.get(), colon).EqualsLiteral("xml") && + !aNamespaceURI.EqualsLiteral("http://www.w3.org/XML/1998/namespace")))) { return NS_ERROR_DOM_NAMESPACE_ERR; } } @@ -1121,7 +1121,7 @@ nsDocument::SetHeaderData(nsIAtom* aHeaderField, const nsAString& aData) for (index = 0; index < count; index++) { nsIStyleSheet* sheet = mStyleSheets[index]; sheet->GetType(type); - if (!type.Equals(NS_LITERAL_STRING("text/html"))) { + if (!type.EqualsLiteral("text/html")) { sheet->GetTitle(title); if (!title.IsEmpty()) { // if sheet has title PRBool enabled = @@ -2354,7 +2354,7 @@ nsDocument::GetElementsByTagNameNS(const nsAString& aNamespaceURI, nsCOMPtr list; - if (!aNamespaceURI.Equals(NS_LITERAL_STRING("*"))) { + if (!aNamespaceURI.EqualsLiteral("*")) { nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceID(aNamespaceURI, &nameSpaceId); @@ -2590,7 +2590,7 @@ nsDocument::GetAnonymousElementByAttribute(nsIDOMElement* aElement, PRUint32 length; nodeList->GetLength(&length); - PRBool universalMatch = aAttrValue.Equals(NS_LITERAL_STRING("*")); + PRBool universalMatch = aAttrValue.EqualsLiteral("*"); for (PRUint32 i = 0; i < length; ++i) { nsCOMPtr current; @@ -4000,10 +4000,10 @@ nsDocument::SetXMLDeclaration(const nsAString& aVersion, mXMLDeclarationBits |= XML_DECLARATION_BITS_ENCODING_EXISTS; } - if (aStandalone.Equals(NS_LITERAL_STRING("yes"))) { + if (aStandalone.EqualsLiteral("yes")) { mXMLDeclarationBits |= XML_DECLARATION_BITS_STANDALONE_EXISTS | XML_DECLARATION_BITS_STANDALONE_YES; - } else if (aStandalone.Equals(NS_LITERAL_STRING("no"))) { + } else if (aStandalone.EqualsLiteral("no")) { mXMLDeclarationBits |= XML_DECLARATION_BITS_STANDALONE_EXISTS; } } diff --git a/mozilla/content/base/src/nsDocumentEncoder.cpp b/mozilla/content/base/src/nsDocumentEncoder.cpp index 42e24c3aab5..5d244ea0b93 100644 --- a/mozilla/content/base/src/nsDocumentEncoder.cpp +++ b/mozilla/content/base/src/nsDocumentEncoder.cpp @@ -1606,7 +1606,7 @@ nsHTMLCopyEncoder::IsMozBR(nsIDOMNode* aNode) nsAutoString typeAttrVal; nsresult rv = elem->GetAttribute(typeAttrName, typeAttrVal); ToLowerCase(typeAttrVal); - if (NS_SUCCEEDED(rv) && (typeAttrVal.Equals(NS_LITERAL_STRING("_moz")))) + if (NS_SUCCEEDED(rv) && (typeAttrVal.EqualsLiteral("_moz"))) return PR_TRUE; } return PR_FALSE; diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index f561e2c3c39..639e962dd5a 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -2820,7 +2820,7 @@ DocumentViewerImpl::GetPopupLinkNode(nsIDOMNode** aNode) } } } - if (anchor || area || link || xlinkType.Equals(NS_LITERAL_STRING("simple"))) { + if (anchor || area || link || xlinkType.EqualsLiteral("simple")) { *aNode = node; NS_IF_ADDREF(*aNode); // addref return NS_OK; diff --git a/mozilla/content/base/src/nsFrameLoader.cpp b/mozilla/content/base/src/nsFrameLoader.cpp index 61ff3c80712..01da8fb27af 100644 --- a/mozilla/content/base/src/nsFrameLoader.cpp +++ b/mozilla/content/base/src/nsFrameLoader.cpp @@ -489,7 +489,7 @@ nsFrameLoader::EnsureDocShell() nsAutoString::const_char_iterator iter(start + 7); - isContent = Substring(start, iter) == NS_LITERAL_STRING("content") && + isContent = Substring(start, iter).EqualsLiteral("content") && (iter == end || *iter == '-'); } @@ -513,7 +513,7 @@ nsFrameLoader::EnsureDocShell() if (parentTreeOwner) { PRBool is_primary = parentType == nsIDocShellTreeItem::typeChrome && - value == NS_LITERAL_STRING("content-primary"); + value.EqualsLiteral("content-primary"); parentTreeOwner->ContentShellAdded(docShellAsItem, is_primary, value.get()); diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index 3594f80cb4e..602f6f6e498 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/content/base/src/nsGenericElement.cpp @@ -1533,7 +1533,7 @@ nsGenericElement::GetElementsByTagNameNS(const nsAString& aNamespaceURI, nsCOMPtr list; - if (!aNamespaceURI.Equals(NS_LITERAL_STRING("*"))) { + if (!aNamespaceURI.EqualsLiteral("*")) { nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceID(aNamespaceURI, &nameSpaceId); diff --git a/mozilla/content/base/src/nsImageLoadingContent.cpp b/mozilla/content/base/src/nsImageLoadingContent.cpp index 9bf6a900f25..20b812ce9bc 100644 --- a/mozilla/content/base/src/nsImageLoadingContent.cpp +++ b/mozilla/content/base/src/nsImageLoadingContent.cpp @@ -591,7 +591,7 @@ HandleImagePLEvent(PLEvent* aEvent) nsEventStatus estatus = nsEventStatus_eIgnore; PRUint32 eventMsg; - if (evt->mMessage == NS_LITERAL_STRING("load")) { + if (evt->mMessage.EqualsLiteral("load")) { eventMsg = NS_IMAGE_LOAD; } else { eventMsg = NS_IMAGE_ERROR; diff --git a/mozilla/content/base/src/nsPlainTextSerializer.cpp b/mozilla/content/base/src/nsPlainTextSerializer.cpp index 16cb1cf73fa..3b9c7ec49cf 100644 --- a/mozilla/content/base/src/nsPlainTextSerializer.cpp +++ b/mozilla/content/base/src/nsPlainTextSerializer.cpp @@ -1152,7 +1152,7 @@ nsPlainTextSerializer::DoAddLeaf(const nsIParserNode *aNode, PRInt32 aTag, // ignore the bogus br tags that the editor sticks here and there. nsAutoString typeAttr; if (NS_FAILED(GetAttributeValue(aNode, nsHTMLAtoms::type, typeAttr)) - || !typeAttr.Equals(NS_LITERAL_STRING("_moz"))) { + || !typeAttr.EqualsLiteral("_moz")) { EnsureVerticalSpace(mEmptyLines+1); } } @@ -1507,7 +1507,7 @@ nsPlainTextSerializer::EndLine(PRBool aSoftlinebreak) // (see RFC 2646). We only check for "-- " when it's a hard line // break for obvious reasons. if(!(mFlags & nsIDocumentEncoder::OutputPreformatted) && - (aSoftlinebreak || !mCurrentLine.Equals(NS_LITERAL_STRING("-- ")))) { + (aSoftlinebreak || !mCurrentLine.EqualsLiteral("-- "))) { // Remove SPACE:s from the end of the line. while(currentlinelength > 0 && mCurrentLine[currentlinelength-1] == ' ') { diff --git a/mozilla/content/base/src/nsTextNode.cpp b/mozilla/content/base/src/nsTextNode.cpp index 534a3d51841..8c8bf424abe 100644 --- a/mozilla/content/base/src/nsTextNode.cpp +++ b/mozilla/content/base/src/nsTextNode.cpp @@ -252,7 +252,7 @@ nsTextNode::DumpContent(FILE* out, PRInt32 aIndent, PRBool aDumpAll) const nsAutoString tmp; ToCString(tmp, 0, mText.GetLength()); - if(!tmp.Equals(NS_LITERAL_STRING("\\n"))) { + if(!tmp.EqualsLiteral("\\n")) { fputs(NS_LossyConvertUCS2toASCII(tmp).get(), out); if(aIndent) fputs("\n", out); } diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp index 1b1ff6695a8..ac1596d13b9 100644 --- a/mozilla/content/events/src/nsEventStateManager.cpp +++ b/mozilla/content/events/src/nsEventStateManager.cpp @@ -382,36 +382,36 @@ nsEventStateManager::Observe(nsISupports *aSubject, return NS_OK; nsDependentString data(someData); - if (data.Equals(NS_LITERAL_STRING("accessibility.accesskeycausesactivation"))) { + if (data.EqualsLiteral("accessibility.accesskeycausesactivation")) { sKeyCausesActivation = nsContentUtils::GetBoolPref("accessibility.accesskeycausesactivation", sKeyCausesActivation); - } else if (data.Equals(NS_LITERAL_STRING("accessibility.browsewithcaret"))) { + } else if (data.EqualsLiteral("accessibility.browsewithcaret")) { ResetBrowseWithCaret(); - } else if (data.Equals(NS_LITERAL_STRING("accessibility.tabfocus"))) { + } else if (data.EqualsLiteral("accessibility.tabfocus")) { sTabFocusModel = nsContentUtils::GetIntPref("accessibility.tabfocus", sTabFocusModel); - } else if (data.Equals(NS_LITERAL_STRING("nglayout.events.dispatchLeftClickOnly"))) { + } else if (data.EqualsLiteral("nglayout.events.dispatchLeftClickOnly")) { sLeftClickOnly = nsContentUtils::GetBoolPref("nglayout.events.dispatchLeftClickOnly", sLeftClickOnly); - } else if (data.Equals(NS_LITERAL_STRING("ui.key.generalAccessKey"))) { + } else if (data.EqualsLiteral("ui.key.generalAccessKey")) { sGeneralAccesskeyModifier = nsContentUtils::GetIntPref("ui.key.generalAccessKey", sGeneralAccesskeyModifier); #if 0 - } else if (data.Equals(NS_LITERAL_STRING("mousewheel.withaltkey.action"))) { - } else if (data.Equals(NS_LITERAL_STRING("mousewheel.withaltkey.numlines"))) { - } else if (data.Equals(NS_LITERAL_STRING("mousewheel.withaltkey.sysnumlines"))) { - } else if (data.Equals(NS_LITERAL_STRING("mousewheel.withcontrolkey.action"))) { - } else if (data.Equals(NS_LITERAL_STRING("mousewheel.withcontrolkey.numlines"))) { - } else if (data.Equals(NS_LITERAL_STRING("mousewheel.withcontrolkey.sysnumlines"))) { - } else if (data.Equals(NS_LITERAL_STRING("mousewheel.withshiftkey.action"))) { - } else if (data.Equals(NS_LITERAL_STRING("mousewheel.withshiftkey.numlines"))) { - } else if (data.Equals(NS_LITERAL_STRING("mousewheel.withshiftkey.sysnumlines"))) { - } else if (data.Equals(NS_LITERAL_STRING("mousewheel.withnokey.action"))) { - } else if (data.Equals(NS_LITERAL_STRING("mousewheel.withnokey.numlines"))) { - } else if (data.Equals(NS_LITERAL_STRING("mousewheel.withnokey.sysnumlines"))) { + } else if (data.EqualsLiteral("mousewheel.withaltkey.action")) { + } else if (data.EqualsLiteral("mousewheel.withaltkey.numlines")) { + } else if (data.EqualsLiteral("mousewheel.withaltkey.sysnumlines")) { + } else if (data.EqualsLiteral("mousewheel.withcontrolkey.action")) { + } else if (data.EqualsLiteral("mousewheel.withcontrolkey.numlines")) { + } else if (data.EqualsLiteral("mousewheel.withcontrolkey.sysnumlines")) { + } else if (data.EqualsLiteral("mousewheel.withshiftkey.action")) { + } else if (data.EqualsLiteral("mousewheel.withshiftkey.numlines")) { + } else if (data.EqualsLiteral("mousewheel.withshiftkey.sysnumlines")) { + } else if (data.EqualsLiteral("mousewheel.withnokey.action")) { + } else if (data.EqualsLiteral("mousewheel.withnokey.numlines")) { + } else if (data.EqualsLiteral("mousewheel.withnokey.sysnumlines")) { #endif } } @@ -3710,7 +3710,7 @@ nsEventStateManager::GetNextTabbableContent(nsIContent* aRootContent, PRInt32 errorCode; tabIndex = tabStr.ToInteger(&errorCode); } - if (!value.Equals(NS_LITERAL_STRING("true"))) { + if (!value.EqualsLiteral("true")) { nsCOMPtr control(do_QueryInterface(child)); if (control) control->GetDisabled(&disabled); @@ -4871,7 +4871,7 @@ nsEventStateManager::MoveFocusToCaret(PRBool aCanFocusDoc, if (*aIsSelectionWithFocus) { nsAutoString xlinkType; testContent->GetAttr(kNameSpaceID_XLink, nsHTMLAtoms::type, xlinkType); - if (!xlinkType.Equals(NS_LITERAL_STRING("simple"))) { + if (!xlinkType.EqualsLiteral("simple")) { *aIsSelectionWithFocus = PR_FALSE; // Xlink must be type="simple" } } diff --git a/mozilla/content/html/content/src/nsFormSubmission.cpp b/mozilla/content/html/content/src/nsFormSubmission.cpp index 8525584c160..53310352124 100644 --- a/mozilla/content/html/content/src/nsFormSubmission.cpp +++ b/mozilla/content/html/content/src/nsFormSubmission.cpp @@ -1336,7 +1336,7 @@ nsFormSubmission::GetEncoder(nsIHTMLContent* aForm, nsresult rv = NS_OK; nsCAutoString charset(aCharset); - if(charset.Equals(NS_LITERAL_CSTRING("ISO-8859-1"))) + if(charset.EqualsLiteral("ISO-8859-1")) charset.Assign(NS_LITERAL_CSTRING("windows-1252")); rv = CallCreateInstance( NS_SAVEASCHARSET_CONTRACTID, aEncoder); @@ -1458,7 +1458,7 @@ nsFormSubmission::ProcessValue(nsIDOMHTMLElement* aSource, const nsAString& aName, const nsAString& aValue) { // Hijack _charset_ (hidden inputs only) for internationalization (bug 18643) - if (aName == NS_LITERAL_STRING("_charset_")) { + if (aName.EqualsLiteral("_charset_")) { nsCOMPtr formControl = do_QueryInterface(aSource); if (formControl) { if (formControl->GetType() == NS_FORM_INPUT_HIDDEN) { diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp index 678726e8e66..eb30233afc2 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -2432,7 +2432,7 @@ nsHTMLInputElement::RestoreState(nsIPresState* aState) nsAutoString checked; rv = aState->GetStateProperty(NS_LITERAL_STRING("checked"), checked); if (rv == NS_STATE_PROPERTY_EXISTS) { - DoSetChecked(checked.Equals(NS_LITERAL_STRING("t")), PR_FALSE); + DoSetChecked(checked.EqualsLiteral("t"), PR_FALSE); } break; } @@ -2455,7 +2455,7 @@ nsHTMLInputElement::RestoreState(nsIPresState* aState) nsresult rv2 = aState->GetStateProperty(NS_LITERAL_STRING("disabled"), disabled); NS_ASSERTION(NS_SUCCEEDED(rv2), "disabled restore failed!"); if (rv2 == NS_STATE_PROPERTY_EXISTS) { - SetDisabled(disabled.Equals(NS_LITERAL_STRING("t"))); + SetDisabled(disabled.EqualsLiteral("t")); } if (NS_FAILED(rv|rv2)) { diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index b1c43701b92..b999dc2ea74 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -814,7 +814,7 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand, // Use the channel's charset (e.g., charset from HTTP // "Content-Type" header). } - else if (!scheme.Equals(NS_LITERAL_CSTRING("about")) && // don't try to access bookmarks for about:blank + else if (!scheme.EqualsLiteral("about") && // don't try to access bookmarks for about:blank TryBookmarkCharset(docShell, aChannel, charsetSource, charset)) { // Use the bookmark's charset. } @@ -839,7 +839,7 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand, nsCAutoString methodStr; rv = httpChannel->GetRequestMethod(methodStr); isPostPage = (NS_SUCCEEDED(rv) && - methodStr.Equals(NS_LITERAL_CSTRING("POST"))); + methodStr.EqualsLiteral("POST")); } if (isPostPage && muCV && kCharsetFromHintPrevDoc > charsetSource) { diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp index 5ca95c446e8..422f645a589 100644 --- a/mozilla/content/html/document/src/nsImageDocument.cpp +++ b/mozilla/content/html/document/src/nsImageDocument.cpp @@ -439,13 +439,13 @@ nsImageDocument::HandleEvent(nsIDOMEvent* aEvent) { nsAutoString eventType; aEvent->GetType(eventType); - if (eventType.Equals(NS_LITERAL_STRING("resize"))) { + if (eventType.EqualsLiteral("resize")) { CheckOverflowing(); } - else if (eventType.Equals(NS_LITERAL_STRING("click"))) { + else if (eventType.EqualsLiteral("click")) { ToggleImageSize(); } - else if (eventType.Equals(NS_LITERAL_STRING("keypress"))) { + else if (eventType.EqualsLiteral("keypress")) { nsCOMPtr keyEvent = do_QueryInterface(aEvent); PRUint32 charCode; keyEvent->GetCharCode(&charCode); diff --git a/mozilla/content/html/style/src/nsCSSDeclaration.cpp b/mozilla/content/html/style/src/nsCSSDeclaration.cpp index a4fa0923378..4cabda3844f 100644 --- a/mozilla/content/html/style/src/nsCSSDeclaration.cpp +++ b/mozilla/content/html/style/src/nsCSSDeclaration.cpp @@ -814,7 +814,7 @@ nsCSSDeclaration::TryBorderShorthand(nsAString & aString, PRUint32 aPropertiesSe nsAutoString valueString; AppendValueToString(eCSSProperty_border_top_color, valueString); - if (!valueString.Equals(NS_LITERAL_STRING("-moz-use-text-color"))) { + if (!valueString.EqualsLiteral("-moz-use-text-color")) { /* don't output this value, it's proprietary Mozilla and */ /* not intended to be exposed ; we can remove it from the */ /* values of the shorthand since this value represents the */ @@ -848,7 +848,7 @@ nsCSSDeclaration::TryBorderSideShorthand(nsAString & aString, nsAutoString valueString; AppendValueToString(OrderValueAt(aBorderColor-1), valueString); - if (!valueString.Equals(NS_LITERAL_STRING("-moz-use-text-color"))) { + if (!valueString.EqualsLiteral("-moz-use-text-color")) { aString.Append(NS_LITERAL_STRING(" ")); aString.Append(valueString); } diff --git a/mozilla/content/html/style/src/nsCSSLoader.cpp b/mozilla/content/html/style/src/nsCSSLoader.cpp index 2ae023ab90f..c72d3d75deb 100644 --- a/mozilla/content/html/style/src/nsCSSLoader.cpp +++ b/mozilla/content/html/style/src/nsCSSLoader.cpp @@ -769,8 +769,8 @@ SheetLoadData::OnStreamComplete(nsIUnicharStreamLoader* aLoader, channel->GetContentType(contentType); } - PRBool validType = contentType.Equals(NS_LITERAL_CSTRING("text/css")) || - contentType.Equals(NS_LITERAL_CSTRING(UNKNOWN_CONTENT_TYPE)) || + PRBool validType = contentType.EqualsLiteral("text/css") || + contentType.EqualsLiteral(UNKNOWN_CONTENT_TYPE) || contentType.IsEmpty(); if (mLoader->mCompatMode == eCompatibility_NavQuirks || validType) { diff --git a/mozilla/content/html/style/src/nsStyleUtil.cpp b/mozilla/content/html/style/src/nsStyleUtil.cpp index 4d4ed06aac9..241efe497e9 100644 --- a/mozilla/content/html/style/src/nsStyleUtil.cpp +++ b/mozilla/content/html/style/src/nsStyleUtil.cpp @@ -487,7 +487,7 @@ PRBool nsStyleUtil::IsSimpleXlink(nsIContent *aContent, nsIPresContext *aPresCon // see if it is type=simple (we don't deal with other types) nsAutoString val; aContent->GetAttr(kNameSpaceID_XLink, nsHTMLAtoms::type, val); - if (val == NS_LITERAL_STRING("simple")) { + if (val.EqualsLiteral("simple")) { // see if there is an xlink namespace'd href attribute: // - get it if there is, if not no big deal, it is not required for xlinks // is it bad to re-use val here? diff --git a/mozilla/content/xbl/src/nsXBLBinding.cpp b/mozilla/content/xbl/src/nsXBLBinding.cpp index b4517b68006..7af41198977 100644 --- a/mozilla/content/xbl/src/nsXBLBinding.cpp +++ b/mozilla/content/xbl/src/nsXBLBinding.cpp @@ -1272,7 +1272,7 @@ nsXBLBinding::IsInExcludesList(nsIAtom* aTag, const nsString& aList) nsAutoString element; aTag->ToString(element); - if (aList == NS_LITERAL_STRING("*")) + if (aList.EqualsLiteral("*")) return PR_TRUE; // match _everything_! PRInt32 indx = aList.Find(element, 0); diff --git a/mozilla/content/xbl/src/nsXBLContentSink.cpp b/mozilla/content/xbl/src/nsXBLContentSink.cpp index 16ee374b313..9af7f54cbf4 100644 --- a/mozilla/content/xbl/src/nsXBLContentSink.cpp +++ b/mozilla/content/xbl/src/nsXBLContentSink.cpp @@ -658,7 +658,7 @@ nsXBLContentSink::ConstructResource(const PRUnichar **aAtts, } // Is this attribute one of the ones we care about? - if (key.Equals(NS_LITERAL_STRING("src"))) { + if (key.EqualsLiteral("src")) { mBinding->AddResource(aResourceType, nsDependentString(aAtts[1])); break; } diff --git a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp index a4f20ede413..e9f842387d1 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp +++ b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp @@ -324,7 +324,7 @@ nsXBLPrototypeBinding::SetBindingElement(nsIContent* aElement) mBinding = aElement; nsAutoString inheritStyle; mBinding->GetAttr(kNameSpaceID_None, nsXBLAtoms::inheritstyle, inheritStyle); - if (inheritStyle == NS_LITERAL_STRING("false")) + if (inheritStyle.EqualsLiteral("false")) mInheritStyle = PR_FALSE; } diff --git a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp index 150c6a90c75..7603a7cb2b2 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp @@ -298,7 +298,7 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, nsAutoString type; mEventName->ToString(type); - if (type == NS_LITERAL_STRING("keypress") && + if (type.EqualsLiteral("keypress") && mDetail == nsIDOMKeyEvent::DOM_VK_SPACE && mMisc == 1) { // get the focused element so that we can pageDown only at @@ -324,7 +324,7 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver, nsAutoString type; content->GetAttr(kNameSpaceID_XLink, nsHTMLAtoms::type, type); - isLink = type.Equals(NS_LITERAL_STRING("simple")); + isLink = type.EqualsLiteral("simple"); if (isLink) { break; @@ -859,9 +859,9 @@ nsXBLPrototypeHandler::ConstructPrototype(nsIContent* aKeyElement, if (aPhase) { const nsDependentString phase(aPhase); - if (phase.Equals(NS_LITERAL_STRING("capturing"))) + if (phase.EqualsLiteral("capturing")) mPhase = NS_PHASE_CAPTURING; - else if (phase.Equals(NS_LITERAL_STRING("target"))) + else if (phase.EqualsLiteral("target")) mPhase = NS_PHASE_TARGET; } @@ -941,7 +941,7 @@ nsXBLPrototypeHandler::ConstructPrototype(nsIContent* aKeyElement, } nsAutoString preventDefault(aPreventDefault); - if (preventDefault.Equals(NS_LITERAL_STRING("true"))) + if (preventDefault.EqualsLiteral("true")) mType |= NS_HANDLER_TYPE_PREVENTDEFAULT; } diff --git a/mozilla/content/xbl/src/nsXBLWindowHandler.cpp b/mozilla/content/xbl/src/nsXBLWindowHandler.cpp index 8df4ce274d1..df8b9908e9b 100644 --- a/mozilla/content/xbl/src/nsXBLWindowHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLWindowHandler.cpp @@ -317,7 +317,7 @@ nsXBLWindowHandler::WalkHandlersInternal(nsIDOMEvent* aEvent, if (commandElt) commandElt->GetAttribute(NS_LITERAL_STRING("disabled"), disabled); - if (!disabled.Equals(NS_LITERAL_STRING("true"))) { + if (!disabled.EqualsLiteral("true")) { nsCOMPtr rec = mReceiver; if (mElement) rec = do_QueryInterface(commandElt); diff --git a/mozilla/content/xml/content/src/nsXMLElement.cpp b/mozilla/content/xml/content/src/nsXMLElement.cpp index 287906f83bd..9d8ee45e13b 100644 --- a/mozilla/content/xml/content/src/nsXMLElement.cpp +++ b/mozilla/content/xml/content/src/nsXMLElement.cpp @@ -141,7 +141,7 @@ nsXMLElement::SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, nsIAtom* aPrefix, // we do not need to check other attributes. If there // is no href attribute, then this link is simply // untraversible [XLink 3.2]. - mIsLink = aValue.Equals(NS_LITERAL_STRING("simple")); + mIsLink = aValue.EqualsLiteral("simple"); // We will check for actuate="onLoad" in MaybeTriggerAutoLink } @@ -226,7 +226,7 @@ nsXMLElement::MaybeTriggerAutoLink(nsIDocShell *aShell) break; // XXX Should probably do this using atoms - if (value.Equals(NS_LITERAL_STRING("new"))) { + if (value.EqualsLiteral("new")) { if (nsContentUtils::GetBoolPref("dom.disable_open_during_load")) { // disabling open during load @@ -237,12 +237,12 @@ nsXMLElement::MaybeTriggerAutoLink(nsIDocShell *aShell) // not blocking new windows verb = eLinkVerb_New; } - } else if (value.Equals(NS_LITERAL_STRING("replace"))) { + } else if (value.EqualsLiteral("replace")) { // We want to actually stop processing the current document now. // We do this by returning the correct value so that the one // that called us knows to stop processing. verb = eLinkVerb_Replace; - } else if (value.Equals(NS_LITERAL_STRING("embed"))) { + } else if (value.EqualsLiteral("embed")) { // XXX TODO break; } @@ -325,13 +325,13 @@ nsXMLElement::HandleDOMEvent(nsIPresContext* aPresContext, show); // XXX Should probably do this using atoms - if (show.Equals(NS_LITERAL_STRING("new"))) { + if (show.EqualsLiteral("new")) { if (!nsContentUtils::GetBoolPref("browser.block.target_new_window")) { verb = eLinkVerb_New; } - } else if (show.Equals(NS_LITERAL_STRING("replace"))) { + } else if (show.EqualsLiteral("replace")) { verb = eLinkVerb_Replace; - } else if (show.Equals(NS_LITERAL_STRING("embed"))) { + } else if (show.EqualsLiteral("embed")) { verb = eLinkVerb_Embed; } diff --git a/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp b/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp index dda21cd2daf..905e22b2ed3 100644 --- a/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp +++ b/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp @@ -46,7 +46,7 @@ NS_NewXMLProcessingInstruction(nsIContent** aInstancePtrResult, const nsAString& aTarget, const nsAString& aData) { - if (aTarget.Equals(NS_LITERAL_STRING("xml-stylesheet"))) { + if (aTarget.EqualsLiteral("xml-stylesheet")) { return NS_NewXMLStylesheetProcessingInstruction(aInstancePtrResult, aData); } *aInstancePtrResult = new nsXMLProcessingInstruction(aTarget, aData); diff --git a/mozilla/content/xml/content/src/nsXMLStylesheetPI.cpp b/mozilla/content/xml/content/src/nsXMLStylesheetPI.cpp index 8cef60143f6..9aa4a57216d 100644 --- a/mozilla/content/xml/content/src/nsXMLStylesheetPI.cpp +++ b/mozilla/content/xml/content/src/nsXMLStylesheetPI.cpp @@ -202,7 +202,7 @@ nsXMLStylesheetPI::GetStyleSheetInfo(nsAString& aTitle, GetAttrValue(NS_LITERAL_STRING("alternate"), alternate); // if alternate, does it have title? - if (alternate.Equals(NS_LITERAL_STRING("yes"))) { + if (alternate.EqualsLiteral("yes")) { if (aTitle.IsEmpty()) { // alternates must have title return; } else { diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp index d1efbce9eb0..349d1b3014f 100644 --- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp @@ -199,7 +199,7 @@ nsXMLContentSink::WillBuildModel(void) if (mPrettyPrintXML) { nsAutoString command; mParser->GetCommand(command); - if (!command.Equals(NS_LITERAL_STRING("view"))) { + if (!command.EqualsLiteral("view")) { mPrettyPrintXML = PR_FALSE; } } @@ -1328,7 +1328,7 @@ nsXMLContentSink::HandleProcessingInstruction(const PRUnichar *aTarget, nsAutoString type; nsParserUtils::GetQuotedAttributeValue(data, NS_LITERAL_STRING("type"), type); if (mState == eXMLContentSinkState_InProlog && - target.Equals(NS_LITERAL_STRING("xml-stylesheet")) && + target.EqualsLiteral("xml-stylesheet") && !type.EqualsIgnoreCase("text/css")) { nsAutoString href, title, media, alternate; @@ -1346,7 +1346,7 @@ nsXMLContentSink::HandleProcessingInstruction(const PRUnichar *aTarget, nsParserUtils::GetQuotedAttributeValue(data, NS_LITERAL_STRING("alternate"), alternate); - result = ProcessStyleLink(node, href, alternate.Equals(NS_LITERAL_STRING("yes")), + result = ProcessStyleLink(node, href, alternate.EqualsLiteral("yes"), title, type, media); } } diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp index 2e464c7bd2c..a10bc53aadf 100644 --- a/mozilla/content/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp @@ -520,9 +520,9 @@ nsXMLDocument::Load(const nsAString& aUrl, PRBool *aReturn) if (node) { nsAutoString name, ns; if (NS_SUCCEEDED(node->GetLocalName(name)) && - name.Equals(NS_LITERAL_STRING("parsererror")) && + name.EqualsLiteral("parsererror") && NS_SUCCEEDED(node->GetNamespaceURI(ns)) && - ns.Equals(NS_LITERAL_STRING("http://www.mozilla.org/newlayout/xml/parsererror.xml"))) { + ns.EqualsLiteral("http://www.mozilla.org/newlayout/xml/parsererror.xml")) { //return is already false } else { *aReturn = PR_TRUE; diff --git a/mozilla/content/xml/document/src/nsXMLPrettyPrinter.cpp b/mozilla/content/xml/document/src/nsXMLPrettyPrinter.cpp index 16e6471b827..117e8abf4c1 100644 --- a/mozilla/content/xml/document/src/nsXMLPrettyPrinter.cpp +++ b/mozilla/content/xml/document/src/nsXMLPrettyPrinter.cpp @@ -106,7 +106,7 @@ nsXMLPrettyPrinter::PrettyPrint(nsIDocument* aDocument) nsAutoString visibility; computedStyle->GetPropertyValue(NS_LITERAL_STRING("visibility"), visibility); - if (!visibility.Equals(NS_LITERAL_STRING("visible"))) { + if (!visibility.EqualsLiteral("visible")) { return NS_OK; } diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp index eedcee427b9..4bcb36ee106 100644 --- a/mozilla/content/xul/content/src/nsXULElement.cpp +++ b/mozilla/content/xul/content/src/nsXULElement.cpp @@ -1245,7 +1245,7 @@ nsXULElement::GetElementsByTagNameNS(const nsAString& aNamespaceURI, nsCOMPtr list; - if (!aNamespaceURI.Equals(NS_LITERAL_STRING("*"))) { + if (!aNamespaceURI.EqualsLiteral("*")) { nsContentUtils::GetNSManagerWeakRef()->GetNameSpaceID(aNamespaceURI, &nameSpaceId); @@ -2653,10 +2653,10 @@ nsXULElement::HandleDOMEvent(nsIPresContext* aPresContext, nsEvent* aEvent, aEvent->message == NS_XUL_POPUP_HIDDEN || aEvent->message == NS_FORM_SELECTED || aEvent->message == NS_XUL_BROADCAST || aEvent->message == NS_XUL_COMMAND_UPDATE || aEvent->message == NS_XUL_CLICK || aEvent->message == NS_DRAGDROP_GESTURE || - tagName == NS_LITERAL_STRING("menu") || tagName == NS_LITERAL_STRING("menuitem") || - tagName == NS_LITERAL_STRING("menulist") || tagName == NS_LITERAL_STRING("menubar") || - tagName == NS_LITERAL_STRING("menupopup") || tagName == NS_LITERAL_STRING("key") || - tagName == NS_LITERAL_STRING("keyset")) { + tagName.EqualsLiteral("menu") || tagName.EqualsLiteral("menuitem") || + tagName.EqualsLiteral("menulist") || tagName.EqualsLiteral("menubar") || + tagName.EqualsLiteral("menupopup") || tagName.EqualsLiteral("key") || + tagName.EqualsLiteral("keyset")) { nsCOMPtr listenerManager; if (NS_FAILED(ret = GetListenerManager(getter_AddRefs(listenerManager)))) { @@ -3318,7 +3318,7 @@ nsXULElement::GetHidden(PRBool* aResult) *aResult = PR_FALSE; nsAutoString val; GetAttribute(NS_LITERAL_STRING("hidden"), val); - if (val.Equals(NS_LITERAL_STRING("true"))) + if (val.EqualsLiteral("true")) *aResult = PR_TRUE; return NS_OK; } @@ -3339,7 +3339,7 @@ nsXULElement::GetCollapsed(PRBool* aResult) *aResult = PR_FALSE; nsAutoString val; GetAttribute(NS_LITERAL_STRING("collapsed"), val); - if (val.Equals(NS_LITERAL_STRING("true"))) + if (val.EqualsLiteral("true")) *aResult = PR_TRUE; return NS_OK; } @@ -3360,7 +3360,7 @@ nsXULElement::GetAllowEvents(PRBool* aResult) *aResult = PR_FALSE; nsAutoString val; GetAttribute(NS_LITERAL_STRING("allowevents"), val); - if (val.Equals(NS_LITERAL_STRING("true"))) + if (val.EqualsLiteral("true")) *aResult = PR_TRUE; return NS_OK; } @@ -3719,7 +3719,7 @@ nsXULElement::Click() { nsAutoString disabled; GetAttribute(NS_LITERAL_STRING("disabled"), disabled); - if (disabled == NS_LITERAL_STRING("true")) + if (disabled.EqualsLiteral("true")) return NS_OK; nsCOMPtr doc = mDocument; // Strong just in case @@ -3785,7 +3785,7 @@ nsXULElement::SetFocus(nsIPresContext* aPresContext) { nsAutoString disabled; GetAttribute(NS_LITERAL_STRING("disabled"), disabled); - if (disabled == NS_LITERAL_STRING("true")) + if (disabled.EqualsLiteral("true")) return; aPresContext->EventStateManager()->SetContentState(this, diff --git a/mozilla/content/xul/content/src/nsXULPopupListener.cpp b/mozilla/content/xul/content/src/nsXULPopupListener.cpp index 0a7a8806e19..67481560111 100644 --- a/mozilla/content/xul/content/src/nsXULPopupListener.cpp +++ b/mozilla/content/xul/content/src/nsXULPopupListener.cpp @@ -449,43 +449,43 @@ static void ConvertPosition(nsIDOMElement* aPopupElt, nsString& aAnchor, nsStrin if (position.IsEmpty()) return; - if (position.Equals(NS_LITERAL_STRING("before_start"))) { + if (position.EqualsLiteral("before_start")) { aAnchor.Assign(NS_LITERAL_STRING("topleft")); aAlign.Assign(NS_LITERAL_STRING("bottomleft")); } - else if (position.Equals(NS_LITERAL_STRING("before_end"))) { + else if (position.EqualsLiteral("before_end")) { aAnchor.Assign(NS_LITERAL_STRING("topright")); aAlign.Assign(NS_LITERAL_STRING("bottomright")); } - else if (position.Equals(NS_LITERAL_STRING("after_start"))) { + else if (position.EqualsLiteral("after_start")) { aAnchor.Assign(NS_LITERAL_STRING("bottomleft")); aAlign.Assign(NS_LITERAL_STRING("topleft")); } - else if (position.Equals(NS_LITERAL_STRING("after_end"))) { + else if (position.EqualsLiteral("after_end")) { aAnchor.Assign(NS_LITERAL_STRING("bottomright")); aAlign.Assign(NS_LITERAL_STRING("topright")); } - else if (position.Equals(NS_LITERAL_STRING("start_before"))) { + else if (position.EqualsLiteral("start_before")) { aAnchor.Assign(NS_LITERAL_STRING("topleft")); aAlign.Assign(NS_LITERAL_STRING("topright")); } - else if (position.Equals(NS_LITERAL_STRING("start_after"))) { + else if (position.EqualsLiteral("start_after")) { aAnchor.Assign(NS_LITERAL_STRING("bottomleft")); aAlign.Assign(NS_LITERAL_STRING("bottomright")); } - else if (position.Equals(NS_LITERAL_STRING("end_before"))) { + else if (position.EqualsLiteral("end_before")) { aAnchor.Assign(NS_LITERAL_STRING("topright")); aAlign.Assign(NS_LITERAL_STRING("topleft")); } - else if (position.Equals(NS_LITERAL_STRING("end_after"))) { + else if (position.EqualsLiteral("end_after")) { aAnchor.Assign(NS_LITERAL_STRING("bottomright")); aAlign.Assign(NS_LITERAL_STRING("bottomleft")); } - else if (position.Equals(NS_LITERAL_STRING("overlap"))) { + else if (position.EqualsLiteral("overlap")) { aAnchor.Assign(NS_LITERAL_STRING("topleft")); aAlign.Assign(NS_LITERAL_STRING("topleft")); } - else if (position.Equals(NS_LITERAL_STRING("after_pointer"))) + else if (position.EqualsLiteral("after_pointer")) aY += 21; } @@ -520,9 +520,9 @@ XULPopupListenerImpl::LaunchPopup(PRInt32 aClientX, PRInt32 aClientY) mElement->GetAttribute(type, identifier); if (identifier.IsEmpty()) { - if (type.Equals(NS_LITERAL_STRING("popup"))) + if (type.EqualsLiteral("popup")) mElement->GetAttribute(NS_LITERAL_STRING("menu"), identifier); - else if (type.Equals(NS_LITERAL_STRING("context"))) + else if (type.EqualsLiteral("context")) mElement->GetAttribute(NS_LITERAL_STRING("contextmenu"), identifier); if (identifier.IsEmpty()) return rv; @@ -542,7 +542,7 @@ XULPopupListenerImpl::LaunchPopup(PRInt32 aClientX, PRInt32 aClientY) // Handle the _child case for popups and context menus nsCOMPtr popupContent; - if (identifier == NS_LITERAL_STRING("_child")) { + if (identifier.EqualsLiteral("_child")) { nsCOMPtr popup; GetImmediateChild(content, nsXULAtoms::menupopup, getter_AddRefs(popup)); diff --git a/mozilla/content/xul/document/src/nsXULCommandDispatcher.cpp b/mozilla/content/xul/document/src/nsXULCommandDispatcher.cpp index a58ff68bf22..6164631d0dc 100644 --- a/mozilla/content/xul/document/src/nsXULCommandDispatcher.cpp +++ b/mozilla/content/xul/document/src/nsXULCommandDispatcher.cpp @@ -382,7 +382,7 @@ PRBool nsXULCommandDispatcher::Matches(const nsString& aList, const nsAString& aElement) { - if (aList.Equals(NS_LITERAL_STRING("*"))) + if (aList.EqualsLiteral("*")) return PR_TRUE; // match _everything_! PRInt32 indx = aList.Find(PromiseFlatString(aElement)); diff --git a/mozilla/content/xul/document/src/nsXULContentSink.cpp b/mozilla/content/xul/document/src/nsXULContentSink.cpp index b701248d544..894a3e106ad 100644 --- a/mozilla/content/xul/document/src/nsXULContentSink.cpp +++ b/mozilla/content/xul/document/src/nsXULContentSink.cpp @@ -1049,7 +1049,7 @@ XULContentSinkImpl::HandleProcessingInstruction(const PRUnichar *aTarget, nsParserUtils::GetQuotedAttributeValue(data, NS_LITERAL_STRING("alternate"), alternate); nsresult result = ProcessStyleLink(nsnull /* XXX need a node here */, - href, alternate.Equals(NS_LITERAL_STRING("yes")), /* XXX ignore case? */ + href, alternate.EqualsLiteral("yes"), /* XXX ignore case? */ title, type, media); if (NS_FAILED(result)) { if (result == NS_ERROR_HTMLPARSER_BLOCK && mParser) { @@ -1387,10 +1387,10 @@ XULContentSinkImpl::OpenScript(const PRUnichar** aAttributes, nsAutoString src; while (*aAttributes) { const nsDependentString key(aAttributes[0]); - if (key.Equals(NS_LITERAL_STRING("src"))) { + if (key.EqualsLiteral("src")) { src.Assign(aAttributes[1]); } - else if (key.Equals(NS_LITERAL_STRING("type"))) { + else if (key.EqualsLiteral("type")) { nsAutoString type(aAttributes[1]); nsAutoString mimeType; nsAutoString params; @@ -1416,7 +1416,7 @@ XULContentSinkImpl::OpenScript(const PRUnichar** aAttributes, jsVersionString = JS_VersionToString(jsVersion); } } - else if (key.Equals(NS_LITERAL_STRING("language"))) { + else if (key.EqualsLiteral("language")) { nsAutoString lang(aAttributes[1]); isJavaScript = nsParserUtils::IsJavaScriptLanguage(lang, &jsVersionString); } diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index d32c30e71b2..fd57920a644 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -518,7 +518,7 @@ nsXULDocument::GetContentType(nsAString& aContentType) void nsXULDocument::SetContentType(const nsAString& aContentType) { - NS_ASSERTION(aContentType.Equals(NS_LITERAL_STRING("application/vnd.mozilla.xul+xml")), + NS_ASSERTION(aContentType.EqualsLiteral("application/vnd.mozilla.xul+xml"), "xul-documents always has content-type application/vnd.mozilla.xul+xml"); // Don't do anything, xul always has the mimetype // application/vnd.mozilla.xul+xml @@ -828,7 +828,7 @@ nsXULDocument::SynchronizeBroadcastListener(nsIDOMElement *aBroadcaster, nsCOMPtr broadcaster = do_QueryInterface(aBroadcaster); nsCOMPtr listener = do_QueryInterface(aListener); - if (aAttr.Equals(NS_LITERAL_STRING("*"))) { + if (aAttr.EqualsLiteral("*")) { PRUint32 count = broadcaster->GetAttrCount(); while (count-- > 0) { PRInt32 nameSpaceID; @@ -1047,7 +1047,7 @@ nsXULDocument::ExecuteOnBroadcastHandlerFor(nsIContent* aBroadcaster, listeningToAttribute); if (!aAttr->Equals(listeningToAttribute) && - listeningToAttribute != NS_LITERAL_STRING("*")) { + !listeningToAttribute.EqualsLiteral("*")) { continue; } @@ -1771,7 +1771,7 @@ nsXULDocument::AddElementToDocumentPre(nsIContent* aElement) rv = aElement->GetAttr(kNameSpaceID_None, nsXULAtoms::commandupdater, value); if (rv == NS_CONTENT_ATTR_HAS_VALUE && - value == NS_LITERAL_STRING("true")) { + value.EqualsLiteral("true")) { rv = nsXULContentUtils::SetCommandUpdater(this, aElement); if (NS_FAILED(rv)) return rv; } @@ -1888,7 +1888,7 @@ nsXULDocument::RemoveSubtreeFromDocument(nsIContent* aElement) rv = aElement->GetAttr(kNameSpaceID_None, nsXULAtoms::commandupdater, value); if (rv == NS_CONTENT_ATTR_HAS_VALUE && - value == NS_LITERAL_STRING("true")) { + value.EqualsLiteral("true")) { nsCOMPtr domelement = do_QueryInterface(aElement); NS_ASSERTION(domelement != nsnull, "not a DOM element"); if (! domelement) @@ -2193,7 +2193,7 @@ nsXULDocument::MatchAttribute(nsIContent* aContent, return PR_FALSE; } - if (aAttrValue == NS_LITERAL_STRING("*")) { + if (aAttrValue.EqualsLiteral("*")) { // Wildcard. We already know we have this attr, so we match return PR_TRUE; } @@ -3653,7 +3653,7 @@ nsXULDocument::OverlayForwardReference::Merge(nsIContent* aTargetNode, // Element in the overlay has the 'removeelement' attribute set // so remove it from the actual document. if (attr == nsXULAtoms::removeelement && - value.Equals(NS_LITERAL_STRING("true"))) { + value.EqualsLiteral("true")) { rv = RemoveElement(aTargetNode->GetParent(), aTargetNode); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp index 552a31d1397..62785b2faf7 100644 --- a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp +++ b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp @@ -526,7 +526,7 @@ nsXULContentBuilder::BuildContentFromTemplate(nsIContent *aTemplateNode, aMatch->mAssignments.GetAssignmentFor(aMatch->mRule->GetMemberVariable(), &member); aChild = VALUE_TO_IRDFRESOURCE(member); } - else if (uri.Equals(NS_LITERAL_STRING("...")) || uri.Equals(NS_LITERAL_STRING("rdf:*"))) { + else if (uri.EqualsLiteral("...") || uri.EqualsLiteral("rdf:*")) { // If we -are- the resource element, then we are no // matter unique. isResourceElement = PR_TRUE; @@ -1371,7 +1371,7 @@ nsXULContentBuilder::IsOpen(nsIContent* aElement) NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get open attribute"); return (rv == NS_CONTENT_ATTR_HAS_VALUE && - value == NS_LITERAL_STRING("true")); + value.EqualsLiteral("true")); } @@ -1616,7 +1616,7 @@ nsXULContentBuilder::AttributeChanged(nsIDocument* aDocument, nsAutoString open; aContent->GetAttr(kNameSpaceID_None, nsXULAtoms::open, open); - if (open == NS_LITERAL_STRING("true")) + if (open.EqualsLiteral("true")) OpenContainer(aContent); else CloseContainer(aContent); diff --git a/mozilla/content/xul/templates/src/nsXULSortService.cpp b/mozilla/content/xul/templates/src/nsXULSortService.cpp index 207f4171d9d..da101b913db 100644 --- a/mozilla/content/xul/templates/src/nsXULSortService.cpp +++ b/mozilla/content/xul/templates/src/nsXULSortService.cpp @@ -428,7 +428,7 @@ XULSortServiceImpl::GetSortColumnInfo(nsIContent *tree, nsXULAtoms::sortActive, value)) && (rv == NS_CONTENT_ATTR_HAS_VALUE)) { - if (value.Equals(NS_LITERAL_STRING("true"))) + if (value.EqualsLiteral("true")) { if (NS_SUCCEEDED(rv = tree->GetAttr(kNameSpaceID_None, nsXULAtoms::sortResource, @@ -448,7 +448,7 @@ XULSortServiceImpl::GetSortColumnInfo(nsIContent *tree, value)) && (rv == NS_CONTENT_ATTR_HAS_VALUE)) { - if (value.Equals(NS_LITERAL_STRING("true"))) + if (value.EqualsLiteral("true")) { inbetweenSeparatorSort = PR_TRUE; } @@ -1234,7 +1234,7 @@ XULSortServiceImpl::SortContainer(nsIContent *container, sortPtr sortInfo, // if it's a container, find its treechildren nodes, and sort those if (NS_FAILED(rv = parentNode->GetAttr(kNameSpaceID_None, nsXULAtoms::container, value)) || - (rv != NS_CONTENT_ATTR_HAS_VALUE) || !value.Equals(NS_LITERAL_STRING("true"))) + (rv != NS_CONTENT_ATTR_HAS_VALUE) || !value.EqualsLiteral("true")) continue; numChildren = parentNode->GetChildCount(); @@ -1468,7 +1468,7 @@ XULSortServiceImpl::InsertContainerNode(nsIRDFCompositeDataSource *db, nsRDFSort } if (NS_SUCCEEDED(rv = root->GetAttr(kNameSpaceID_None, nsXULAtoms::sortStaticsLast, valueStr)) - && (rv == NS_CONTENT_ATTR_HAS_VALUE) && valueStr.Equals(NS_LITERAL_STRING("true"))) + && (rv == NS_CONTENT_ATTR_HAS_VALUE) && valueStr.EqualsLiteral("true")) { // indicate that static XUL comes after RDF-generated content by making negative staticCount = -staticCount; @@ -1583,7 +1583,7 @@ XULSortServiceImpl::Sort(nsIDOMNode* node, const nsAString& sortResource, const nsAutoString value; if (NS_SUCCEEDED(rv = dbNode->GetAttr(kNameSpaceID_None, nsXULAtoms::sortActive, value)) && (rv == NS_CONTENT_ATTR_HAS_VALUE) - && value.Equals(NS_LITERAL_STRING("true"))) + && value.EqualsLiteral("true")) { if (NS_SUCCEEDED(rv = dbNode->GetAttr(kNameSpaceID_None, nsXULAtoms::sortResource, value)) && (rv == NS_CONTENT_ATTR_HAS_VALUE) diff --git a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp index b751c295f20..4f712c17a63 100644 --- a/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp +++ b/mozilla/content/xul/templates/src/nsXULTemplateBuilder.cpp @@ -678,12 +678,12 @@ nsXULTemplateBuilder::LoadDataSources(nsIDocument* doc) // check for magical attributes. XXX move to ``flags''? nsAutoString coalesce; mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::coalesceduplicatearcs, coalesce); - if (coalesce == NS_LITERAL_STRING("false")) + if (coalesce.EqualsLiteral("false")) mDB->SetCoalesceDuplicateArcs(PR_FALSE); nsAutoString allowneg; mRoot->GetAttr(kNameSpaceID_None, nsXULAtoms::allownegativeassertions, allowneg); - if (allowneg == NS_LITERAL_STRING("false")) + if (allowneg.EqualsLiteral("false")) mDB->SetAllowNegativeAssertions(PR_FALSE); // Grab the doc's principal... @@ -737,7 +737,7 @@ nsXULTemplateBuilder::LoadDataSources(nsIDocument* doc) first = last + 1; // A special 'dummy' datasource - if (uriStr == NS_LITERAL_STRING("rdf:null")) + if (uriStr.EqualsLiteral("rdf:null")) continue; // N.B. that `failure' (e.g., because it's an unknown @@ -997,7 +997,7 @@ nsXULTemplateBuilder::SubstituteText(nsTemplateMatch& aMatch, nsAString& aResult) { // See if it's the special value "..." - if (aAttributeValue == NS_LITERAL_STRING("...")) { + if (aAttributeValue.EqualsLiteral("...")) { Value memberval; aMatch.GetAssignmentFor(mConflictSet, mMemberVar, &memberval); @@ -1048,7 +1048,7 @@ nsXULTemplateBuilder::SubstituteTextReplaceVariable(nsXULTemplateBuilder* aThis, // The symbol "rdf:*" is special, and means "this guy's URI" PRInt32 var = 0; - if (aVariable == NS_LITERAL_STRING("rdf:*")) + if (aVariable.EqualsLiteral("rdf:*")) var = c->match.mRule->GetMemberVariable(); else var = aThis->mRules.LookupSymbol(PromiseFlatString(aVariable).get()); @@ -2074,10 +2074,10 @@ nsXULTemplateBuilder::CompileSimpleRule(nsIContent* aRuleElement, if (NS_FAILED(rv)) return rv; if (rv == NS_CONTENT_ATTR_HAS_VALUE) { - if (value.Equals(NS_LITERAL_STRING("true"))) { + if (value.EqualsLiteral("true")) { iscontainer = nsRDFConInstanceTestNode::eTrue; } - else if (value.Equals(NS_LITERAL_STRING("false"))) { + else if (value.EqualsLiteral("false")) { iscontainer = nsRDFConInstanceTestNode::eFalse; } } @@ -2089,10 +2089,10 @@ nsXULTemplateBuilder::CompileSimpleRule(nsIContent* aRuleElement, if (NS_FAILED(rv)) return rv; if (rv == NS_CONTENT_ATTR_HAS_VALUE) { - if (value.Equals(NS_LITERAL_STRING("true"))) { + if (value.EqualsLiteral("true")) { isempty = nsRDFConInstanceTestNode::eTrue; } - else if (value.Equals(NS_LITERAL_STRING("false"))) { + else if (value.EqualsLiteral("false")) { isempty = nsRDFConInstanceTestNode::eFalse; } } @@ -2129,7 +2129,7 @@ nsXULTemplateBuilder::CompileSimpleRule(nsIContent* aRuleElement, if (aRuleElement->HasAttr(kNameSpaceID_None, nsXULAtoms::parsetype)) { nsAutoString parseType; aRuleElement->GetAttr(kNameSpaceID_None, nsXULAtoms::parsetype, parseType); - if (parseType.Equals(NS_LITERAL_STRING("Integer"))) { + if (parseType.EqualsLiteral("Integer")) { nsCOMPtr intLiteral; PRInt32 errorCode = nsnull; rv = gRDFService->GetIntLiteral(value.ToInteger(&errorCode), getter_AddRefs(intLiteral)); diff --git a/mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp b/mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp index 2694c60a0fc..39793238a30 100644 --- a/mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp +++ b/mozilla/content/xul/templates/src/nsXULTreeBuilder.cpp @@ -418,7 +418,7 @@ nsXULTreeBuilder::Sort(nsIDOMElement* aElement) nsAutoString sortLocked; header->GetAttr(kNameSpaceID_None, nsXULAtoms::sortLocked, sortLocked); - if (sortLocked.Equals(NS_LITERAL_STRING("true"))) + if (sortLocked.EqualsLiteral("true")) return NS_OK; nsAutoString sort; @@ -434,11 +434,11 @@ nsXULTreeBuilder::Sort(nsIDOMElement* aElement) nsAutoString dir; header->GetAttr(kNameSpaceID_None, nsXULAtoms::sortDirection, dir); - if (dir == NS_LITERAL_STRING("ascending")) { + if (dir.EqualsLiteral("ascending")) { dir = NS_LITERAL_STRING("descending"); mSortDirection = eDirection_Descending; } - else if (dir == NS_LITERAL_STRING("descending")) { + else if (dir.EqualsLiteral("descending")) { dir = NS_LITERAL_STRING("natural"); mSortDirection = eDirection_Natural; } @@ -720,9 +720,9 @@ nsXULTreeBuilder::GetProgressMode(PRInt32 aRow, nsITreeColumn* aCol, PRInt32* aR nsAutoString mode; SubstituteText(*(mRows[aRow]->mMatch), raw, mode); - if (mode.Equals(NS_LITERAL_STRING("normal"))) + if (mode.EqualsLiteral("normal")) *aResult = nsITreeView::PROGRESS_NORMAL; - else if (mode.Equals(NS_LITERAL_STRING("undetermined"))) + else if (mode.EqualsLiteral("undetermined")) *aResult = nsITreeView::PROGRESS_UNDETERMINED; } @@ -967,7 +967,7 @@ nsXULTreeBuilder::IsEditable(PRInt32 aRow, nsITreeColumn* aCol, PRBool* _retval) nsAutoString editable; SubstituteText(*(mRows[aRow]->mMatch), raw, editable); - if (editable.Equals(NS_LITERAL_STRING("false"))) + if (editable.EqualsLiteral("false")) *_retval = PR_FALSE; } @@ -1253,7 +1253,7 @@ nsXULTreeBuilder::EnsureSortVariables() if (ni && ni->Equals(nsXULAtoms::treecol, kNameSpaceID_XUL)) { nsAutoString sortActive; child->GetAttr(kNameSpaceID_None, nsXULAtoms::sortActive, sortActive); - if (sortActive == NS_LITERAL_STRING("true")) { + if (sortActive.EqualsLiteral("true")) { nsAutoString sort; child->GetAttr(kNameSpaceID_None, nsXULAtoms::sort, sort); if (!sort.IsEmpty()) { @@ -1261,9 +1261,9 @@ nsXULTreeBuilder::EnsureSortVariables() nsAutoString sortDirection; child->GetAttr(kNameSpaceID_None, nsXULAtoms::sortDirection, sortDirection); - if (sortDirection == NS_LITERAL_STRING("ascending")) + if (sortDirection.EqualsLiteral("ascending")) mSortDirection = eDirection_Ascending; - else if (sortDirection == NS_LITERAL_STRING("descending")) + else if (sortDirection.EqualsLiteral("descending")) mSortDirection = eDirection_Descending; else mSortDirection = eDirection_Natural; diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp index 8afc4115d8c..2b4797c1e33 100644 --- a/mozilla/docshell/base/nsDocShell.cpp +++ b/mozilla/docshell/base/nsDocShell.cpp @@ -1041,7 +1041,7 @@ nsresult nsDocShell::FindTarget(const PRUnichar *aWindowTarget, } // _main is an IE target which should be case-insensitive but isn't // see bug 217886 for details - else if(name.EqualsIgnoreCase("_content") || name.Equals(NS_LITERAL_STRING("_main"))) + else if(name.EqualsIgnoreCase("_content") || name.EqualsLiteral("_main")) { if (mTreeOwner) { mTreeOwner->FindItemWithName(name.get(), nsnull, @@ -5052,7 +5052,7 @@ nsDocShell::InternalLoad(nsIURI * aURI, // _main is an IE target which should be case-insensitive but isn't // see bug 217886 for details if (!bIsJavascript && - (name.EqualsIgnoreCase("_content") || name.Equals(NS_LITERAL_STRING("_main")) || + (name.EqualsIgnoreCase("_content") || name.EqualsLiteral("_main") || name.EqualsIgnoreCase("_blank"))) { nsCOMPtr extProtService; @@ -5098,7 +5098,7 @@ nsDocShell::InternalLoad(nsIURI * aURI, else if (!name.EqualsIgnoreCase("_parent") && !name.EqualsIgnoreCase("_self") && !name.EqualsIgnoreCase("_content") && - !name.Equals(NS_LITERAL_STRING("_main"))) { + !name.EqualsLiteral("_main")) { nsCOMPtr targetTreeItem; FindItemWithName(name.get(), NS_STATIC_CAST(nsIInterfaceRequestor *, this), diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index ebda7a1bc0c..a3d628840b8 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -558,7 +558,7 @@ GlobalWindowImpl::SetNewDocument(nsIDOMDocument* aDocument, nsCAutoString url; docURL->GetSpec(url); - PRBool isAboutBlank = url.Equals(NS_LITERAL_CSTRING("about:blank")); + PRBool isAboutBlank = url.EqualsLiteral("about:blank"); PRBool isSameOrigin = PR_FALSE; if (isAboutBlank && mOpenerScriptURL) { @@ -3105,7 +3105,7 @@ PRBool GlobalWindowImpl::CheckOpenAllow(PRUint32 aAbuseLevel, if (name.EqualsIgnoreCase("_top") || name.EqualsIgnoreCase("_self") || name.EqualsIgnoreCase("_content") || - name.Equals(NS_LITERAL_STRING("_main"))) + name.EqualsLiteral("_main")) allowWindow = PR_TRUE; else { nsCOMPtr wwatch = diff --git a/mozilla/dom/src/events/nsJSEventListener.cpp b/mozilla/dom/src/events/nsJSEventListener.cpp index 90c6704db6b..be0c51a6e90 100644 --- a/mozilla/dom/src/events/nsJSEventListener.cpp +++ b/mozilla/dom/src/events/nsJSEventListener.cpp @@ -99,8 +99,8 @@ nsJSEventListener::HandleEvent(nsIDOMEvent* aEvent) return NS_OK; } //if (mReturnResult == nsReturnResult_eNotSet) { - if (eventString.Equals(NS_LITERAL_STRING("error")) || - eventString.Equals(NS_LITERAL_STRING("mouseover"))) { + if (eventString.EqualsLiteral("error") || + eventString.EqualsLiteral("mouseover")) { mReturnResult = nsReturnResult_eReverseReturnResult; } else { @@ -138,7 +138,7 @@ nsJSEventListener::HandleEvent(nsIDOMEvent* aEvent) } PRBool handledScriptError = PR_FALSE; - if (eventString.Equals(NS_LITERAL_STRING("onerror"))) { + if (eventString.EqualsLiteral("onerror")) { nsCOMPtr priv(do_QueryInterface(aEvent)); NS_ENSURE_TRUE(priv, NS_ERROR_UNEXPECTED); @@ -178,7 +178,7 @@ nsJSEventListener::HandleEvent(nsIDOMEvent* aEvent) } if (NS_SUCCEEDED(rv)) { - if (eventString.Equals(NS_LITERAL_STRING("onbeforeunload"))) { + if (eventString.EqualsLiteral("onbeforeunload")) { nsCOMPtr priv(do_QueryInterface(aEvent)); NS_ENSURE_TRUE(priv, NS_ERROR_UNEXPECTED); diff --git a/mozilla/editor/composer/src/nsComposerCommands.cpp b/mozilla/editor/composer/src/nsComposerCommands.cpp index 0b5dd6a4bb5..f3978cc7545 100644 --- a/mozilla/editor/composer/src/nsComposerCommands.cpp +++ b/mozilla/editor/composer/src/nsComposerCommands.cpp @@ -259,8 +259,8 @@ nsStyleUpdatingCommand::ToggleState(nsIEditor *aEditor, const char* aTagName) // they are used to remove named anchor/link and shouldn't be used for insertion nsAutoString tagName; tagName.AssignWithConversion(aTagName); PRBool doTagRemoval; - if (tagName.Equals(NS_LITERAL_STRING("href")) || - tagName.Equals(NS_LITERAL_STRING("name"))) + if (tagName.EqualsLiteral("href") || + tagName.EqualsLiteral("name")) doTagRemoval = PR_TRUE; else { @@ -281,12 +281,12 @@ nsStyleUpdatingCommand::ToggleState(nsIEditor *aEditor, const char* aTagName) nsAutoString removeName; aEditor->BeginTransaction(); - if (tagName.Equals(NS_LITERAL_STRING("sub"))) + if (tagName.EqualsLiteral("sub")) { removeName.AssignWithConversion("sup"); rv = RemoveTextProperty(aEditor,tagName.get(), nsnull); } - else if (tagName.Equals(NS_LITERAL_STRING("sup"))) + else if (tagName.EqualsLiteral("sup")) { removeName.AssignWithConversion("sub"); rv = RemoveTextProperty(aEditor, tagName.get(), nsnull); @@ -765,7 +765,7 @@ nsFontFaceStateCommand::SetState(nsIEditor *aEditor, nsString& newState) nsCOMPtr ttAtom = do_GetAtom("tt"); nsCOMPtr fontAtom = do_GetAtom("font"); - if (newState.Equals(NS_LITERAL_STRING("tt"))) + if (newState.EqualsLiteral("tt")) { // The old "teletype" attribute rv = htmlEditor->SetInlineProperty(ttAtom, EmptyString(), @@ -778,7 +778,7 @@ nsFontFaceStateCommand::SetState(nsIEditor *aEditor, nsString& newState) // Remove any existing TT nodes rv = htmlEditor->RemoveInlineProperty(ttAtom, EmptyString()); - if (newState.IsEmpty() || newState.Equals(NS_LITERAL_STRING("normal"))) { + if (newState.IsEmpty() || newState.EqualsLiteral("normal")) { rv = htmlEditor->RemoveInlineProperty(fontAtom, NS_LITERAL_STRING("face")); } else { rv = htmlEditor->SetInlineProperty(fontAtom, NS_LITERAL_STRING("face"), @@ -847,8 +847,8 @@ nsFontSizeStateCommand::SetState(nsIEditor *aEditor, nsString& newState) nsresult rv; nsCOMPtr fontAtom = do_GetAtom("font"); if (newState.IsEmpty() || - newState.Equals(NS_LITERAL_STRING("normal")) || - newState.Equals(NS_LITERAL_STRING("medium"))) { + newState.EqualsLiteral("normal") || + newState.EqualsLiteral("medium")) { // remove any existing font size, big or small rv = htmlEditor->RemoveInlineProperty(fontAtom, NS_LITERAL_STRING("size")); if (NS_FAILED(rv)) return rv; @@ -909,7 +909,7 @@ nsFontColorStateCommand::SetState(nsIEditor *aEditor, nsString& newState) nsresult rv; nsCOMPtr fontAtom = do_GetAtom("font"); - if (newState.IsEmpty() || newState.Equals(NS_LITERAL_STRING("normal"))) { + if (newState.IsEmpty() || newState.EqualsLiteral("normal")) { rv = htmlEditor->RemoveInlineProperty(fontAtom, NS_LITERAL_STRING("color")); } else { rv = htmlEditor->SetInlineProperty(fontAtom, NS_LITERAL_STRING("color"), @@ -959,7 +959,7 @@ nsHighlightColorStateCommand::SetState(nsIEditor *aEditor, nsString& newState) nsresult rv; nsCOMPtr fontAtom = do_GetAtom("font"); - if (newState.IsEmpty() || newState.Equals(NS_LITERAL_STRING("normal"))) { + if (newState.IsEmpty() || newState.EqualsLiteral("normal")) { // rv = RemoveOneProperty(htmlEditor, NS_LITERAL_STRING("font"), NS_LITERAL_STRING("bgcolor")); rv = htmlEditor->RemoveInlineProperty(fontAtom, NS_LITERAL_STRING("bgcolor")); } else { @@ -1676,7 +1676,7 @@ RemoveTextProperty(nsIEditor *aEditor, const PRUnichar *prop, nsAutoString allStr(prop); ToLowerCase(allStr); - PRBool doingAll = (allStr.Equals(NS_LITERAL_STRING("all"))); + PRBool doingAll = (allStr.EqualsLiteral("all")); nsresult err = NS_OK; if (doingAll) diff --git a/mozilla/editor/composer/src/nsComposerCommandsUpdater.cpp b/mozilla/editor/composer/src/nsComposerCommandsUpdater.cpp index 96b1709d961..f7c642078e9 100644 --- a/mozilla/editor/composer/src/nsComposerCommandsUpdater.cpp +++ b/mozilla/editor/composer/src/nsComposerCommandsUpdater.cpp @@ -311,13 +311,13 @@ nsComposerCommandsUpdater::UpdateCommandGroup(const nsAString& aCommandGroup) // This hardcoded list of commands is temporary. // This code should use nsIControllerCommandGroup. - if (aCommandGroup.Equals(NS_LITERAL_STRING("undo"))) + if (aCommandGroup.EqualsLiteral("undo")) { commandUpdater->CommandStatusChanged("cmd_undo"); commandUpdater->CommandStatusChanged("cmd_redo"); } - else if (aCommandGroup.Equals(NS_LITERAL_STRING("select")) || - aCommandGroup.Equals(NS_LITERAL_STRING("style"))) + else if (aCommandGroup.EqualsLiteral("select") || + aCommandGroup.EqualsLiteral("style")) { commandUpdater->CommandStatusChanged("cmd_bold"); commandUpdater->CommandStatusChanged("cmd_italic"); @@ -347,7 +347,7 @@ nsComposerCommandsUpdater::UpdateCommandGroup(const nsAString& aCommandGroup) commandUpdater->CommandStatusChanged("cmd_backgroundColor"); commandUpdater->CommandStatusChanged("cmd_highlight"); } - else if (aCommandGroup.Equals(NS_LITERAL_STRING("save"))) + else if (aCommandGroup.EqualsLiteral("save")) { // save commands (most are not in C++) commandUpdater->CommandStatusChanged("cmd_setDocumentModified"); diff --git a/mozilla/editor/composer/src/nsEditingSession.cpp b/mozilla/editor/composer/src/nsEditingSession.cpp index 197c2bdaaad..ede0bf96f4b 100644 --- a/mozilla/editor/composer/src/nsEditingSession.cpp +++ b/mozilla/editor/composer/src/nsEditingSession.cpp @@ -319,7 +319,7 @@ nsEditingSession::SetupEditorOnWindow(nsIDOMWindow *aWindow) mEditorType = NS_LITERAL_CSTRING("text"); mimeCType = "text/plain"; } - else if (!mimeCType.Equals(NS_LITERAL_CSTRING("text/html"))) + else if (!mimeCType.EqualsLiteral("text/html")) { // Neither an acceptable text or html type. mEditorStatus = eEditorErrorCantEditMimeType; @@ -333,20 +333,20 @@ nsEditingSession::SetupEditorOnWindow(nsIDOMWindow *aWindow) PRBool needHTMLController = PR_FALSE; const char *classString = "@mozilla.org/editor/htmleditor;1"; - if (mEditorType.Equals(NS_LITERAL_CSTRING("textmail"))) + if (mEditorType.EqualsLiteral("textmail")) { mEditorFlags = nsIPlaintextEditor::eEditorPlaintextMask | nsIPlaintextEditor::eEditorEnableWrapHackMask | nsIPlaintextEditor::eEditorMailMask; } - else if (mEditorType.Equals(NS_LITERAL_CSTRING("text"))) + else if (mEditorType.EqualsLiteral("text")) { mEditorFlags = nsIPlaintextEditor::eEditorPlaintextMask | nsIPlaintextEditor::eEditorEnableWrapHackMask; } - else if (mEditorType.Equals(NS_LITERAL_CSTRING("htmlmail"))) + else if (mEditorType.EqualsLiteral("htmlmail")) { - if (mimeCType.Equals(NS_LITERAL_CSTRING("text/html"))) + if (mimeCType.EqualsLiteral("text/html")) { needHTMLController = PR_TRUE; mEditorFlags = nsIPlaintextEditor::eEditorMailMask; diff --git a/mozilla/editor/libeditor/html/nsHTMLAbsPosition.cpp b/mozilla/editor/libeditor/html/nsHTMLAbsPosition.cpp index 58d644e2281..a38cb13ea1f 100644 --- a/mozilla/editor/libeditor/html/nsHTMLAbsPosition.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLAbsPosition.cpp @@ -111,7 +111,7 @@ nsHTMLEditor::GetAbsolutelyPositionedSelectionContainer(nsIDOMElement **_retval) res = mHTMLCSSUtils->GetComputedProperty(node, nsEditProperty::cssPosition, positionStr); if (NS_FAILED(res)) return res; - if (positionStr.Equals(NS_LITERAL_STRING("absolute"))) + if (positionStr.EqualsLiteral("absolute")) resultNode = node; else { nsCOMPtr parentNode; @@ -222,7 +222,7 @@ nsHTMLEditor::GetElementZIndex(nsIDOMElement * aElement, nsEditProperty::cssZIndex, zIndexStr); if (NS_FAILED(res)) return res; - if (zIndexStr.Equals(NS_LITERAL_STRING("auto"))) { + if (zIndexStr.EqualsLiteral("auto")) { // we have to look at the positioned ancestors // cf. CSS 2 spec section 9.9.1 nsCOMPtr parentNode; @@ -231,13 +231,13 @@ nsHTMLEditor::GetElementZIndex(nsIDOMElement * aElement, nsCOMPtr node = parentNode; nsAutoString positionStr; while (node && - zIndexStr.Equals(NS_LITERAL_STRING("auto")) && + zIndexStr.EqualsLiteral("auto") && !nsTextEditUtils::IsBody(node)) { res = mHTMLCSSUtils->GetComputedProperty(node, nsEditProperty::cssPosition, positionStr); if (NS_FAILED(res)) return res; - if (positionStr.Equals(NS_LITERAL_STRING("absolute"))) { + if (positionStr.EqualsLiteral("absolute")) { // ah, we found one, what's its z-index ? If its z-index is auto, // we have to continue climbing the document's tree res = mHTMLCSSUtils->GetComputedProperty(node, @@ -251,7 +251,7 @@ nsHTMLEditor::GetElementZIndex(nsIDOMElement * aElement, } } - if (!zIndexStr.Equals(NS_LITERAL_STRING("auto"))) { + if (!zIndexStr.EqualsLiteral("auto")) { PRInt32 errorCode; *aZindex = zIndexStr.ToInteger(&errorCode); } @@ -524,7 +524,7 @@ nsHTMLEditor::AbsolutelyPositionElement(nsIDOMElement * aElement, nsAutoString positionStr; mHTMLCSSUtils->GetComputedProperty(aElement, nsEditProperty::cssPosition, positionStr); - PRBool isPositioned = (positionStr.Equals(NS_LITERAL_STRING("absolute"))); + PRBool isPositioned = (positionStr.EqualsLiteral("absolute")); // nothing to do if the element is already in the state we want if (isPositioned == aEnabled) @@ -681,14 +681,14 @@ nsHTMLEditor::CheckPositionedElementBGandFG(nsIDOMElement * aElement, nsEditProperty::cssBackgroundImage, bgImageStr); if (NS_FAILED(res)) return res; - if (bgImageStr.Equals(NS_LITERAL_STRING("none"))) { + if (bgImageStr.EqualsLiteral("none")) { nsAutoString bgColorStr; res = mHTMLCSSUtils->GetComputedProperty(aElement, nsEditProperty::cssBackgroundColor, bgColorStr); if (NS_FAILED(res)) return res; - if (bgColorStr.Equals(NS_LITERAL_STRING("transparent"))) { + if (bgColorStr.EqualsLiteral("transparent")) { nsCOMPtr viewCSS; res = mHTMLCSSUtils->GetDefaultViewCSS(aElement, getter_AddRefs(viewCSS)); diff --git a/mozilla/editor/libeditor/html/nsHTMLAnonymousUtils.cpp b/mozilla/editor/libeditor/html/nsHTMLAnonymousUtils.cpp index 65be407620d..7c19b89030c 100644 --- a/mozilla/editor/libeditor/html/nsHTMLAnonymousUtils.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLAnonymousUtils.cpp @@ -87,11 +87,11 @@ static PRInt32 GetCSSFloatValue(nsIDOMCSSStyleDeclaration * aDecl, // numeric values nsAutoString str; res = val->GetStringValue(str); - if (str.Equals(NS_LITERAL_STRING("thin"))) + if (str.EqualsLiteral("thin")) f = 1; - if (str.Equals(NS_LITERAL_STRING("medium"))) + if (str.EqualsLiteral("medium")) f = 3; - if (str.Equals(NS_LITERAL_STRING("thick"))) + if (str.EqualsLiteral("thick")) f = 5; break; } @@ -332,7 +332,7 @@ nsHTMLEditor::GetPositionAndDimensions(nsIDOMElement * aElement, nsAutoString positionStr; mHTMLCSSUtils->GetComputedProperty(aElement, nsEditProperty::cssPosition, positionStr); - isPositioned = positionStr.Equals(NS_LITERAL_STRING("absolute")); + isPositioned = positionStr.EqualsLiteral("absolute"); } if (isPositioned) { diff --git a/mozilla/editor/libeditor/html/nsHTMLCSSUtils.cpp b/mozilla/editor/libeditor/html/nsHTMLCSSUtils.cpp index dfcee51dc88..d7d54e7d222 100644 --- a/mozilla/editor/libeditor/html/nsHTMLCSSUtils.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLCSSUtils.cpp @@ -62,7 +62,7 @@ void ProcessBValue(const nsAString * aInputString, nsAString & aOutputString, const char * aDefaultValueString, const char * aPrependString, const char* aAppendString) { - if (aInputString && aInputString->Equals(NS_LITERAL_STRING("-moz-editor-invert-value"))) { + if (aInputString && aInputString->EqualsLiteral("-moz-editor-invert-value")) { aOutputString.Assign(NS_LITERAL_STRING("normal")); } else { @@ -128,24 +128,24 @@ void ProcessListStyleTypeValue(const nsAString * aInputString, nsAString & aOutp { aOutputString.Truncate(); if (aInputString) { - if (aInputString->Equals(NS_LITERAL_STRING("1"))) { + if (aInputString->EqualsLiteral("1")) { aOutputString.Append(NS_LITERAL_STRING("decimal")); } - else if (aInputString->Equals(NS_LITERAL_STRING("a"))) { + else if (aInputString->EqualsLiteral("a")) { aOutputString.Append(NS_LITERAL_STRING("lower-alpha")); } - else if (aInputString->Equals(NS_LITERAL_STRING("A"))) { + else if (aInputString->EqualsLiteral("A")) { aOutputString.Append(NS_LITERAL_STRING("upper-alpha")); } - else if (aInputString->Equals(NS_LITERAL_STRING("i"))) { + else if (aInputString->EqualsLiteral("i")) { aOutputString.Append(NS_LITERAL_STRING("lower-roman")); } - else if (aInputString->Equals(NS_LITERAL_STRING("I"))) { + else if (aInputString->EqualsLiteral("I")) { aOutputString.Append(NS_LITERAL_STRING("upper-roman")); } - else if (aInputString->Equals(NS_LITERAL_STRING("square")) - || aInputString->Equals(NS_LITERAL_STRING("circle")) - || aInputString->Equals(NS_LITERAL_STRING("disc"))) { + else if (aInputString->EqualsLiteral("square") + || aInputString->EqualsLiteral("circle") + || aInputString->EqualsLiteral("disc")) { aOutputString.Append(*aInputString); } } @@ -158,12 +158,12 @@ void ProcessMarginLeftValue(const nsAString * aInputString, nsAString & aOutputS { aOutputString.Truncate(); if (aInputString) { - if (aInputString->Equals(NS_LITERAL_STRING("center")) || - aInputString->Equals(NS_LITERAL_STRING("-moz-center"))) { + if (aInputString->EqualsLiteral("center") || + aInputString->EqualsLiteral("-moz-center")) { aOutputString.Append(NS_LITERAL_STRING("auto")); } - else if (aInputString->Equals(NS_LITERAL_STRING("right")) || - aInputString->Equals(NS_LITERAL_STRING("-moz-right"))) { + else if (aInputString->EqualsLiteral("right") || + aInputString->EqualsLiteral("-moz-right")) { aOutputString.Append(NS_LITERAL_STRING("auto")); } else { @@ -179,12 +179,12 @@ void ProcessMarginRightValue(const nsAString * aInputString, nsAString & aOutput { aOutputString.Truncate(); if (aInputString) { - if (aInputString->Equals(NS_LITERAL_STRING("center")) || - aInputString->Equals(NS_LITERAL_STRING("-moz-center"))) { + if (aInputString->EqualsLiteral("center") || + aInputString->EqualsLiteral("-moz-center")) { aOutputString.Append(NS_LITERAL_STRING("auto")); } - else if (aInputString->Equals(NS_LITERAL_STRING("left")) || - aInputString->Equals(NS_LITERAL_STRING("-moz-left"))) { + else if (aInputString->EqualsLiteral("left") || + aInputString->EqualsLiteral("-moz-left")) { aOutputString.Append(NS_LITERAL_STRING("auto")); } else { @@ -349,13 +349,13 @@ nsHTMLCSSUtils::IsCSSEditableProperty(nsIDOMNode * aNode, || nsEditProperty::u == aProperty || nsEditProperty::strike == aProperty || ((nsEditProperty::font == aProperty) && aAttribute && - (aAttribute->Equals(NS_LITERAL_STRING("color")) || - aAttribute->Equals(NS_LITERAL_STRING("face"))))) { + (aAttribute->EqualsLiteral("color") || + aAttribute->EqualsLiteral("face")))) { return PR_TRUE; } // ALIGN attribute on elements supporting it - if (aAttribute && (aAttribute->Equals(NS_LITERAL_STRING("align"))) && + if (aAttribute && (aAttribute->EqualsLiteral("align")) && (nsEditProperty::div == tagName || nsEditProperty::p == tagName || nsEditProperty::h1 == tagName @@ -377,7 +377,7 @@ nsHTMLCSSUtils::IsCSSEditableProperty(nsIDOMNode * aNode, return PR_TRUE; } - if (aAttribute && (aAttribute->Equals(NS_LITERAL_STRING("valign"))) && + if (aAttribute && (aAttribute->EqualsLiteral("valign")) && (nsEditProperty::col == tagName || nsEditProperty::colgroup == tagName || nsEditProperty::tbody == tagName @@ -391,37 +391,37 @@ nsHTMLCSSUtils::IsCSSEditableProperty(nsIDOMNode * aNode, // attributes TEXT, BACKGROUND and BGCOLOR on BODY if (aAttribute && (nsEditProperty::body == tagName) && - (aAttribute->Equals(NS_LITERAL_STRING("text")) - || aAttribute->Equals(NS_LITERAL_STRING("background")) - || aAttribute->Equals(NS_LITERAL_STRING("bgcolor")))) { + (aAttribute->EqualsLiteral("text") + || aAttribute->EqualsLiteral("background") + || aAttribute->EqualsLiteral("bgcolor"))) { return PR_TRUE; } // attribute BGCOLOR on other elements - if (aAttribute && aAttribute->Equals(NS_LITERAL_STRING("bgcolor"))) { + if (aAttribute && aAttribute->EqualsLiteral("bgcolor")) { return PR_TRUE; } // attributes HEIGHT, WIDTH and NOWRAP on TD and TH if (aAttribute && ((nsEditProperty::td == tagName) || (nsEditProperty::th == tagName)) && - (aAttribute->Equals(NS_LITERAL_STRING("height")) - || aAttribute->Equals(NS_LITERAL_STRING("width")) - || aAttribute->Equals(NS_LITERAL_STRING("nowrap")))) { + (aAttribute->EqualsLiteral("height") + || aAttribute->EqualsLiteral("width") + || aAttribute->EqualsLiteral("nowrap"))) { return PR_TRUE; } // attributes HEIGHT and WIDTH on TABLE if (aAttribute && (nsEditProperty::table == tagName) && - (aAttribute->Equals(NS_LITERAL_STRING("height")) - || aAttribute->Equals(NS_LITERAL_STRING("width")))) { + (aAttribute->EqualsLiteral("height") + || aAttribute->EqualsLiteral("width"))) { return PR_TRUE; } // attributes SIZE and WIDTH on HR if (aAttribute && (nsEditProperty::hr == tagName) && - (aAttribute->Equals(NS_LITERAL_STRING("size")) - || aAttribute->Equals(NS_LITERAL_STRING("width")))) { + (aAttribute->EqualsLiteral("size") + || aAttribute->EqualsLiteral("width"))) { return PR_TRUE; } @@ -429,20 +429,20 @@ nsHTMLCSSUtils::IsCSSEditableProperty(nsIDOMNode * aNode, if (aAttribute && (nsEditProperty::ol == tagName || nsEditProperty::ul == tagName || nsEditProperty::li == tagName) && - aAttribute->Equals(NS_LITERAL_STRING("type"))) { + aAttribute->EqualsLiteral("type")) { return PR_TRUE; } if (aAttribute && nsEditProperty::img == tagName && - (aAttribute->Equals(NS_LITERAL_STRING("border")) - || aAttribute->Equals(NS_LITERAL_STRING("width")) - || aAttribute->Equals(NS_LITERAL_STRING("height")))) { + (aAttribute->EqualsLiteral("border") + || aAttribute->EqualsLiteral("width") + || aAttribute->EqualsLiteral("height"))) { return PR_TRUE; } // other elements that we can align using CSS even if they // can't carry the html ALIGN attribute - if (aAttribute && aAttribute->Equals(NS_LITERAL_STRING("align")) && + if (aAttribute && aAttribute->EqualsLiteral("align") && (nsEditProperty::ul == tagName || nsEditProperty::ol == tagName || nsEditProperty::dl == tagName @@ -665,7 +665,7 @@ nsHTMLCSSUtils::RemoveCSSInlineStyle(nsIDOMNode *aNode, nsIAtom *aProperty, cons if (NS_FAILED(res)) return res; nsAutoString attrString, tmp; attrName->ToString(attrString); - if (attrString.Equals(NS_LITERAL_STRING("_moz_dirty"))) { + if (attrString.EqualsLiteral("_moz_dirty")) { res = mHTMLEditor->RemoveContainer(aNode); if (NS_FAILED(res)) return res; } @@ -931,26 +931,26 @@ nsHTMLCSSUtils::GenerateCSSDeclarationsFromHTMLStyle(nsIDOMNode * aNode, } else if (aAttribute) { if (nsEditProperty::font == aHTMLProperty && - aAttribute->Equals(NS_LITERAL_STRING("color"))) { + aAttribute->EqualsLiteral("color")) { BuildCSSDeclarations(cssPropertyArray, cssValueArray, fontColorEquivTable, aValue, aGetOrRemoveRequest); } else if (nsEditProperty::font == aHTMLProperty && - aAttribute->Equals(NS_LITERAL_STRING("face"))) { + aAttribute->EqualsLiteral("face")) { BuildCSSDeclarations(cssPropertyArray, cssValueArray, fontFaceEquivTable, aValue, aGetOrRemoveRequest); } - else if (aAttribute->Equals(NS_LITERAL_STRING("bgcolor"))) { + else if (aAttribute->EqualsLiteral("bgcolor")) { BuildCSSDeclarations(cssPropertyArray, cssValueArray, bgcolorEquivTable, aValue, aGetOrRemoveRequest); } - else if (aAttribute->Equals(NS_LITERAL_STRING("background"))) { + else if (aAttribute->EqualsLiteral("background")) { BuildCSSDeclarations(cssPropertyArray, cssValueArray, backgroundImageEquivTable, aValue, aGetOrRemoveRequest); } - else if (aAttribute->Equals(NS_LITERAL_STRING("text"))) { + else if (aAttribute->EqualsLiteral("text")) { BuildCSSDeclarations(cssPropertyArray, cssValueArray, textColorEquivTable, aValue, aGetOrRemoveRequest); } - else if (aAttribute->Equals(NS_LITERAL_STRING("border"))) { + else if (aAttribute->EqualsLiteral("border")) { BuildCSSDeclarations(cssPropertyArray, cssValueArray, borderEquivTable, aValue, aGetOrRemoveRequest); } - else if (aAttribute->Equals(NS_LITERAL_STRING("align"))) { + else if (aAttribute->EqualsLiteral("align")) { if (nsEditProperty::table == tagName) { BuildCSSDeclarations(cssPropertyArray, cssValueArray, tableAlignEquivTable, aValue, aGetOrRemoveRequest); } @@ -965,20 +965,20 @@ nsHTMLCSSUtils::GenerateCSSDeclarationsFromHTMLStyle(nsIDOMNode * aNode, BuildCSSDeclarations(cssPropertyArray, cssValueArray, textAlignEquivTable, aValue, aGetOrRemoveRequest); } } - else if (aAttribute->Equals(NS_LITERAL_STRING("valign"))) { + else if (aAttribute->EqualsLiteral("valign")) { BuildCSSDeclarations(cssPropertyArray, cssValueArray, verticalAlignEquivTable, aValue, aGetOrRemoveRequest); } - else if (aAttribute->Equals(NS_LITERAL_STRING("nowrap"))) { + else if (aAttribute->EqualsLiteral("nowrap")) { BuildCSSDeclarations(cssPropertyArray, cssValueArray, nowrapEquivTable, aValue, aGetOrRemoveRequest); } - else if (aAttribute->Equals(NS_LITERAL_STRING("width"))) { + else if (aAttribute->EqualsLiteral("width")) { BuildCSSDeclarations(cssPropertyArray, cssValueArray, widthEquivTable, aValue, aGetOrRemoveRequest); } - else if (aAttribute->Equals(NS_LITERAL_STRING("height")) || - (nsEditProperty::hr == tagName && aAttribute->Equals(NS_LITERAL_STRING("size")))) { + else if (aAttribute->EqualsLiteral("height") || + (nsEditProperty::hr == tagName && aAttribute->EqualsLiteral("size"))) { BuildCSSDeclarations(cssPropertyArray, cssValueArray, heightEquivTable, aValue, aGetOrRemoveRequest); } - else if (aAttribute->Equals(NS_LITERAL_STRING("type")) && + else if (aAttribute->EqualsLiteral("type") && (nsEditProperty::ol == tagName || nsEditProperty::ul == tagName || nsEditProperty::li == tagName)) { @@ -1159,10 +1159,10 @@ nsHTMLCSSUtils::IsCSSEquivalentToHTMLInlineStyleSet(nsIDOMNode * aNode, if (valueString.Equals(boldStr)) { aIsSet = PR_TRUE; } - else if (valueString.Equals(NS_LITERAL_STRING("normal"))) { + else if (valueString.EqualsLiteral("normal")) { aIsSet = PR_FALSE; } - else if (valueString.Equals(NS_LITERAL_STRING("bolder"))) { + else if (valueString.EqualsLiteral("bolder")) { aIsSet = PR_TRUE; valueString.Assign(boldStr); } @@ -1183,8 +1183,8 @@ nsHTMLCSSUtils::IsCSSEquivalentToHTMLInlineStyleSet(nsIDOMNode * aNode, } else if (nsEditProperty::i == aHTMLProperty) { - if (valueString.Equals(NS_LITERAL_STRING("italic")) || - valueString.Equals(NS_LITERAL_STRING("oblique"))) { + if (valueString.EqualsLiteral("italic") || + valueString.EqualsLiteral("oblique")) { aIsSet= PR_TRUE; } } @@ -1203,8 +1203,8 @@ nsHTMLCSSUtils::IsCSSEquivalentToHTMLInlineStyleSet(nsIDOMNode * aNode, else if (aHTMLAttribute && ( (nsEditProperty::font == aHTMLProperty && - aHTMLAttribute->Equals(NS_LITERAL_STRING("color"))) || - aHTMLAttribute->Equals(NS_LITERAL_STRING("bgcolor")))) { + aHTMLAttribute->EqualsLiteral("color")) || + aHTMLAttribute->EqualsLiteral("bgcolor"))) { if (htmlValueString.IsEmpty()) aIsSet = PR_TRUE; else { @@ -1244,7 +1244,7 @@ nsHTMLCSSUtils::IsCSSEquivalentToHTMLInlineStyleSet(nsIDOMNode * aNode, } else if ((nsEditProperty::font == aHTMLProperty) && aHTMLAttribute - && aHTMLAttribute->Equals(NS_LITERAL_STRING("face"))) { + && aHTMLAttribute->EqualsLiteral("face")) { if (!htmlValueString.IsEmpty()) { const PRUnichar commaSpace[] = { PRUnichar(','), PRUnichar(' '), 0 }; const PRUnichar comma[] = { PRUnichar(','), 0 }; @@ -1258,13 +1258,13 @@ nsHTMLCSSUtils::IsCSSEquivalentToHTMLInlineStyleSet(nsIDOMNode * aNode, // ignore this, it's TT or our default nsAutoString valueStringLower; ToLowerCase(valueString, valueStringLower); - aIsSet = !valueStringLower.Equals(NS_LITERAL_STRING("monospace")) && - !valueStringLower.Equals(NS_LITERAL_STRING("serif")); + aIsSet = !valueStringLower.EqualsLiteral("monospace") && + !valueStringLower.EqualsLiteral("serif"); } return NS_OK; } else if (aHTMLAttribute - && aHTMLAttribute->Equals(NS_LITERAL_STRING("align"))) { + && aHTMLAttribute->EqualsLiteral("align")) { aIsSet = PR_TRUE; } else { diff --git a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp index d596e4bec1f..0bb8836a705 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp @@ -851,21 +851,21 @@ nsHTMLEditRules::GetAlignment(PRBool *aMixed, nsIHTMLEditor::EAlignment *aAlign) &typeAttrName, value, COMPUTED_STYLE_TYPE); - if (value.Equals(NS_LITERAL_STRING("center")) || - value.Equals(NS_LITERAL_STRING("-moz-center")) || - value.Equals(NS_LITERAL_STRING("auto auto"))) + if (value.EqualsLiteral("center") || + value.EqualsLiteral("-moz-center") || + value.EqualsLiteral("auto auto")) { *aAlign = nsIHTMLEditor::eCenter; return NS_OK; } - if (value.Equals(NS_LITERAL_STRING("right")) || - value.Equals(NS_LITERAL_STRING("-moz-right")) || - value.Equals(NS_LITERAL_STRING("auto 0px"))) + if (value.EqualsLiteral("right") || + value.EqualsLiteral("-moz-right") || + value.EqualsLiteral("auto 0px")) { *aAlign = nsIHTMLEditor::eRight; return NS_OK; } - if (value.Equals(NS_LITERAL_STRING("justify"))) + if (value.EqualsLiteral("justify")) { *aAlign = nsIHTMLEditor::eJustify; return NS_OK; @@ -898,11 +898,11 @@ nsHTMLEditRules::GetAlignment(PRBool *aMixed, nsIHTMLEditor::EAlignment *aAlign) ToLowerCase(typeAttrVal); if (NS_SUCCEEDED(res) && typeAttrVal.Length()) { - if (typeAttrVal.Equals(NS_LITERAL_STRING("center"))) + if (typeAttrVal.EqualsLiteral("center")) *aAlign = nsIHTMLEditor::eCenter; - else if (typeAttrVal.Equals(NS_LITERAL_STRING("right"))) + else if (typeAttrVal.EqualsLiteral("right")) *aAlign = nsIHTMLEditor::eRight; - else if (typeAttrVal.Equals(NS_LITERAL_STRING("justify"))) + else if (typeAttrVal.EqualsLiteral("justify")) *aAlign = nsIHTMLEditor::eJustify; else *aAlign = nsIHTMLEditor::eLeft; @@ -1122,7 +1122,7 @@ nsHTMLEditRules::GetParagraphState(PRBool *aMixed, nsAString &outFormat) } // if this is the first node, we've found, remember it as the format - if (formatStr.Equals(NS_LITERAL_STRING("x"))) + if (formatStr.EqualsLiteral("x")) formatStr = format; // else make sure it matches previously found format else if (format != formatStr) @@ -3293,7 +3293,7 @@ nsHTMLEditRules::WillMakeBasicBlock(nsISelection *aSelection, // get selection location res = mHTMLEditor->GetStartNodeAndOffset(aSelection, address_of(parent), &offset); if (NS_FAILED(res)) return res; - if (tString.Equals(NS_LITERAL_STRING("normal")) || + if (tString.EqualsLiteral("normal") || tString.IsEmpty() ) // we are removing blocks (going to "body text") { nsCOMPtr curBlock = parent; @@ -3367,9 +3367,9 @@ nsHTMLEditRules::WillMakeBasicBlock(nsISelection *aSelection, // Ok, now go through all the nodes and make the right kind of blocks, // or whatever is approriate. Wohoo! // Note: blockquote is handled a little differently - if (tString.Equals(NS_LITERAL_STRING("blockquote"))) + if (tString.EqualsLiteral("blockquote")) res = MakeBlockquote(arrayOfNodes); - else if (tString.Equals(NS_LITERAL_STRING("normal")) || + else if (tString.EqualsLiteral("normal") || tString.IsEmpty() ) res = RemoveBlockStyle(arrayOfNodes); else @@ -6705,10 +6705,10 @@ nsHTMLEditRules::RemoveBlockStyle(nsCOMArray& arrayOfNodes) } else if (nsHTMLEditUtils::IsTable(curNode) || nsHTMLEditUtils::IsTableRow(curNode) || - (curNodeTag.Equals(NS_LITERAL_STRING("tbody"))) || - (curNodeTag.Equals(NS_LITERAL_STRING("td"))) || + (curNodeTag.EqualsLiteral("tbody")) || + (curNodeTag.EqualsLiteral("td")) || nsHTMLEditUtils::IsList(curNode) || - (curNodeTag.Equals(NS_LITERAL_STRING("li"))) || + (curNodeTag.EqualsLiteral("li")) || nsHTMLEditUtils::IsBlockquote(curNode) || nsHTMLEditUtils::IsDiv(curNode)) { @@ -6839,11 +6839,11 @@ nsHTMLEditRules::ApplyBlockStyle(nsCOMArray& arrayOfNodes, const nsA if (NS_FAILED(res)) return res; } else if (nsHTMLEditUtils::IsTable(curNode) || - (curNodeTag.Equals(NS_LITERAL_STRING("tbody"))) || - (curNodeTag.Equals(NS_LITERAL_STRING("tr"))) || - (curNodeTag.Equals(NS_LITERAL_STRING("td"))) || + (curNodeTag.EqualsLiteral("tbody")) || + (curNodeTag.EqualsLiteral("tr")) || + (curNodeTag.EqualsLiteral("td")) || nsHTMLEditUtils::IsList(curNode) || - (curNodeTag.Equals(NS_LITERAL_STRING("li"))) || + (curNodeTag.EqualsLiteral("li")) || nsHTMLEditUtils::IsBlockquote(curNode) || nsHTMLEditUtils::IsDiv(curNode)) { @@ -6872,7 +6872,7 @@ nsHTMLEditRules::ApplyBlockStyle(nsCOMArray& arrayOfNodes, const nsA } // if the node is a break, we honor it by putting further nodes in a new parent - else if (curNodeTag.Equals(NS_LITERAL_STRING("br"))) + else if (curNodeTag.EqualsLiteral("br")) { if (curBlock) { diff --git a/mozilla/editor/libeditor/html/nsHTMLEditUtils.cpp b/mozilla/editor/libeditor/html/nsHTMLEditUtils.cpp index 91aa0e79d3c..5d97611fa2f 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditUtils.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditUtils.cpp @@ -401,7 +401,7 @@ nsHTMLEditUtils::IsMailCite(nsIDOMNode *node) ToLowerCase(attrVal); if (NS_SUCCEEDED(res)) { - if (attrVal.Equals(NS_LITERAL_STRING("cite"))) + if (attrVal.EqualsLiteral("cite")) return PR_TRUE; } @@ -411,7 +411,7 @@ nsHTMLEditUtils::IsMailCite(nsIDOMNode *node) if (NS_SUCCEEDED(res)) { ToLowerCase(attrVal); - if (attrVal.Equals(NS_LITERAL_STRING("true"))) + if (attrVal.EqualsLiteral("true")) return PR_TRUE; } diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp index 6b6a52721b7..93acad338d7 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp @@ -2219,7 +2219,7 @@ nsHTMLEditor::SetParagraphFormat(const nsAString& aParagraphFormat) { nsAutoString tag; tag.Assign(aParagraphFormat); ToLowerCase(tag); - if (tag.Equals(NS_LITERAL_STRING("dd")) || tag.Equals(NS_LITERAL_STRING("dt"))) + if (tag.EqualsLiteral("dd") || tag.EqualsLiteral("dt")) return MakeDefinitionItem(tag); else return InsertBasicBlock(tag); @@ -2461,8 +2461,8 @@ nsHTMLEditor::GetCSSBackgroundColorState(PRBool *aMixed, nsAString &aOutColor, P htmlElement = do_QueryInterface(tmp); // look at parent if the queried color is transparent and if the node to // examine is not the root of the document - } while ( aOutColor.Equals(NS_LITERAL_STRING("transparent")) && htmlElement ); - if (!htmlElement && aOutColor.Equals(NS_LITERAL_STRING("transparent"))) { + } while ( aOutColor.EqualsLiteral("transparent") && htmlElement ); + if (!htmlElement && aOutColor.EqualsLiteral("transparent")) { // we have hit the root of the document and the color is still transparent ! // Grumble... Let's look at the default background color because that's the // color we are looking for @@ -2491,7 +2491,7 @@ nsHTMLEditor::GetCSSBackgroundColorState(PRBool *aMixed, nsAString &aOutColor, P // node to examine mHTMLCSSUtils->GetComputedProperty(nodeToExamine, nsEditProperty::cssBackgroundColor, aOutColor); - if (!aOutColor.Equals(NS_LITERAL_STRING("transparent"))) { + if (!aOutColor.EqualsLiteral("transparent")) { break; } } @@ -2499,7 +2499,7 @@ nsHTMLEditor::GetCSSBackgroundColorState(PRBool *aMixed, nsAString &aOutColor, P if (NS_FAILED(res)) return res; nodeToExamine = tmp; htmlElement = do_QueryInterface(tmp); - } while ( aOutColor.Equals(NS_LITERAL_STRING("transparent")) && htmlElement ); + } while ( aOutColor.EqualsLiteral("transparent") && htmlElement ); } return NS_OK; } @@ -2848,7 +2848,7 @@ nsHTMLEditor::Indent(const nsAString& aIndent) if (!node) res = NS_ERROR_FAILURE; if (NS_FAILED(res)) return res; - if (aIndent == NS_LITERAL_STRING("indent")) + if (aIndent.EqualsLiteral("indent")) { if (isCollapsed) { @@ -2966,8 +2966,8 @@ nsHTMLEditor::GetElementOrParentByTagName(const nsAString& aTagName, nsIDOMNode { TagName.Assign(NS_LITERAL_STRING("a")); } - PRBool findTableCell = TagName.Equals(NS_LITERAL_STRING("td")); - PRBool findList = TagName.Equals(NS_LITERAL_STRING("list")); + PRBool findTableCell = TagName.EqualsLiteral("td"); + PRBool findList = TagName.EqualsLiteral("list"); // default is null - no element found *aReturn = nsnull; @@ -3315,7 +3315,7 @@ nsHTMLEditor::CreateElementWithDefaults(const nsAString& aTagName, nsIDOMElement newElement->SetAttribute(NS_LITERAL_STRING("_moz_dirty"), EmptyString()); // Set default values for new elements - if (TagName.Equals(NS_LITERAL_STRING("hr"))) + if (TagName.EqualsLiteral("hr")) { // Note that we read the user's attributes for these from prefs (in InsertHLine JS) res = SetAttributeOrEquivalent(newElement, NS_LITERAL_STRING("width"), @@ -3323,14 +3323,14 @@ nsHTMLEditor::CreateElementWithDefaults(const nsAString& aTagName, nsIDOMElement if (NS_FAILED(res)) return res; res = SetAttributeOrEquivalent(newElement, NS_LITERAL_STRING("size"), NS_LITERAL_STRING("2"), PR_TRUE); - } else if (TagName.Equals(NS_LITERAL_STRING("table"))) + } else if (TagName.EqualsLiteral("table")) { res = newElement->SetAttribute(NS_LITERAL_STRING("cellpadding"),NS_LITERAL_STRING("2")); if (NS_FAILED(res)) return res; res = newElement->SetAttribute(NS_LITERAL_STRING("cellspacing"),NS_LITERAL_STRING("2")); if (NS_FAILED(res)) return res; res = newElement->SetAttribute(NS_LITERAL_STRING("border"),NS_LITERAL_STRING("1")); - } else if (TagName.Equals(NS_LITERAL_STRING("td"))) + } else if (TagName.EqualsLiteral("td")) { res = SetAttributeOrEquivalent(newElement, NS_LITERAL_STRING("valign"), NS_LITERAL_STRING("top"), PR_TRUE); @@ -3905,9 +3905,9 @@ nsHTMLEditor::GetEmbeddedObjects(nsISupportsArray** aNodeList) ToLowerCase(tagName); // See if it's an image or an embed - if (tagName.Equals(NS_LITERAL_STRING("img")) || tagName.Equals(NS_LITERAL_STRING("embed"))) + if (tagName.EqualsLiteral("img") || tagName.EqualsLiteral("embed")) (*aNodeList)->AppendElement(node); - else if (tagName.Equals(NS_LITERAL_STRING("a"))) + else if (tagName.EqualsLiteral("a")) { // Only include links if they're links to file: URLs nsCOMPtr anchor (do_QueryInterface(content)); @@ -3920,7 +3920,7 @@ nsHTMLEditor::GetEmbeddedObjects(nsISupportsArray** aNodeList) (*aNodeList)->AppendElement(node); } } - else if (tagName.Equals(NS_LITERAL_STRING("body"))) + else if (tagName.EqualsLiteral("body")) { nsCOMPtr element = do_QueryInterface(node); if (element) @@ -3992,7 +3992,7 @@ nsCOMPtr nsHTMLEditor::FindUserSelectAllNode(nsIDOMNode *aNode) while (node) { mHTMLCSSUtils->GetComputedProperty(node, nsEditProperty::cssMozUserSelect, mozUserSelectValue); - if (mozUserSelectValue.Equals(NS_LITERAL_STRING("all"))) + if (mozUserSelectValue.EqualsLiteral("all")) { resultNode = node; } @@ -4353,9 +4353,9 @@ nsHTMLEditor::TagCanContainTag(const nsAString& aParentTag, const nsAString& aCh /* // if parent is a pre, and child is not inline, say "no" - if ( aParentTag.Equals(NS_LITERAL_STRING("pre")) ) + if ( aParentTag.EqualsLiteral("pre") ) { - if (aChildTag.Equals(NS_LITERAL_STRING("__moz_text"))) + if (aChildTag.EqualsLiteral("__moz_text")) return PR_TRUE; PRInt32 childTagEnum, parentTagEnum; nsAutoString non_const_childTag(aChildTag); @@ -5511,7 +5511,7 @@ nsHTMLEditor::SetAttributeOrEquivalent(nsIDOMElement * aElement, // count is an integer that represents the number of CSS declarations applied to the // element. If it is zero, we found no equivalence in this implementation for the // attribute - if (aAttribute.Equals(NS_LITERAL_STRING("style"))) { + if (aAttribute.EqualsLiteral("style")) { // if it is the style attribute, just add the new value to the existing style // attribute's value nsAutoString existingValue; diff --git a/mozilla/editor/libeditor/html/nsHTMLInlineTableEditor.cpp b/mozilla/editor/libeditor/html/nsHTMLInlineTableEditor.cpp index 1dcd30cc1c2..8b7f65408bd 100644 --- a/mozilla/editor/libeditor/html/nsHTMLInlineTableEditor.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLInlineTableEditor.cpp @@ -176,21 +176,21 @@ nsHTMLEditor::DoInlineTableEditingAction(nsIDOMElement * aElement) PRBool hideUI = PR_FALSE; PRBool hideResizersWithInlineTableUI = (mResizedObject == tableElement); - if (anonclass.Equals(NS_LITERAL_STRING("mozTableAddColumnBefore"))) + if (anonclass.EqualsLiteral("mozTableAddColumnBefore")) InsertTableColumn(1, PR_FALSE); - else if (anonclass.Equals(NS_LITERAL_STRING("mozTableAddColumnAfter"))) + else if (anonclass.EqualsLiteral("mozTableAddColumnAfter")) InsertTableColumn(1, PR_TRUE); - else if (anonclass.Equals(NS_LITERAL_STRING("mozTableAddRowBefore"))) + else if (anonclass.EqualsLiteral("mozTableAddRowBefore")) InsertTableRow(1, PR_FALSE); - else if (anonclass.Equals(NS_LITERAL_STRING("mozTableAddRowAfter"))) + else if (anonclass.EqualsLiteral("mozTableAddRowAfter")) InsertTableRow(1, PR_TRUE); - else if (anonclass.Equals(NS_LITERAL_STRING("mozTableRemoveColumn"))) { + else if (anonclass.EqualsLiteral("mozTableRemoveColumn")) { DeleteTableColumn(1); #ifndef DISABLE_TABLE_DELETION hideUI = (colCount == 1); #endif } - else if (anonclass.Equals(NS_LITERAL_STRING("mozTableRemoveRow"))) { + else if (anonclass.EqualsLiteral("mozTableRemoveRow")) { DeleteTableRow(1); #ifndef DISABLE_TABLE_DELETION hideUI = (rowCount == 1); diff --git a/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp b/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp index 894bc5e6d9b..d237552ef0a 100644 --- a/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLObjectResizer.cpp @@ -620,13 +620,13 @@ nsHTMLEditor::MouseDown(PRInt32 aClientX, PRInt32 aClientY, nsAutoString anonclass; nsresult res = aTarget->GetAttribute(NS_LITERAL_STRING("_moz_anonclass"), anonclass); if (NS_FAILED(res)) return res; - if (anonclass.Equals(NS_LITERAL_STRING("mozResizer"))) { + if (anonclass.EqualsLiteral("mozResizer")) { // and that element is a resizer, let's start resizing! mOriginalX = aClientX; mOriginalY = aClientY; return StartResizing(aTarget); } - if (anonclass.Equals(NS_LITERAL_STRING("mozGrabber"))) { + if (anonclass.EqualsLiteral("mozGrabber")) { // and that element is a grabber, let's start moving the element! mOriginalX = aClientX; mOriginalY = aClientY; diff --git a/mozilla/editor/libeditor/html/nsTableEditor.cpp b/mozilla/editor/libeditor/html/nsTableEditor.cpp index 7a06514f4e2..b085cec0999 100644 --- a/mozilla/editor/libeditor/html/nsTableEditor.cpp +++ b/mozilla/editor/libeditor/html/nsTableEditor.cpp @@ -2939,7 +2939,7 @@ nsHTMLEditor::GetCellContext(nsISelection **aSelection, res = GetSelectedOrParentTableElement(tagName, &selectedCount, getter_AddRefs(cellOrTableElement)); if (NS_FAILED(res)) return res; - if (tagName.Equals(NS_LITERAL_STRING("table"))) + if (tagName.EqualsLiteral("table")) { // We have a selected table, not a cell if (aTable) @@ -2949,7 +2949,7 @@ nsHTMLEditor::GetCellContext(nsISelection **aSelection, } return NS_OK; } - if (!tagName.Equals(NS_LITERAL_STRING("td"))) + if (!tagName.EqualsLiteral("td")) return NS_EDITOR_ELEMENT_NOT_FOUND; // We found a cell diff --git a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp index b62d725f4b9..6d02a86219b 100644 --- a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp @@ -1337,7 +1337,7 @@ nsPlaintextEditor::GetAndInitDocEncoder(const nsAString& aFormatType, NS_ENSURE_SUCCESS(rv, rv); if (!aCharset.IsEmpty() - && !(aCharset.Equals(NS_LITERAL_CSTRING("null")))) + && !(aCharset.EqualsLiteral("null"))) docEncoder->SetCharset(aCharset); PRInt32 wc; @@ -1443,7 +1443,7 @@ nsPlaintextEditor::OutputToStream(nsIOutputStream* aOutputStream, // special-case for empty document when requesting plain text, // to account for the bogus text node. // XXX Should there be a similar test in OutputToString? - if (aFormatType == NS_LITERAL_STRING("text/plain")) + if (aFormatType.EqualsLiteral("text/plain")) { PRBool docEmpty; rv = GetDocumentIsEmpty(&docEmpty); diff --git a/mozilla/editor/libeditor/text/nsTextEditRules.cpp b/mozilla/editor/libeditor/text/nsTextEditRules.cpp index 978bdedcdac..1647bcf80b1 100644 --- a/mozilla/editor/libeditor/text/nsTextEditRules.cpp +++ b/mozilla/editor/libeditor/text/nsTextEditRules.cpp @@ -659,7 +659,7 @@ nsTextEditRules::WillInsertText(PRInt32 aAction, nsDependentSubstring subStr(tString, oldPos, subStrLen); // is it a return? - if (subStr.Equals(NS_LITERAL_STRING(LFSTR))) + if (subStr.EqualsLiteral(LFSTR)) { if (nsIPlaintextEditor::eEditorSingleLineMask & mFlags) { @@ -727,13 +727,13 @@ nsTextEditRules::WillInsertText(PRInt32 aAction, nsDependentSubstring subStr(tString, oldPos, subStrLen); // is it a tab? - if (subStr.Equals(NS_LITERAL_STRING("\t"))) + if (subStr.EqualsLiteral("\t")) { res = mEditor->InsertTextImpl(NS_LITERAL_STRING(" "), address_of(curNode), &curOffset, doc); pos++; } // is it a return? - else if (subStr.Equals(NS_LITERAL_STRING(LFSTR))) + else if (subStr.EqualsLiteral(LFSTR)) { res = mEditor->CreateBRImpl(address_of(curNode), &curOffset, address_of(unused), nsIEditor::eNone); pos++; @@ -1084,7 +1084,7 @@ nsTextEditRules::WillOutputText(nsISelection *aSelection, nsAutoString outputFormat(*aOutputFormat); ToLowerCase(outputFormat); - if (outputFormat.Equals(NS_LITERAL_STRING("text/plain"))) + if (outputFormat.EqualsLiteral("text/plain")) { // only use these rules for plain text output if (mFlags & nsIPlaintextEditor::eEditorPasswordMask) { diff --git a/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp b/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp index 2dcc53d5f1d..8aff62f375c 100644 --- a/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp +++ b/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp @@ -200,7 +200,7 @@ NS_IMETHODIMP CBrowserShellProgressListener::OnStateChange(nsIWebProgress *aWebP NS_ENSURE_TRUE(channel, NS_ERROR_FAILURE); nsCAutoString contentType; channel->GetContentType(contentType); - if (contentType.Equals(NS_LITERAL_CSTRING("text/html"))) + if (contentType.EqualsLiteral("text/html")) mUseRealProgFlag = true; } diff --git a/mozilla/embedding/browser/webBrowser/nsContextMenuInfo.cpp b/mozilla/embedding/browser/webBrowser/nsContextMenuInfo.cpp index 78fd599851f..5030ffed5b0 100644 --- a/mozilla/embedding/browser/webBrowser/nsContextMenuInfo.cpp +++ b/mozilla/embedding/browser/webBrowser/nsContextMenuInfo.cpp @@ -106,9 +106,9 @@ nsContextMenuInfo::GetAssociatedLink(nsAString& aHRef) nsCOMPtr linkContent; ToLowerCase(localName); - if (localName.Equals(NS_LITERAL_STRING("a")) || - localName.Equals(NS_LITERAL_STRING("area")) || - localName.Equals(NS_LITERAL_STRING("link"))) { + if (localName.EqualsLiteral("a") || + localName.EqualsLiteral("area") || + localName.EqualsLiteral("link")) { PRBool hasAttr; content->HasAttribute(NS_LITERAL_STRING("href"), &hasAttr); if (hasAttr) { @@ -137,7 +137,7 @@ nsContextMenuInfo::GetAssociatedLink(nsAString& aHRef) break; content->GetLocalName(localName); ToLowerCase(localName); - if (localName.Equals(NS_LITERAL_STRING("a"))) { + if (localName.EqualsLiteral("a")) { PRBool hasAttr; content->HasAttribute(NS_LITERAL_STRING("href"), &hasAttr); if (hasAttr) { @@ -326,7 +326,7 @@ nsContextMenuInfo::GetBackgroundImageRequestInternal(nsIDOMNode *aDOMNode, imgIR primitiveValue = do_QueryInterface(cssValue); if (primitiveValue) { primitiveValue->GetStringValue(bgStringValue); - if (!bgStringValue.Equals(NS_LITERAL_STRING("none"))) { + if (!bgStringValue.EqualsLiteral("none")) { nsCOMPtr bgUri; NS_NewURI(getter_AddRefs(bgUri), bgStringValue); NS_ENSURE_TRUE(bgUri, NS_ERROR_FAILURE); @@ -347,7 +347,7 @@ nsContextMenuInfo::GetBackgroundImageRequestInternal(nsIDOMNode *aDOMNode, imgIR primitiveValue = do_QueryInterface(cssValue); if (primitiveValue) { primitiveValue->GetStringValue(bgStringValue); - if (!bgStringValue.Equals(NS_LITERAL_STRING("transparent"))) + if (!bgStringValue.EqualsLiteral("transparent")) return NS_ERROR_FAILURE; } } diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp index 8e624faae60..bef4db23706 100644 --- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp +++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp @@ -227,7 +227,7 @@ nsDocShellTreeOwner::FindItemWithName(const PRUnichar* aName, return NS_OK; // _main is an IE target which should be case-insensitive but isn't // see bug 217886 for details - if(name.EqualsIgnoreCase("_content") || name.Equals(NS_LITERAL_STRING("_main"))) { + if(name.EqualsIgnoreCase("_content") || name.EqualsLiteral("_main")) { *aFoundItem = mWebBrowser->mDocShellAsItem; NS_IF_ADDREF(*aFoundItem); return NS_OK; diff --git a/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp b/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp index 9c11e818198..fba9cce2924 100644 --- a/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp +++ b/mozilla/embedding/components/printingui/src/win/nsPrintDialogUtil.cpp @@ -920,7 +920,7 @@ ShowNativePrintDialog(HWND aHWnd, if (NS_SUCCEEDED(GetLocalizedBundle(PRINTDLG_PROPERTIES, getter_AddRefs(strBundle)))) { nsAutoString doExtendStr; if (NS_SUCCEEDED(GetLocalizedString(strBundle, "extend", doExtendStr))) { - doExtend = doExtendStr.Equals(NS_LITERAL_STRING("true")); + doExtend = doExtendStr.EqualsLiteral("true"); } } diff --git a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp index 60c84ec5214..c75453fddbb 100644 --- a/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp +++ b/mozilla/embedding/components/webbrowserpersist/src/nsWebBrowserPersist.cpp @@ -2618,7 +2618,7 @@ nsresult nsWebBrowserPersist::OnWalkDOMNode(nsIDOMNode *aNode) { nsAutoString target; nodeAsPI->GetTarget(target); - if (target.Equals(NS_LITERAL_STRING("xml-stylesheet"))) + if (target.EqualsLiteral("xml-stylesheet")) { nsAutoString href; GetXMLStyleSheetLink(nodeAsPI, href); @@ -2810,7 +2810,7 @@ nsWebBrowserPersist::CloneNodeWithFixedUpURIAttributes( { nsAutoString target; nodeAsPI->GetTarget(target); - if (target.Equals(NS_LITERAL_STRING("xml-stylesheet"))) + if (target.EqualsLiteral("xml-stylesheet")) { rv = GetNodeToFixup(aNodeIn, aNodeOut); if (NS_SUCCEEDED(rv) && *aNodeOut) @@ -3465,7 +3465,7 @@ static PRBool IsSpecialXHTMLTag(nsIDOMNode *aNode) { nsAutoString ns; aNode->GetNamespaceURI(ns); - if (!ns.Equals(NS_LITERAL_STRING("http://www.w3.org/1999/xhtml"))) + if (!ns.EqualsLiteral("http://www.w3.org/1999/xhtml")) return PR_FALSE; // Ordered so that typical documents work fastest diff --git a/mozilla/embedding/lite/nsEmbedChromeRegistry.cpp b/mozilla/embedding/lite/nsEmbedChromeRegistry.cpp index d3075f9eb93..c23d1e06edb 100644 --- a/mozilla/embedding/lite/nsEmbedChromeRegistry.cpp +++ b/mozilla/embedding/lite/nsEmbedChromeRegistry.cpp @@ -276,18 +276,18 @@ nsEmbedChromeRegistry::RegisterChrome(const nsACString& aChromeType, const nsACString& aChromeLocation) { PRInt32 chromeType; - if (aChromeType.Equals(NS_LITERAL_CSTRING("skin"))) + if (aChromeType.EqualsLiteral("skin")) chromeType = CHROME_TYPE_SKIN; - else if (aChromeType.Equals(NS_LITERAL_CSTRING("locale"))) + else if (aChromeType.EqualsLiteral("locale")) chromeType = CHROME_TYPE_LOCALE; else chromeType = CHROME_TYPE_CONTENT; PRBool chromeIsProfile = - aChromeProfile.Equals(NS_LITERAL_CSTRING("profile")); + aChromeProfile.EqualsLiteral("profile"); PRBool chromeIsURL = - aChromeProfile.Equals(NS_LITERAL_CSTRING("url")); + aChromeProfile.EqualsLiteral("url"); return RegisterChrome(chromeType, chromeIsProfile, chromeIsURL, aChromeLocation); diff --git a/mozilla/embedding/tests/mfcembed/components/nsPrintDialogUtil.cpp b/mozilla/embedding/tests/mfcembed/components/nsPrintDialogUtil.cpp index dacbf29b42a..96fc5033e6e 100644 --- a/mozilla/embedding/tests/mfcembed/components/nsPrintDialogUtil.cpp +++ b/mozilla/embedding/tests/mfcembed/components/nsPrintDialogUtil.cpp @@ -916,7 +916,7 @@ ShowNativePrintDialog(HWND aHWnd, if (NS_SUCCEEDED(GetLocalizedBundle(PRINTDLG_PROPERTIES, getter_AddRefs(strBundle)))) { nsAutoString doExtendStr; if (NS_SUCCEEDED(GetLocalizedString(strBundle, "extend", doExtendStr))) { - doExtend = doExtendStr.Equals(NS_LITERAL_STRING("true")); + doExtend = doExtendStr.EqualsLiteral("true"); } } diff --git a/mozilla/extensions/access-builtin/accessproxy/nsAccessProxy.cpp b/mozilla/extensions/access-builtin/accessproxy/nsAccessProxy.cpp index d3315763cbd..7a2cce96010 100644 --- a/mozilla/extensions/access-builtin/accessproxy/nsAccessProxy.cpp +++ b/mozilla/extensions/access-builtin/accessproxy/nsAccessProxy.cpp @@ -147,7 +147,7 @@ NS_IMETHODIMP nsAccessProxy::HandleEvent(nsIDOMEvent* aEvent) } //return NS_OK; /* - if (presShell && eventNameStr.Equals(NS_LITERAL_STRING("click"))) { + if (presShell && eventNameStr.EqualsLiteral("click")) { nsCOMPtr frameSelection; presShell->GetFrameSelection(getter_AddRefs(frameSelection)); if (!frameSelection) @@ -186,10 +186,10 @@ NS_IMETHODIMP nsAccessProxy::Observe(nsISupports *aSubject, const char *aTopic, nsresult rv = NS_OK; nsDependentCString aTopicString(aTopic); - if (accessProxyInstalled && aTopicString.Equals(NS_LITERAL_CSTRING(NS_XPCOM_SHUTDOWN_OBSERVER_ID))) + if (accessProxyInstalled && aTopicString.EqualsLiteral(NS_XPCOM_SHUTDOWN_OBSERVER_ID)) return Release(); - if (!accessProxyInstalled && aTopicString.Equals(NS_LITERAL_CSTRING(APPSTARTUP_CATEGORY))) { + if (!accessProxyInstalled && aTopicString.EqualsLiteral(APPSTARTUP_CATEGORY)) { accessProxyInstalled = PR_TRUE; // Set to TRUE even for failure cases - we don't want to try more than once nsCOMPtr progress(do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID)); rv = NS_ERROR_FAILURE; diff --git a/mozilla/extensions/cookie/nsPermissionManager.cpp b/mozilla/extensions/cookie/nsPermissionManager.cpp index bfad4421288..f00593cc25f 100644 --- a/mozilla/extensions/cookie/nsPermissionManager.cpp +++ b/mozilla/extensions/cookie/nsPermissionManager.cpp @@ -656,7 +656,7 @@ nsPermissionManager::Read() // Split the line at tabs lineArray.ParseString(buffer.get(), "\t"); - if (lineArray[0]->Equals(NS_LITERAL_CSTRING(kMatchTypeHost)) && + if (lineArray[0]->EqualsLiteral(kMatchTypeHost) && lineArray.Count() == 4) { PRInt32 error; @@ -759,7 +759,7 @@ nsPermissionManager::Read() continue; // Ignore @@@ as host. Old style checkbox status - if (!permissionString.IsEmpty() && !host.Equals(NS_LITERAL_CSTRING("@@@@"))) { + if (!permissionString.IsEmpty() && !host.EqualsLiteral("@@@@")) { rv = AddInternal(host, type, permission, PR_FALSE); if (NS_FAILED(rv)) return rv; } diff --git a/mozilla/extensions/inspector/base/src/inDOMView.cpp b/mozilla/extensions/inspector/base/src/inDOMView.cpp index ddb0d74ffbc..e95825949ee 100644 --- a/mozilla/extensions/inspector/base/src/inDOMView.cpp +++ b/mozilla/extensions/inspector/base/src/inDOMView.cpp @@ -408,21 +408,21 @@ inDOMView::GetCellText(PRInt32 row, nsITreeColumn* col, nsAString& _retval) nsAutoString colID; col->GetId(colID); - if (colID.Equals(NS_LITERAL_STRING("colNodeName"))) + if (colID.EqualsLiteral("colNodeName")) domNode->GetNodeName(_retval); - else if (colID.Equals(NS_LITERAL_STRING("colLocalName"))) + else if (colID.EqualsLiteral("colLocalName")) domNode->GetLocalName(_retval); - else if (colID.Equals(NS_LITERAL_STRING("colPrefix"))) + else if (colID.EqualsLiteral("colPrefix")) domNode->GetPrefix(_retval); - else if (colID.Equals(NS_LITERAL_STRING("colNamespaceURI"))) + else if (colID.EqualsLiteral("colNamespaceURI")) domNode->GetNamespaceURI(_retval); - else if (colID.Equals(NS_LITERAL_STRING("colNodeType"))) { + else if (colID.EqualsLiteral("colNodeType")) { PRUint16 nodeType; domNode->GetNodeType(&nodeType); nsAutoString temp; temp.AppendInt(PRInt32(nodeType)); _retval = temp; - } else if (colID.Equals(NS_LITERAL_STRING("colNodeValue"))) + } else if (colID.EqualsLiteral("colNodeValue")) domNode->GetNodeValue(_retval); else { if (StringBeginsWith(colID, NS_LITERAL_STRING("col@"))) { diff --git a/mozilla/extensions/p3p/src/nsPolicyReference.cpp b/mozilla/extensions/p3p/src/nsPolicyReference.cpp index 6ffcbc90d11..8524501ac5e 100755 --- a/mozilla/extensions/p3p/src/nsPolicyReference.cpp +++ b/mozilla/extensions/p3p/src/nsPolicyReference.cpp @@ -271,7 +271,7 @@ nsPolicyReference::ProcessPolicyReferenceFile(nsIDOMDocument* aDocument, nsresult result = NS_OK; // The root element MUST be META - mError = name.Equals(NS_LITERAL_STRING("META")) + mError = name.EqualsLiteral("META") ? POLICY_LOAD_SUCCESS : POLICY_SYNTAX_ERROR; if (mError != POLICY_LOAD_SUCCESS) diff --git a/mozilla/extensions/spellcheck/myspell/src/mozMySpell.cpp b/mozilla/extensions/spellcheck/myspell/src/mozMySpell.cpp index 5631b2bdc56..56e59e2090e 100644 --- a/mozilla/extensions/spellcheck/myspell/src/mozMySpell.cpp +++ b/mozilla/extensions/spellcheck/myspell/src/mozMySpell.cpp @@ -238,7 +238,7 @@ NS_IMETHODIMP mozMySpell::GetDictionaryList(PRUnichar ***dictionaries, PRUint32 nsString fileName; theFile->GetLeafName(fileName); PRInt32 dotLocation = fileName.FindChar('.'); - if((dotLocation != -1) && Substring(fileName,dotLocation,4).Equals(NS_LITERAL_STRING(".dic"))){ + if((dotLocation != -1) && Substring(fileName,dotLocation,4).EqualsLiteral(".dic")){ if(tempCount >= arraySize){ arraySize = 2 * tempCount; newPtr = (PRUnichar **)nsMemory::Alloc(sizeof(PRUnichar *) * arraySize); diff --git a/mozilla/extensions/sql/base/src/mozSqlResult.cpp b/mozilla/extensions/sql/base/src/mozSqlResult.cpp index df3f90b313b..13b1f5bd7f7 100644 --- a/mozilla/extensions/sql/base/src/mozSqlResult.cpp +++ b/mozilla/extensions/sql/base/src/mozSqlResult.cpp @@ -930,10 +930,10 @@ mozSqlResult::SetCellValue(PRInt32 row, nsITreeColumn* col, const nsAString& val Cell* cell = buffer->mCells[columnIndex]; - if (value.Equals(NS_LITERAL_STRING("true"))) { + if (value.EqualsLiteral("true")) { cell->mBool = PR_TRUE; } - else if (value.Equals(NS_LITERAL_STRING("false"))) { + else if (value.EqualsLiteral("false")) { cell->mBool = PR_FALSE; } diff --git a/mozilla/extensions/transformiix/source/main/testXalan.cpp b/mozilla/extensions/transformiix/source/main/testXalan.cpp index a2d2327e4a3..f1ca1e2fb77 100644 --- a/mozilla/extensions/transformiix/source/main/testXalan.cpp +++ b/mozilla/extensions/transformiix/source/main/testXalan.cpp @@ -318,14 +318,14 @@ int main(int argc, char** argv) // skip -- gnu style options while (argn < argc) { nsDependentCString opt(argv[argn]); - if (!Substring(opt, 0, 2).Equals(NS_LITERAL_CSTRING("--"))) { + if (!Substring(opt, 0, 2).EqualsLiteral("--")) { break; } ++argn; } if (argn < argc) { nsDependentCString opt(argv[argn]); - if (Substring(opt, 0, 2).Equals(NS_LITERAL_CSTRING("-o"))) { + if (Substring(opt, 0, 2).EqualsLiteral("-o")) { if (opt.Length() > 2) { const nsAFlatCString& fname = PromiseFlatCString(Substring(opt, 2, opt.Length()-2)); @@ -396,7 +396,7 @@ int main(int argc, char** argv) if (NS_SUCCEEDED(rv) && isDir) { rv = cat->GetNativeLeafName(leaf); if (NS_SUCCEEDED(rv) && - !leaf.Equals(NS_LITERAL_CSTRING("CVS"))) { + !leaf.EqualsLiteral("CVS")) { rv = gold->AppendNative(leaf); if (NS_SUCCEEDED(rv)) { runCategory(cat, gold, resFile, rdfOut); diff --git a/mozilla/extensions/transformiix/source/main/transformiix.cpp b/mozilla/extensions/transformiix/source/main/transformiix.cpp index 11f61238df5..8f45a647bf5 100644 --- a/mozilla/extensions/transformiix/source/main/transformiix.cpp +++ b/mozilla/extensions/transformiix/source/main/transformiix.cpp @@ -167,7 +167,7 @@ int main(int argc, char** argv) txOptionEntry* option = options.GetEntry(NS_LITERAL_CSTRING("o")); if (option && option->mValues.Count() > 0 && - !option->mValues[0]->Equals(NS_LITERAL_CSTRING("-"))) { + !option->mValues[0]->EqualsLiteral("-")) { resultFileStream.open(option->mValues[0]->get(), ios::out); if (!resultFileStream) { cerr << "error opening output file: "; diff --git a/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp b/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp index db412f4e6f3..97b3b5b8d65 100644 --- a/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp +++ b/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp @@ -527,19 +527,19 @@ nsTypeAheadFind::HandleEvent(nsIDOMEvent* aEvent) nsAutoString eventType; aEvent->GetType(eventType); - if (eventType.Equals(NS_LITERAL_STRING("DOMMenuBarActive"))) { + if (eventType.EqualsLiteral("DOMMenuBarActive")) { mIsMenuBarActive = PR_TRUE; } - else if (eventType.Equals(NS_LITERAL_STRING("DOMMenuBarInactive"))) { + else if (eventType.EqualsLiteral("DOMMenuBarInactive")) { mIsMenuBarActive = PR_FALSE; } - else if (eventType.Equals(NS_LITERAL_STRING("popupshown"))) { + else if (eventType.EqualsLiteral("popupshown")) { mIsMenuPopupActive = PR_TRUE; } - else if (eventType.Equals(NS_LITERAL_STRING("popuphidden"))) { + else if (eventType.EqualsLiteral("popuphidden")) { mIsMenuPopupActive = PR_FALSE; } - else if (eventType.Equals(NS_LITERAL_STRING("unload"))) { + else if (eventType.EqualsLiteral("unload")) { // When document is unloaded, check to see if it's the // current typeahead doc. If it is, cancel find // and reset member variables so we don't leak @@ -608,7 +608,7 @@ nsTypeAheadFind::KeyPress(nsIDOMEvent* aEvent) // by waiting for the first keystroke, we still get the startup time benefits. mIsSoundInitialized = PR_TRUE; mSoundInterface = do_CreateInstance("@mozilla.org/sound;1"); - if (mSoundInterface && !mNotFoundSoundURL.Equals(NS_LITERAL_CSTRING("beep"))) { + if (mSoundInterface && !mNotFoundSoundURL.EqualsLiteral("beep")) { mSoundInterface->Init(); } } @@ -1626,7 +1626,7 @@ nsTypeAheadFind::RangeStartsInsideLink(nsIDOMRange *aRange, if (*aIsInsideLink) { nsAutoString xlinkType; startContent->GetAttr(kNameSpaceID_XLink, typeAtom, xlinkType); - if (!xlinkType.Equals(NS_LITERAL_STRING("simple"))) { + if (!xlinkType.EqualsLiteral("simple")) { *aIsInsideLink = PR_FALSE; // Xlink must be type="simple" } @@ -1965,7 +1965,7 @@ nsTypeAheadFind::GetAutoStart(nsIDOMWindow *aDOMWin, PRBool *aIsAutoStartOn) if (mLinksOnlyPref) { nsAutoString contentType; doc->GetContentType(contentType); - if (contentType.Equals(NS_LITERAL_STRING("text/plain"))) { + if (contentType.EqualsLiteral("text/plain")) { return NS_OK; // No auto link search in plain text pages } } @@ -2879,7 +2879,7 @@ nsTypeAheadController::IsCommandEnabled(const char *aCommand, PRBool *aResult) if (htmlDoc) { nsAutoString designMode; htmlDoc->GetDesignMode(designMode); - if (designMode.Equals(NS_LITERAL_STRING("on"))) { + if (designMode.EqualsLiteral("on")) { *aResult = PR_FALSE; } } diff --git a/mozilla/extensions/wallet/src/singsign.cpp b/mozilla/extensions/wallet/src/singsign.cpp index dd92c02f6ae..8689c09bb22 100644 --- a/mozilla/extensions/wallet/src/singsign.cpp +++ b/mozilla/extensions/wallet/src/singsign.cpp @@ -611,7 +611,7 @@ si_Randomize(nsString& password) { PRIntervalTime randomNumber; int i; const char * hexDigits = "0123456789AbCdEf"; - if (password.Equals(NS_LITERAL_STRING("********"))) { + if (password.EqualsLiteral("********")) { randomNumber = PR_IntervalNow(); for (i=0; i<8; i++) { password.SetCharAt(hexDigits[randomNumber%16], i); diff --git a/mozilla/extensions/wallet/src/wallet.cpp b/mozilla/extensions/wallet/src/wallet.cpp index c35efd96f1f..4f072f69d0f 100644 --- a/mozilla/extensions/wallet/src/wallet.cpp +++ b/mozilla/extensions/wallet/src/wallet.cpp @@ -3005,7 +3005,7 @@ WLLT_PostEdit(const nsString& walletList) tail = temp; /* return if OK button was not pressed */ - if (!head.Equals(NS_LITERAL_STRING("OK"))) { + if (!head.EqualsLiteral("OK")) { return; } @@ -3217,7 +3217,7 @@ WLLT_PrefillReturn(const nsString& results) wallet_DecodeVerticalBars(urlName); /* add url to url list if user doesn't want to preview this page in the future */ - if (skip.Equals(NS_LITERAL_STRING("true"))) { + if (skip.EqualsLiteral("true")) { nsCAutoString url = NS_ConvertUCS2toUTF8(urlName); nsVoidArray* dummy; nsCAutoString urlPermissions("nn"); diff --git a/mozilla/extensions/webservices/proxy/tests/wspproxytest.cpp b/mozilla/extensions/webservices/proxy/tests/wspproxytest.cpp index f64742c7c91..d02d58fc601 100644 --- a/mozilla/extensions/webservices/proxy/tests/wspproxytest.cpp +++ b/mozilla/extensions/webservices/proxy/tests/wspproxytest.cpp @@ -166,7 +166,7 @@ WSPProxyTest::TestComplexTypeWrapperInstance(nsIPropertyBag* propBag, } \ \ prop->GetName(propName); \ - if (!propName.Equals(NS_LITERAL_STRING(#_name))) { \ + if (!propName.EqualsLiteral(#_name)) { \ aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Name doesn't match for property ") + NS_LITERAL_STRING(#_name)); \ return NS_ERROR_FAILURE; \ } \ @@ -210,7 +210,7 @@ WSPProxyTest::TestComplexTypeWrapperInstance(nsIPropertyBag* propBag, return rv; } - if (!str.Equals(NS_LITERAL_STRING(STRING_VAL))) { + if (!str.EqualsLiteral(STRING_VAL)) { aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for property s")); return NS_ERROR_FAILURE; } @@ -363,7 +363,7 @@ WSPProxyTest::TestPropertyBagWrapper(nsAString& aResult) aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Failed to get value for attribute s")); return NS_OK; } - if (!str.Equals(NS_LITERAL_STRING(STRING_VAL))) { + if (!str.EqualsLiteral(STRING_VAL)) { aResult.Assign(NS_LITERAL_STRING("WSPProxyTest: Value doesn't match for attribute s")); return NS_OK; } diff --git a/mozilla/extensions/webservices/schema/src/nsSchema.cpp b/mozilla/extensions/webservices/schema/src/nsSchema.cpp index 268bd8655ab..21bc512bf59 100644 --- a/mozilla/extensions/webservices/schema/src/nsSchema.cpp +++ b/mozilla/extensions/webservices/schema/src/nsSchema.cpp @@ -64,7 +64,7 @@ nsSchema::nsSchema(nsISchemaCollection* aCollection, elementFormDefault); elementFormDefault.Trim(" \r\n\t"); mElementFormQualified = - elementFormDefault.Equals(NS_LITERAL_STRING("qualified")); + elementFormDefault.EqualsLiteral("qualified"); } } diff --git a/mozilla/extensions/webservices/schema/src/nsSchemaLoader.cpp b/mozilla/extensions/webservices/schema/src/nsSchemaLoader.cpp index 367a0d7e02e..6b16c5ba77a 100644 --- a/mozilla/extensions/webservices/schema/src/nsSchemaLoader.cpp +++ b/mozilla/extensions/webservices/schema/src/nsSchemaLoader.cpp @@ -137,7 +137,7 @@ LoadListener::HandleEvent(nsIDOMEvent *event) event->GetType(eventType); - if (eventType.Equals(NS_LITERAL_STRING("load"))) { + if (eventType.EqualsLiteral("load")) { nsCOMPtr document; nsCOMPtr schema; @@ -163,7 +163,7 @@ LoadListener::HandleEvent(nsIDOMEvent *event) mListener->OnError(rv, NS_LITERAL_STRING("Failure processing schema document")); } } - else if (eventType.Equals(NS_LITERAL_STRING("error")) && + else if (eventType.EqualsLiteral("error") && mListener) { mListener->OnError(NS_ERROR_SCHEMA_LOADING_ERROR, NS_LITERAL_STRING("Failure loading")); @@ -228,8 +228,8 @@ nsBuiltinSchemaCollection::GetAttribute(const nsAString & aName, static PRBool IsSchemaNamespace(const nsAString& aNamespace) { - if (aNamespace.Equals(NS_LITERAL_STRING(NS_SCHEMA_2001_NAMESPACE)) || - aNamespace.Equals(NS_LITERAL_STRING(NS_SCHEMA_1999_NAMESPACE))) { + if (aNamespace.EqualsLiteral(NS_SCHEMA_2001_NAMESPACE) || + aNamespace.EqualsLiteral(NS_SCHEMA_1999_NAMESPACE)) { return PR_TRUE; } else { @@ -240,8 +240,8 @@ IsSchemaNamespace(const nsAString& aNamespace) static PRBool IsSOAPNamespace(const nsAString& aNamespace) { - if (aNamespace.Equals(NS_LITERAL_STRING(NS_SOAP_1_1_ENCODING_NAMESPACE)) || - aNamespace.Equals(NS_LITERAL_STRING(NS_SOAP_1_2_ENCODING_NAMESPACE))) { + if (aNamespace.EqualsLiteral(NS_SOAP_1_1_ENCODING_NAMESPACE) || + aNamespace.EqualsLiteral(NS_SOAP_1_2_ENCODING_NAMESPACE)) { return PR_TRUE; } else { @@ -446,7 +446,7 @@ nsBuiltinSchemaCollection::GetSOAPType(const nsAString& aName, rv = CallQueryInterface(sup, aType); } else { - if (aName.Equals(NS_LITERAL_STRING("Array"))) { + if (aName.EqualsLiteral("Array")) { nsCOMPtr anyType; rv = GetBuiltinType(NS_LITERAL_STRING("anyType"), NS_LITERAL_STRING(NS_SCHEMA_2001_NAMESPACE), @@ -465,7 +465,7 @@ nsBuiltinSchemaCollection::GetSOAPType(const nsAString& aName, *aType = array; NS_ADDREF(*aType); } - else if (aName.Equals(NS_LITERAL_STRING("arrayType"))) { + else if (aName.EqualsLiteral("arrayType")) { nsSOAPArrayType* arrayType = new nsSOAPArrayType(); if (!arrayType) { return NS_ERROR_OUT_OF_MEMORY; @@ -985,7 +985,7 @@ nsSchemaLoader::ProcessElement(nsSchema* aSchema, value.Trim(" \r\n\t"); PRInt32 flags = 0; - if (value.Equals(NS_LITERAL_STRING("true"))) + if (value.EqualsLiteral("true")) flags |= nsSchemaElement::NILLABLE; rv = aElement->GetAttributeNS(empty, NS_LITERAL_STRING("abstract"), value); @@ -993,7 +993,7 @@ nsSchemaLoader::ProcessElement(nsSchema* aSchema, return rv; value.Trim(" \r\n\t"); - if (value.Equals(NS_LITERAL_STRING("true"))) + if (value.EqualsLiteral("true")) flags |= nsSchemaElement::ABSTRACT; nsCOMPtr parent; @@ -1012,7 +1012,7 @@ nsSchemaLoader::ProcessElement(nsSchema* aSchema, // elementFormDefault on the ancestor is qualified, then the // actual value of the targetNamespace [attribute] is that of the ancestor // element information item, or absent if there is none. - if (value.Equals(NS_LITERAL_STRING("schema"))) { + if (value.EqualsLiteral("schema")) { flags |= nsSchemaElement::FORM_QUALIFIED; } else { @@ -1029,7 +1029,7 @@ nsSchemaLoader::ProcessElement(nsSchema* aSchema, flags &= ~nsSchemaElement::FORM_QUALIFIED; } } - else if (value.Equals(NS_LITERAL_STRING("qualified"))) { + else if (value.EqualsLiteral("qualified")) { flags |= nsSchemaElement::FORM_QUALIFIED; } else { @@ -1122,7 +1122,7 @@ nsSchemaLoader::ProcessComplexType(nsSchema* aSchema, nsSchemaComplexType* typeInst; typeInst = new nsSchemaComplexType(aSchema, name, - abstract.Equals(NS_LITERAL_STRING("true"))); + abstract.EqualsLiteral("true")); if (!typeInst) { return NS_ERROR_OUT_OF_MEMORY; } @@ -1174,7 +1174,7 @@ nsSchemaLoader::ProcessComplexType(nsSchema* aSchema, nsAutoString mixed; aElement->GetAttribute(NS_LITERAL_STRING("mixed"), mixed); - if (mixed.Equals(NS_LITERAL_STRING("true"))) { + if (mixed.EqualsLiteral("true")) { contentModel = nsISchemaComplexType::CONTENT_MODEL_MIXED; } @@ -1833,7 +1833,7 @@ nsSchemaLoader::ProcessComplexContent(nsSchema* aSchema, nsAutoString mixed; aElement->GetAttribute(NS_LITERAL_STRING("mixed"), mixed); - if (mixed.Equals(NS_LITERAL_STRING("true"))) { + if (mixed.EqualsLiteral("true")) { *aContentModel = nsISchemaComplexType::CONTENT_MODEL_MIXED; } @@ -2590,13 +2590,13 @@ nsSchemaLoader::ProcessFacet(nsSchema* aSchema, } else if (aTagName == nsSchemaAtoms::sWhiteSpace_atom) { PRUint16 whiteSpaceVal; - if (valueStr.Equals(NS_LITERAL_STRING("collapse"))) { + if (valueStr.EqualsLiteral("collapse")) { whiteSpaceVal = nsSchemaFacet::WHITESPACE_COLLAPSE; } - else if (valueStr.Equals(NS_LITERAL_STRING("preserve"))) { + else if (valueStr.EqualsLiteral("preserve")) { whiteSpaceVal = nsSchemaFacet::WHITESPACE_PRESERVE; } - else if (valueStr.Equals(NS_LITERAL_STRING("replace"))) { + else if (valueStr.EqualsLiteral("replace")) { whiteSpaceVal = nsSchemaFacet::WHITESPACE_REPLACE; } else { @@ -2611,7 +2611,7 @@ nsSchemaLoader::ProcessFacet(nsSchema* aSchema, nsAutoString isFixed; aElement->GetAttribute(NS_LITERAL_STRING("fixed"), isFixed); - facetInst->SetIsFixed(isFixed.Equals(NS_LITERAL_STRING("true"))); + facetInst->SetIsFixed(isFixed.EqualsLiteral("true")); *aFacet = facet; NS_ADDREF(*aFacet); @@ -2628,10 +2628,10 @@ nsSchemaLoader::GetUse(nsIDOMElement* aElement, nsAutoString use; aElement->GetAttribute(NS_LITERAL_STRING("use"), use); - if (use.Equals(NS_LITERAL_STRING("prohibited"))) { + if (use.EqualsLiteral("prohibited")) { *aUse = nsISchemaAttribute::USE_PROHIBITED; } - else if (use.Equals(NS_LITERAL_STRING("required"))) { + else if (use.EqualsLiteral("required")) { *aUse = nsISchemaAttribute::USE_REQUIRED; } } @@ -2645,10 +2645,10 @@ nsSchemaLoader::GetProcess(nsIDOMElement* aElement, nsAutoString process; aElement->GetAttribute(NS_LITERAL_STRING("process"), process); - if (process.Equals(NS_LITERAL_STRING("lax"))) { + if (process.EqualsLiteral("lax")) { *aProcess = nsISchemaAnyParticle::PROCESS_LAX; } - else if (process.Equals(NS_LITERAL_STRING("skip"))) { + else if (process.EqualsLiteral("skip")) { *aProcess = nsISchemaAnyParticle::PROCESS_SKIP; } } @@ -2674,7 +2674,7 @@ nsSchemaLoader::GetMinAndMax(nsIDOMElement* aElement, } if (!maxStr.IsEmpty()) { - if (maxStr.Equals(NS_LITERAL_STRING("unbounded"))) { + if (maxStr.EqualsLiteral("unbounded")) { *aMaxOccurs = nsISchemaParticle::OCCURRENCE_UNBOUNDED; } else { diff --git a/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp b/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp index c346c1ce5ac..2e3068f707c 100644 --- a/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp +++ b/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp @@ -393,7 +393,7 @@ nsWSDLLoadRequest::HandleEvent(nsIDOMEvent *event) event->GetType(eventType); - if (eventType.Equals(NS_LITERAL_STRING("load"))) { + if (eventType.EqualsLiteral("load")) { nsCOMPtr document; rv = mRequest->GetResponseXML(getter_AddRefs(document)); @@ -456,7 +456,7 @@ nsWSDLLoadRequest::HandleEvent(nsIDOMEvent *event) return NS_OK; } } - else if (eventType.Equals(NS_LITERAL_STRING("error"))) { + else if (eventType.EqualsLiteral("error")) { mListener->OnError(NS_ERROR_WSDL_LOADING_ERROR, NS_LITERAL_STRING("Failure loading")); return NS_OK; @@ -641,8 +641,8 @@ nsWSDLLoadRequest::GetSchemaType(const nsAString& aName, const nsAString& aNamespace, nsISchemaType** aSchemaComponent) { - if (aNamespace.Equals(NS_LITERAL_STRING(SCHEMA_2001_NAMESPACE)) || - aNamespace.Equals(NS_LITERAL_STRING(SCHEMA_1999_NAMESPACE))) { + if (aNamespace.EqualsLiteral(SCHEMA_2001_NAMESPACE) || + aNamespace.EqualsLiteral(SCHEMA_1999_NAMESPACE)) { nsCOMPtr collection(do_QueryInterface(mSchemaLoader)); return collection->GetType(aName, aNamespace, aSchemaComponent); } @@ -1148,7 +1148,7 @@ nsWSDLLoadRequest::ProcessMessageBinding(nsIDOMElement* aElement, childElement->GetAttribute(NS_LITERAL_STRING("namespace"), namespaceStr); PRUint16 use = nsISOAPPartBinding::USE_LITERAL; - if (useStr.Equals(NS_LITERAL_STRING("encoded"))) { + if (useStr.EqualsLiteral("encoded")) { use = nsISOAPPartBinding::USE_ENCODED; } @@ -1270,10 +1270,10 @@ nsWSDLLoadRequest::ProcessOperationBinding(nsIDOMElement* aElement, childElement->GetAttribute(NS_LITERAL_STRING("style"), style); bindingInst->SetSoapAction(action); - if (style.Equals(NS_LITERAL_STRING("rpc"))) { + if (style.EqualsLiteral("rpc")) { bindingInst->SetStyle(nsISOAPPortBinding::STYLE_RPC); } - else if (style.Equals(NS_LITERAL_STRING("document"))) { + else if (style.EqualsLiteral("document")) { bindingInst->SetStyle(nsISOAPPortBinding::STYLE_DOCUMENT); } // If one isn't explicitly specified, we inherit from the port @@ -1394,10 +1394,10 @@ nsWSDLLoadRequest::ProcessBindingElement(nsIDOMElement* aElement) childElement->GetAttribute(NS_LITERAL_STRING("style"), style); childElement->GetAttribute(NS_LITERAL_STRING("transport"), transport); - if (style.Equals(NS_LITERAL_STRING("rpc"))) { + if (style.EqualsLiteral("rpc")) { bindingInst->SetStyle(nsISOAPPortBinding::STYLE_RPC); } - else if (style.Equals(NS_LITERAL_STRING("document"))) { + else if (style.EqualsLiteral("document")) { bindingInst->SetStyle(nsISOAPPortBinding::STYLE_DOCUMENT); } bindingInst->SetTransport(transport); diff --git a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp index 810c4b99d50..20fd508344d 100644 --- a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp +++ b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp @@ -157,7 +157,7 @@ nsMultipartProxyListener::OnStartRequest(nsIRequest *aRequest, nsCAutoString contentType; nsresult rv = channel->GetContentType(contentType); - if (!contentType.Equals(NS_LITERAL_CSTRING("multipart/x-mixed-replace"))) { + if (!contentType.EqualsLiteral("multipart/x-mixed-replace")) { return NS_ERROR_INVALID_ARG; } @@ -504,7 +504,7 @@ nsXMLHttpRequest::ConvertBodyToText(nsAString& aOutBuffer) } } - if (dataCharset.Equals(NS_LITERAL_CSTRING("ASCII"))) { + if (dataCharset.EqualsLiteral("ASCII")) { CopyASCIItoUTF16(mResponseBody, aOutBuffer); return NS_OK; @@ -1380,7 +1380,7 @@ nsXMLHttpRequest::Send(nsIVariant *aBody) httpChannel->GetRequestMethod(method); // If GET, method name will be uppercase } - if (aBody && httpChannel && !method.Equals(NS_LITERAL_CSTRING("GET"))) { + if (aBody && httpChannel && !method.EqualsLiteral("GET")) { nsXPIDLString serial; nsCOMPtr postDataStream; diff --git a/mozilla/extensions/xmlextras/ls/src/nsLSParser.cpp b/mozilla/extensions/xmlextras/ls/src/nsLSParser.cpp index fa753115762..60cc95af496 100755 --- a/mozilla/extensions/xmlextras/ls/src/nsLSParser.cpp +++ b/mozilla/extensions/xmlextras/ls/src/nsLSParser.cpp @@ -199,9 +199,9 @@ nsLSParser::AddEventListener(const nsAString& aType, { nsCOMArray *listeners; - if (aType.Equals(NS_LITERAL_STRING("ls-load"))) { + if (aType.EqualsLiteral("ls-load")) { listeners = &mLoadListeners; - } else if (aType.Equals(NS_LITERAL_STRING("ls-progress"))) { + } else if (aType.EqualsLiteral("ls-progress")) { listeners = &mProgressListeners; } else { // Not a supported event @@ -223,9 +223,9 @@ nsLSParser::RemoveEventListener(const nsAString& aType, { nsCOMArray *listeners; - if (aType.Equals(NS_LITERAL_STRING("ls-load"))) { + if (aType.EqualsLiteral("ls-load")) { listeners = &mLoadListeners; - } else if (aType.Equals(NS_LITERAL_STRING("ls-progress"))) { + } else if (aType.EqualsLiteral("ls-progress")) { listeners = &mProgressListeners; } else { // Not a supported event diff --git a/mozilla/extensions/xmlterm/base/mozLineTerm.cpp b/mozilla/extensions/xmlterm/base/mozLineTerm.cpp index d61d4aee877..21bc3f5423e 100644 --- a/mozilla/extensions/xmlterm/base/mozLineTerm.cpp +++ b/mozilla/extensions/xmlterm/base/mozLineTerm.cpp @@ -193,7 +193,7 @@ NS_IMETHODIMP mozLineTerm::ArePrefsSecure(PRBool *_retval) XMLT_LOG(mozLineTerm::ArePrefsSecure,32, ("secLevelString=%s\n", secLevelString.get())); - *_retval = secLevelString.Equals(NS_LITERAL_CSTRING("sameOrigin")); + *_retval = secLevelString.EqualsLiteral("sameOrigin"); if (!(*_retval)) { XMLT_ERROR("mozLineTerm::ArePrefsSecure: Error - Please add the line\n" diff --git a/mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp b/mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp index 499a234226f..3639520d169 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTermSession.cpp @@ -1029,7 +1029,7 @@ NS_IMETHODIMP mozXMLTermSession::ReadAll(mozILineTermAux* lineTermAux, XMLT_LOG(mozXMLTermSession::ReadAll,62,("metaCommandOutput\n")); // Ignore the string "false", if that's the only output - if (metaCommandOutput.Equals(NS_LITERAL_STRING("false"))) + if (metaCommandOutput.EqualsLiteral("false")) metaCommandOutput.SetLength(0); // Check metacommand output for markup (secure) diff --git a/mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp b/mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp index 4b33a3d9be3..15bcdd56d10 100644 --- a/mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp +++ b/mozilla/gfx/src/mac/nsMacUnicodeFontInfo.cpp @@ -484,15 +484,15 @@ GetEncoding(const nsCString& aFontName, nsACString& aValue) // see if we should init the property if (! gFontEncodingProperties) { // but bail out for common fonts used at startup... - if (aFontName.Equals(NS_LITERAL_CSTRING("Lucida Grande")) || - aFontName.Equals(NS_LITERAL_CSTRING("Charcoal")) || - aFontName.Equals(NS_LITERAL_CSTRING("Chicago")) || - aFontName.Equals(NS_LITERAL_CSTRING("Capitals")) || - aFontName.Equals(NS_LITERAL_CSTRING("Gadget")) || - aFontName.Equals(NS_LITERAL_CSTRING("Sand")) || - aFontName.Equals(NS_LITERAL_CSTRING("Techno")) || - aFontName.Equals(NS_LITERAL_CSTRING("Textile")) || - aFontName.Equals(NS_LITERAL_CSTRING("Geneva")) ) + if (aFontName.EqualsLiteral("Lucida Grande") || + aFontName.EqualsLiteral("Charcoal") || + aFontName.EqualsLiteral("Chicago") || + aFontName.EqualsLiteral("Capitals") || + aFontName.EqualsLiteral("Gadget") || + aFontName.EqualsLiteral("Sand") || + aFontName.EqualsLiteral("Techno") || + aFontName.EqualsLiteral("Textile") || + aFontName.EqualsLiteral("Geneva") ) return NS_ERROR_NOT_AVAILABLE; // error mean do not get a special encoding // init the property now diff --git a/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp b/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp index ebc1daf2943..a6590f86e6e 100644 --- a/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp +++ b/mozilla/gfx/src/os2/nsFontMetricsOS2.cpp @@ -1292,20 +1292,20 @@ PRBool nsFontMetricsOS2::GetVectorSubstitute(HPS aPS, const nsAString& aFamilyname, nsAString& aAlias) { - if (aFamilyname.Equals(NS_LITERAL_STRING("Tms Rmn"))) { + if (aFamilyname.EqualsLiteral("Tms Rmn")) { aAlias = NS_LITERAL_STRING("Times New Roman"); - } else if (aFamilyname.Equals(NS_LITERAL_STRING("Helv"))) { + } else if (aFamilyname.EqualsLiteral("Helv")) { aAlias = NS_LITERAL_STRING("Helvetica"); } // When printing, substitute vector fonts for these common bitmap fonts if (!mDeviceContext->SupportsRasterFonts()) { - if (aFamilyname.Equals(NS_LITERAL_STRING("System Proportional")) || - aFamilyname.Equals(NS_LITERAL_STRING("WarpSans"))) + if (aFamilyname.EqualsLiteral("System Proportional") || + aFamilyname.EqualsLiteral("WarpSans")) { aAlias = NS_LITERAL_STRING("Helvetica"); - } else if (aFamilyname.Equals(NS_LITERAL_STRING("System Monospaced")) || - aFamilyname.Equals(NS_LITERAL_STRING("System VIO"))) + } else if (aFamilyname.EqualsLiteral("System Monospaced") || + aFamilyname.EqualsLiteral("System VIO")) { aAlias = NS_LITERAL_STRING("Courier"); } diff --git a/mozilla/gfx/src/shared/nsNativeTheme.cpp b/mozilla/gfx/src/shared/nsNativeTheme.cpp index 860e2c5af50..8be46ddaa7d 100644 --- a/mozilla/gfx/src/shared/nsNativeTheme.cpp +++ b/mozilla/gfx/src/shared/nsNativeTheme.cpp @@ -135,7 +135,7 @@ nsNativeTheme::CheckBooleanAttr(nsIFrame* aFrame, nsIAtom* aAtom) // string "true" to be counted as true. An empty string should _not_ // be counted as true. - return attr.Equals(NS_LITERAL_STRING("true")); + return attr.EqualsLiteral("true"); } PRInt32 diff --git a/mozilla/gfx/src/shared/nsNativeTheme.h b/mozilla/gfx/src/shared/nsNativeTheme.h index 8a7d9baf3bf..6a8cac4fea4 100644 --- a/mozilla/gfx/src/shared/nsNativeTheme.h +++ b/mozilla/gfx/src/shared/nsNativeTheme.h @@ -105,7 +105,7 @@ class nsNativeTheme PRBool IsSortReversed(nsIFrame* aFrame) { nsAutoString sortdir; if (GetAttr(aFrame, mSortDirectionAtom, sortdir)) - return sortdir.Equals(NS_LITERAL_STRING("descending")); + return sortdir.EqualsLiteral("descending"); return PR_FALSE; } @@ -121,7 +121,7 @@ class nsNativeTheme PRBool IsIndeterminateProgress(nsIFrame* aFrame) { nsAutoString mode; if (GetAttr(aFrame, mModeAtom, mode)) - return mode.Equals(NS_LITERAL_STRING("undetermined")); + return mode.EqualsLiteral("undetermined"); return PR_FALSE; } diff --git a/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp b/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp index b18572ff50c..457200239fd 100644 --- a/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp +++ b/mozilla/gfx/src/windows/nsDeviceContextSpecWin.cpp @@ -384,7 +384,7 @@ CheckForPrintToFile(nsIPrintSettings* aPS, LPTSTR aPrinterName, PRUnichar* aUPri aPS->GetToFileName(getter_Copies(toFileName)); if (toFileName) { if (*toFileName) { - if (toFileName.Equals(NS_LITERAL_STRING("FILE:"))) { + if (toFileName.EqualsLiteral("FILE:")) { // this skips the setting of the "print to file" info below // which we don't want to do. return NS_OK; diff --git a/mozilla/intl/chardet/src/nsMetaCharsetObserver.cpp b/mozilla/intl/chardet/src/nsMetaCharsetObserver.cpp index 4d2b6dba939..14dc30eed1b 100644 --- a/mozilla/intl/chardet/src/nsMetaCharsetObserver.cpp +++ b/mozilla/intl/chardet/src/nsMetaCharsetObserver.cpp @@ -300,11 +300,11 @@ NS_IMETHODIMP nsMetaCharsetObserver::Notify( if(NS_SUCCEEDED(res2)) { // following charset should have been detected by parser - if (!preferred.Equals(NS_LITERAL_CSTRING("UTF-16")) && - !preferred.Equals(NS_LITERAL_CSTRING("UTF-16BE")) && - !preferred.Equals(NS_LITERAL_CSTRING("UTF-16LE")) && - !preferred.Equals(NS_LITERAL_CSTRING("UTF-32BE")) && - !preferred.Equals(NS_LITERAL_CSTRING("UTF-32LE"))) { + if (!preferred.EqualsLiteral("UTF-16") && + !preferred.EqualsLiteral("UTF-16BE") && + !preferred.EqualsLiteral("UTF-16LE") && + !preferred.EqualsLiteral("UTF-32BE") && + !preferred.EqualsLiteral("UTF-32LE")) { // Propagate the error message so that the parser can // shutdown correctly. - Ref. Bug 96440 res = NotifyWebShell(aWebShell, @@ -377,11 +377,11 @@ NS_IMETHODIMP nsMetaCharsetObserver::GetCharsetFromCompatibilityTag( // the BOM detection. nsString* currentCharset = values->StringAt(numOfAttributes-3); if (!preferred.Equals(NS_LossyConvertUCS2toASCII(*currentCharset)) && - !preferred.Equals(NS_LITERAL_CSTRING("UTF-16")) && - !preferred.Equals(NS_LITERAL_CSTRING("UTF-16BE")) && - !preferred.Equals(NS_LITERAL_CSTRING("UTF-16LE")) && - !preferred.Equals(NS_LITERAL_CSTRING("UTF-32BE")) && - !preferred.Equals(NS_LITERAL_CSTRING("UTF-32LE"))) + !preferred.EqualsLiteral("UTF-16") && + !preferred.EqualsLiteral("UTF-16BE") && + !preferred.EqualsLiteral("UTF-16LE") && + !preferred.EqualsLiteral("UTF-32BE") && + !preferred.EqualsLiteral("UTF-32LE")) AppendASCIItoUTF16(preferred, aCharset); } } diff --git a/mozilla/intl/locale/src/nsLanguageAtomService.cpp b/mozilla/intl/locale/src/nsLanguageAtomService.cpp index 25f8e5cda72..64f910ae3de 100644 --- a/mozilla/intl/locale/src/nsLanguageAtomService.cpp +++ b/mozilla/intl/locale/src/nsLanguageAtomService.cpp @@ -183,11 +183,11 @@ nsLanguageAtomService::LookupLanguage(const PRUnichar* aLanguage, NS_ENSURE_TRUE(language, NS_ERROR_OUT_OF_MEMORY); nsXPIDLString langGroupStr; - if (lowered.Equals(NS_LITERAL_STRING("en-us"))) { + if (lowered.EqualsLiteral("en-us")) { langGroupStr.Assign(NS_LITERAL_STRING("x-western")); - } else if (lowered.Equals(NS_LITERAL_STRING("de-de"))) { + } else if (lowered.EqualsLiteral("de-de")) { langGroupStr.Assign(NS_LITERAL_STRING("x-western")); - } else if (lowered.Equals(NS_LITERAL_STRING("ja-jp"))) { + } else if (lowered.EqualsLiteral("ja-jp")) { langGroupStr.Assign(NS_LITERAL_STRING("ja")); } else { if (!mLangGroups) { diff --git a/mozilla/intl/locale/tests/nsLocaleTest.cpp b/mozilla/intl/locale/tests/nsLocaleTest.cpp index fe76c9bfdfb..e19e8f28076 100644 --- a/mozilla/intl/locale/tests/nsLocaleTest.cpp +++ b/mozilla/intl/locale/tests/nsLocaleTest.cpp @@ -840,15 +840,15 @@ posixlocale_reverse_conversion_test() // result = posix_locale->GetXPLocale("en_US",locale); NS_ASSERTION(NS_SUCCEEDED(result),"nsLocaleTest: GetXPLocale failed.\n"); - NS_ASSERTION(locale.Equals(NS_LITERAL_STRING("en-US")),"nsLocaleTest: GetXPLocale failed.\n"); + NS_ASSERTION(locale.EqualsLiteral("en-US"),"nsLocaleTest: GetXPLocale failed.\n"); result = posix_locale->GetXPLocale("C",locale); NS_ASSERTION(NS_SUCCEEDED(result),"nsLocaleTest: GetXPLocale failed.\n"); - NS_ASSERTION(locale.Equals(NS_LITERAL_STRING("en")),"nsLocaleTest: GetXPLocale failed.\n"); + NS_ASSERTION(locale.EqualsLiteral("en"),"nsLocaleTest: GetXPLocale failed.\n"); result = posix_locale->GetXPLocale("en",locale); NS_ASSERTION(NS_SUCCEEDED(result),"nsLocaleTest: GetXPLocale failed.\n"); - NS_ASSERTION(locale.Equals(NS_LITERAL_STRING("en")),"nsLocaleTest: GetXPLocale failed.\n"); + NS_ASSERTION(locale.EqualsLiteral("en"),"nsLocaleTest: GetXPLocale failed.\n"); posix_locale->Release(); diff --git a/mozilla/intl/lwbrk/src/nsLWBreakerFImp.cpp b/mozilla/intl/lwbrk/src/nsLWBreakerFImp.cpp index 585eb61d9b9..69c36930b47 100644 --- a/mozilla/intl/lwbrk/src/nsLWBreakerFImp.cpp +++ b/mozilla/intl/lwbrk/src/nsLWBreakerFImp.cpp @@ -90,25 +90,25 @@ nsresult nsLWBreakerFImp::GetBreaker(const nsAString& aParam, nsILineBreaker** oResult) { nsJISx4051LineBreaker *result; - if( aParam.Equals(NS_LITERAL_STRING("ja")) ) + if( aParam.EqualsLiteral("ja") ) { result = new nsJISx4051LineBreaker ( gJaNoBegin, sizeof(gJaNoBegin)/sizeof(PRUnichar), gJaNoEnd, sizeof(gJaNoEnd)/sizeof(PRUnichar)); } - else if(aParam.Equals(NS_LITERAL_STRING("ko"))) + else if(aParam.EqualsLiteral("ko")) { result = new nsJISx4051LineBreaker ( gKoNoBegin, sizeof(gKoNoBegin)/sizeof(PRUnichar), gKoNoEnd, sizeof(gKoNoEnd)/sizeof(PRUnichar)); } - else if(aParam.Equals(NS_LITERAL_STRING("tw"))) + else if(aParam.EqualsLiteral("tw")) { result = new nsJISx4051LineBreaker ( gTwNoBegin, sizeof(gTwNoBegin)/sizeof(PRUnichar), gTwNoEnd, sizeof(gTwNoEnd)/sizeof(PRUnichar)); } - else if(aParam.Equals(NS_LITERAL_STRING("cn"))) + else if(aParam.EqualsLiteral("cn")) { result = new nsJISx4051LineBreaker ( gCnNoBegin, sizeof(gCnNoBegin)/sizeof(PRUnichar), diff --git a/mozilla/intl/uconv/src/nsCharsetAliasImp.cpp b/mozilla/intl/uconv/src/nsCharsetAliasImp.cpp index 9168276a61c..5eb2cda11c7 100644 --- a/mozilla/intl/uconv/src/nsCharsetAliasImp.cpp +++ b/mozilla/intl/uconv/src/nsCharsetAliasImp.cpp @@ -79,18 +79,18 @@ NS_IMETHODIMP nsCharsetAlias2::GetPreferred(const nsACString& aAlias, // function *while loading* charsetalias.properties (see bug 190951), // so we might have an |mDelegate| already that isn't valid yet, but // the load is guaranteed to be "UTF-8" so things will be OK. - if(aKey.Equals(NS_LITERAL_CSTRING("utf-8"))) { + if(aKey.EqualsLiteral("utf-8")) { oResult = NS_LITERAL_CSTRING("UTF-8"); NS_TIMELINE_STOP_TIMER("nsCharsetAlias2:GetPreferred"); return NS_OK; } - if(aKey.Equals(NS_LITERAL_CSTRING("iso-8859-1"))) { + if(aKey.EqualsLiteral("iso-8859-1")) { oResult = NS_LITERAL_CSTRING("ISO-8859-1"); NS_TIMELINE_STOP_TIMER("nsCharsetAlias2:GetPreferred"); return NS_OK; } - if(aKey.Equals(NS_LITERAL_CSTRING("x-sjis")) || - aKey.Equals(NS_LITERAL_CSTRING("shift_jis"))) { + if(aKey.EqualsLiteral("x-sjis") || + aKey.EqualsLiteral("shift_jis")) { oResult = NS_LITERAL_CSTRING("Shift_JIS"); NS_TIMELINE_STOP_TIMER("nsCharsetAlias2:GetPreferred"); return NS_OK; diff --git a/mozilla/intl/uconv/src/nsOS2Charset.cpp b/mozilla/intl/uconv/src/nsOS2Charset.cpp index afaa75563ad..dc4127ca99a 100644 --- a/mozilla/intl/uconv/src/nsOS2Charset.cpp +++ b/mozilla/intl/uconv/src/nsOS2Charset.cpp @@ -98,12 +98,12 @@ nsresult nsPlatformCharset::MapToCharset(nsAString& inANSICodePage, nsACString& outCharset) { //delay loading os2charset.properties bundle if possible - if (inANSICodePage.Equals(NS_LITERAL_STRING("os2.850"))) { + if (inANSICodePage.EqualsLiteral("os2.850")) { outCharset = NS_LITERAL_CSTRING("IBM850"); return NS_OK; } - if (inANSICodePage.Equals(NS_LITERAL_STRING("os2.932"))) { + if (inANSICodePage.EqualsLiteral("os2.932")) { outCharset = NS_LITERAL_CSTRING("Shift_JIS"); return NS_OK; } diff --git a/mozilla/intl/uconv/src/nsWinCharset.cpp b/mozilla/intl/uconv/src/nsWinCharset.cpp index 268dbe26801..8dd322e95c1 100644 --- a/mozilla/intl/uconv/src/nsWinCharset.cpp +++ b/mozilla/intl/uconv/src/nsWinCharset.cpp @@ -92,12 +92,12 @@ nsresult nsPlatformCharset::MapToCharset(nsAString& inANSICodePage, nsACString& outCharset) { //delay loading wincharset.properties bundle if possible - if (inANSICodePage.Equals(NS_LITERAL_STRING("acp.1252"))) { + if (inANSICodePage.EqualsLiteral("acp.1252")) { outCharset = NS_LITERAL_CSTRING("windows-1252"); return NS_OK; } - if (inANSICodePage.Equals(NS_LITERAL_STRING("acp.932"))) { + if (inANSICodePage.EqualsLiteral("acp.932")) { outCharset = NS_LITERAL_CSTRING("Shift_JIS"); return NS_OK; } diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index f561e2c3c39..639e962dd5a 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -2820,7 +2820,7 @@ DocumentViewerImpl::GetPopupLinkNode(nsIDOMNode** aNode) } } } - if (anchor || area || link || xlinkType.Equals(NS_LITERAL_STRING("simple"))) { + if (anchor || area || link || xlinkType.EqualsLiteral("simple")) { *aNode = node; NS_IF_ADDREF(*aNode); // addref return NS_OK; diff --git a/mozilla/layout/style/nsCSSDeclaration.cpp b/mozilla/layout/style/nsCSSDeclaration.cpp index a4fa0923378..4cabda3844f 100644 --- a/mozilla/layout/style/nsCSSDeclaration.cpp +++ b/mozilla/layout/style/nsCSSDeclaration.cpp @@ -814,7 +814,7 @@ nsCSSDeclaration::TryBorderShorthand(nsAString & aString, PRUint32 aPropertiesSe nsAutoString valueString; AppendValueToString(eCSSProperty_border_top_color, valueString); - if (!valueString.Equals(NS_LITERAL_STRING("-moz-use-text-color"))) { + if (!valueString.EqualsLiteral("-moz-use-text-color")) { /* don't output this value, it's proprietary Mozilla and */ /* not intended to be exposed ; we can remove it from the */ /* values of the shorthand since this value represents the */ @@ -848,7 +848,7 @@ nsCSSDeclaration::TryBorderSideShorthand(nsAString & aString, nsAutoString valueString; AppendValueToString(OrderValueAt(aBorderColor-1), valueString); - if (!valueString.Equals(NS_LITERAL_STRING("-moz-use-text-color"))) { + if (!valueString.EqualsLiteral("-moz-use-text-color")) { aString.Append(NS_LITERAL_STRING(" ")); aString.Append(valueString); } diff --git a/mozilla/layout/style/nsCSSLoader.cpp b/mozilla/layout/style/nsCSSLoader.cpp index 2ae023ab90f..c72d3d75deb 100644 --- a/mozilla/layout/style/nsCSSLoader.cpp +++ b/mozilla/layout/style/nsCSSLoader.cpp @@ -769,8 +769,8 @@ SheetLoadData::OnStreamComplete(nsIUnicharStreamLoader* aLoader, channel->GetContentType(contentType); } - PRBool validType = contentType.Equals(NS_LITERAL_CSTRING("text/css")) || - contentType.Equals(NS_LITERAL_CSTRING(UNKNOWN_CONTENT_TYPE)) || + PRBool validType = contentType.EqualsLiteral("text/css") || + contentType.EqualsLiteral(UNKNOWN_CONTENT_TYPE) || contentType.IsEmpty(); if (mLoader->mCompatMode == eCompatibility_NavQuirks || validType) { diff --git a/mozilla/layout/style/nsStyleUtil.cpp b/mozilla/layout/style/nsStyleUtil.cpp index 4d4ed06aac9..241efe497e9 100644 --- a/mozilla/layout/style/nsStyleUtil.cpp +++ b/mozilla/layout/style/nsStyleUtil.cpp @@ -487,7 +487,7 @@ PRBool nsStyleUtil::IsSimpleXlink(nsIContent *aContent, nsIPresContext *aPresCon // see if it is type=simple (we don't deal with other types) nsAutoString val; aContent->GetAttr(kNameSpaceID_XLink, nsHTMLAtoms::type, val); - if (val == NS_LITERAL_STRING("simple")) { + if (val.EqualsLiteral("simple")) { // see if there is an xlink namespace'd href attribute: // - get it if there is, if not no big deal, it is not required for xlinks // is it bad to re-use val here? diff --git a/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp b/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp index 565464b3e7e..a0014edfd49 100644 --- a/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp @@ -612,7 +612,7 @@ nsresult nsAbAutoCompleteSession::SearchDirectory(const nsACString& aURI, nsAbAu if (!searchDuringLocalAutocomplete) return NS_OK; - if (!aURI.Equals(NS_LITERAL_CSTRING(kAllDirectoryRoot))) + if (!aURI.EqualsLiteral(kAllDirectoryRoot)) rv = SearchCards(directory, searchStr, results); if (!searchSubDirectory) diff --git a/mozilla/mailnews/addrbook/src/nsAbView.cpp b/mozilla/mailnews/addrbook/src/nsAbView.cpp index fa227c10c35..73e6889a8a8 100644 --- a/mozilla/mailnews/addrbook/src/nsAbView.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbView.cpp @@ -512,9 +512,9 @@ nsresult nsAbView::RefreshTree() // if neither the primary nor the secondary sorts are GeneratedName (or kPhoneticNameColumn), // all we have to do is invalidate (to show the new GeneratedNames), // but the sort will not change. - if (mSortColumn.Equals(NS_LITERAL_STRING(GENERATED_NAME_COLUMN_ID)) || - mSortColumn.Equals(NS_LITERAL_STRING(kPriEmailColumn)) || - mSortColumn.Equals(NS_LITERAL_STRING(kPhoneticNameColumn))) { + if (mSortColumn.EqualsLiteral(GENERATED_NAME_COLUMN_ID) || + mSortColumn.EqualsLiteral(kPriEmailColumn) || + mSortColumn.EqualsLiteral(kPhoneticNameColumn)) { rv = SortBy(mSortColumn.get(), mSortDirection.get()); } else { @@ -857,7 +857,7 @@ NS_IMETHODIMP nsAbView::Observe(nsISupports *aSubject, const char *aTopic, const if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) { nsDependentString prefName(someData); - if (prefName.Equals(NS_LITERAL_STRING(PREF_MAIL_ADDR_BOOK_LASTNAMEFIRST))) { + if (prefName.EqualsLiteral(PREF_MAIL_ADDR_BOOK_LASTNAMEFIRST)) { rv = SetGeneratedNameFormatFromPrefs(); NS_ENSURE_SUCCESS(rv,rv); @@ -1209,7 +1209,7 @@ NS_IMETHODIMP nsAbView::SwapFirstNameLastName() nsXPIDLString str; pls->ToString(getter_Copies(str)); - displayNameLastnamefirst = str.Equals(NS_LITERAL_STRING("true")); + displayNameLastnamefirst = str.EqualsLiteral("true"); nsCOMPtr bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); diff --git a/mozilla/mailnews/base/src/nsMessenger.cpp b/mozilla/mailnews/base/src/nsMessenger.cpp index 8145708417a..0baff96dd1d 100644 --- a/mozilla/mailnews/base/src/nsMessenger.cpp +++ b/mozilla/mailnews/base/src/nsMessenger.cpp @@ -475,7 +475,7 @@ nsMessenger::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) { nsDependentString prefName(aData); - if (prefName.Equals(NS_LITERAL_STRING(MAILNEWS_ALLOW_PLUGINS_PREF_NAME))) + if (prefName.EqualsLiteral(MAILNEWS_ALLOW_PLUGINS_PREF_NAME)) SetDisplayProperties(); } diff --git a/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp b/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp index f75da465f9d..3ad3b62ae04 100644 --- a/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp +++ b/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp @@ -1424,7 +1424,7 @@ nsMsgAccountManagerDataSource::Observe(nsISupports *aSubject, const char *aTopic if (!strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) { nsDependentString prefName(aData); - if (prefName.Equals(NS_LITERAL_STRING(PREF_SHOW_FAKE_ACCOUNT))) { + if (prefName.EqualsLiteral(PREF_SHOW_FAKE_ACCOUNT)) { NotifyObservers(kNC_AccountRoot, kNC_Child, kNC_PageTitleFakeAccount, PR_FALSE, PR_FALSE); NotifyObservers(kNC_AccountRoot, kNC_Settings, kNC_PageTitleFakeAccount, PR_FALSE, PR_FALSE); } diff --git a/mozilla/mailnews/base/src/nsMsgDBView.cpp b/mozilla/mailnews/base/src/nsMsgDBView.cpp index 632d878e6b9..a79031c73f1 100644 --- a/mozilla/mailnews/base/src/nsMsgDBView.cpp +++ b/mozilla/mailnews/base/src/nsMsgDBView.cpp @@ -487,7 +487,7 @@ nsresult nsMsgDBView::AppendSelectedTextColorProperties(nsMsgLabelValue label, n // means the highlight color will be black. // // We need to subtract 1 because mLabelPrefColors is 0 based. - if(mLabelPrefColors[label - 1].Equals(NS_LITERAL_STRING(LABEL_COLOR_WHITE_STRING))) + if(mLabelPrefColors[label - 1].EqualsLiteral(LABEL_COLOR_WHITE_STRING)) aProperties->AppendElement(kLabelColorBlackAtom); else aProperties->AppendElement(kLabelColorWhiteAtom); @@ -903,7 +903,7 @@ nsresult nsMsgDBView::CycleThreadedColumn(nsIDOMElement * aElement) // toggle threaded/unthreaded mode aElement->GetAttribute(NS_LITERAL_STRING("currentView"), currentView); - if (currentView.Equals(NS_LITERAL_STRING("threaded"))) + if (currentView.EqualsLiteral("threaded")) { aElement->SetAttribute(NS_LITERAL_STRING("currentView"), NS_LITERAL_STRING("unthreaded")); diff --git a/mozilla/mailnews/base/src/nsMsgMailSession.cpp b/mozilla/mailnews/base/src/nsMsgMailSession.cpp index 23420e5ec7b..1ccfdb935c5 100644 --- a/mozilla/mailnews/base/src/nsMsgMailSession.cpp +++ b/mozilla/mailnews/base/src/nsMsgMailSession.cpp @@ -328,8 +328,8 @@ nsresult nsMsgMailSession::GetTopmostMsgWindow(nsIMsgWindow* *aMsgWindow) rv = domElement->GetAttribute(NS_LITERAL_STRING("windowtype"), windowType); NS_ENSURE_SUCCESS(rv, rv); - if (windowType.Equals(NS_LITERAL_STRING("mail:3pane")) || - windowType.Equals(NS_LITERAL_STRING("mail:messageWindow"))) + if (windowType.EqualsLiteral("mail:3pane") || + windowType.EqualsLiteral("mail:messageWindow")) break; windowEnum->HasMoreElements(&more); diff --git a/mozilla/mailnews/base/util/nsMsgI18N.cpp b/mozilla/mailnews/base/util/nsMsgI18N.cpp index 6e0d09027d8..72f4813faf0 100644 --- a/mozilla/mailnews/base/util/nsMsgI18N.cpp +++ b/mozilla/mailnews/base/util/nsMsgI18N.cpp @@ -450,7 +450,7 @@ nsresult nsMsgI18NSaveAsCharset(const char* contentType, const char *charset, if (bTEXT_HTML) // For ISO-8859-1 only, convert to entity first (always generate entites like  ). res = conv->Init(charsetName.get(), - charsetName.Equals(NS_LITERAL_CSTRING("ISO-8859-1")) ? + charsetName.EqualsLiteral("ISO-8859-1") ? nsISaveAsCharset::attr_htmlTextDefault : nsISaveAsCharset::attr_EntityAfterCharsetConv + nsISaveAsCharset::attr_FallbackDecimalNCR, nsIEntityConverter::html32); @@ -465,7 +465,7 @@ nsresult nsMsgI18NSaveAsCharset(const char* contentType, const char *charset, // Mapping characters in a certain range (required for Japanese only) nsAutoString mapped; - if (charsetName.Equals(NS_LITERAL_CSTRING("ISO-2022-JP"))) { + if (charsetName.EqualsLiteral("ISO-2022-JP")) { static PRInt32 sSendHankakuKana = -1; if (sSendHankakuKana < 0) { nsCOMPtr prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID, &res)); diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.cpp b/mozilla/mailnews/compose/src/nsMsgCompose.cpp index 2f9ea55954a..9639683f413 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompose.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompose.cpp @@ -2114,7 +2114,7 @@ NS_IMETHODIMP QuotingOutputStreamListener::OnStopRequest(nsIRequest *request, ns if (! followUpTo.IsEmpty()) { // Handle "followup-to: poster" magic keyword here - if (followUpTo == NS_LITERAL_STRING("poster")) + if (followUpTo.EqualsLiteral("poster")) { nsCOMPtr composeWindow; nsCOMPtr prompt; @@ -3470,8 +3470,8 @@ nsMsgCompose::ProcessSignature(nsIMsgIdentity *identity, PRBool aQuoted, nsStrin { nsDependentSubstring firstFourChars(sigData, 0, 4); - if (!(firstFourChars.Equals(NS_LITERAL_STRING("-- \n")) || - firstFourChars.Equals(NS_LITERAL_STRING("-- \r")))) + if (!(firstFourChars.EqualsLiteral("-- \n") || + firstFourChars.EqualsLiteral("-- \r"))) { sigOutput.AppendWithConversion(dashes); @@ -3666,7 +3666,7 @@ static nsresult OpenAddressBook(const char * dbUri, nsIAddrDatabase** aDatabase) nsresult nsMsgCompose::GetABDirectories(const nsACString& dirUri, nsISupportsArray* directoriesArray, PRBool searchSubDirectory) { static PRBool collectedAddressbookFound; - if (dirUri.Equals(NS_LITERAL_CSTRING(kMDBDirectoryRoot))) + if (dirUri.EqualsLiteral(kMDBDirectoryRoot)) collectedAddressbookFound = PR_FALSE; nsresult rv = NS_OK; @@ -4264,7 +4264,7 @@ nsresult nsMsgCompose::TagConvertible(nsIDOMNode *node, PRInt32 *_retval) else if (NS_SUCCEEDED(domElement->HasAttribute(NS_LITERAL_STRING("text"), &hasAttribute)) && hasAttribute && NS_SUCCEEDED(domElement->GetAttribute(NS_LITERAL_STRING("text"), color)) && - !color.Equals(NS_LITERAL_STRING("#000000"))) { + !color.EqualsLiteral("#000000")) { *_retval = nsIMsgCompConvertible::Altering; } else if (NS_SUCCEEDED(domElement->HasAttribute(NS_LITERAL_STRING("bgcolor"), &hasAttribute)) && @@ -4647,7 +4647,7 @@ nsresult nsMsgCompose::SetSignature(nsIMsgIdentity *identity) if (tempNode) { tempNode->GetLocalName(tagLocalName); - if (tagLocalName.Equals(NS_LITERAL_STRING("BR"))) + if (tagLocalName.EqualsLiteral("BR")) m_editor->DeleteNode(tempNode); } m_editor->EndTransaction(); @@ -4668,7 +4668,7 @@ nsresult nsMsgCompose::SetSignature(nsIMsgIdentity *identity) switch (searchState) { case 0: - if (nodeType == nsIDOMNode::ELEMENT_NODE && tagLocalName.Equals(NS_LITERAL_STRING("BR"))) + if (nodeType == nsIDOMNode::ELEMENT_NODE && tagLocalName.EqualsLiteral("BR")) searchState = 1; break; @@ -4678,11 +4678,11 @@ nsresult nsMsgCompose::SetSignature(nsIMsgIdentity *identity) { nsString nodeValue; node->GetNodeValue(nodeValue); - if (nodeValue.Equals(NS_LITERAL_STRING("-- "))) + if (nodeValue.EqualsLiteral("-- ")) searchState = 2; } else - if (nodeType == nsIDOMNode::ELEMENT_NODE && tagLocalName.Equals(NS_LITERAL_STRING("BR"))) + if (nodeType == nsIDOMNode::ELEMENT_NODE && tagLocalName.EqualsLiteral("BR")) { searchState = 1; break; @@ -4690,7 +4690,7 @@ nsresult nsMsgCompose::SetSignature(nsIMsgIdentity *identity) break; case 2: - if (nodeType == nsIDOMNode::ELEMENT_NODE && tagLocalName.Equals(NS_LITERAL_STRING("BR"))) + if (nodeType == nsIDOMNode::ELEMENT_NODE && tagLocalName.EqualsLiteral("BR")) searchState = 3; else searchState = 0; diff --git a/mozilla/mailnews/compose/src/nsMsgComposeService.cpp b/mozilla/mailnews/compose/src/nsMsgComposeService.cpp index 9553c3bc150..3af8e04bbb5 100644 --- a/mozilla/mailnews/compose/src/nsMsgComposeService.cpp +++ b/mozilla/mailnews/compose/src/nsMsgComposeService.cpp @@ -335,7 +335,7 @@ nsMsgComposeService::Observe(nsISupports *aSubject, const char *aTopic, const PR if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) { nsDependentString prefName(someData); - if (prefName.Equals(NS_LITERAL_STRING(PREF_MAIL_COMPOSE_MAXRECYCLEDWINDOWS))) + if (prefName.EqualsLiteral(PREF_MAIL_COMPOSE_MAXRECYCLEDWINDOWS)) Reset(); return NS_OK; } diff --git a/mozilla/mailnews/compose/src/nsURLFetcher.cpp b/mozilla/mailnews/compose/src/nsURLFetcher.cpp index a2e509fa0ad..7f43965f3d6 100644 --- a/mozilla/mailnews/compose/src/nsURLFetcher.cpp +++ b/mozilla/mailnews/compose/src/nsURLFetcher.cpp @@ -496,7 +496,7 @@ NS_IMETHODIMP nsURLFetcherStreamConsumer::OnStopRequest(nsIRequest *aRequest, ns if(!aChannel) return NS_ERROR_FAILURE; if (NS_SUCCEEDED(aChannel->GetContentType(contentType)) && - !contentType.Equals(NS_LITERAL_CSTRING(UNKNOWN_CONTENT_TYPE))) + !contentType.EqualsLiteral(UNKNOWN_CONTENT_TYPE)) { mURLFetcher->mContentType = contentType; } diff --git a/mozilla/mailnews/db/msgdb/src/nsDBFolderInfo.cpp b/mozilla/mailnews/db/msgdb/src/nsDBFolderInfo.cpp index 22d796396ff..3efa1dbc45f 100644 --- a/mozilla/mailnews/db/msgdb/src/nsDBFolderInfo.cpp +++ b/mozilla/mailnews/db/msgdb/src/nsDBFolderInfo.cpp @@ -112,7 +112,7 @@ NS_IMETHODIMP nsFolderCharsetObserver::Observe(nsISupports *aSubject, const char { nsDependentString prefName(someData); - if (prefName.Equals(NS_LITERAL_STRING(kMAILNEWS_VIEW_DEFAULT_CHARSET))) + if (prefName.EqualsLiteral(kMAILNEWS_VIEW_DEFAULT_CHARSET)) { nsCOMPtr pls; rv = prefBranch->GetComplexValue(kMAILNEWS_VIEW_DEFAULT_CHARSET, @@ -125,7 +125,7 @@ NS_IMETHODIMP nsFolderCharsetObserver::Observe(nsISupports *aSubject, const char gDefaultCharacterSet.AssignWithConversion(ucsval.get()); } } - else if (prefName.Equals(NS_LITERAL_STRING(kMAILNEWS_DEFAULT_CHARSET_OVERRIDE))) + else if (prefName.EqualsLiteral(kMAILNEWS_DEFAULT_CHARSET_OVERRIDE)) { rv = prefBranch->GetBoolPref(kMAILNEWS_DEFAULT_CHARSET_OVERRIDE, &gDefaultCharacterOverride); } diff --git a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp index 126df1b9f04..59e500b3253 100644 --- a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp +++ b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp @@ -1327,15 +1327,15 @@ NS_IMETHODIMP nsImapIncomingServer::PossibleImapMailbox(const char *folderPath, //make sure rv value is not crunched, it is used to SetPrettyName nsXPIDLCString redirectorType; GetRedirectorType(getter_Copies(redirectorType)); //Sent mail folder as per aol/netscape webmail - if ((redirectorType.Equals(NS_LITERAL_CSTRING("aol")) && onlineName.Equals(NS_LITERAL_CSTRING("Sent Items"))) - || (redirectorType.Equals(NS_LITERAL_CSTRING("netscape")) && onlineName.Equals(NS_LITERAL_CSTRING("Sent")))) + if ((redirectorType.EqualsLiteral("aol") && onlineName.EqualsLiteral("Sent Items")) + || (redirectorType.EqualsLiteral("netscape") && onlineName.EqualsLiteral("Sent"))) //we know that we don't allowConversion for netscape webmail so just use the onlineName child->SetFlag(MSG_FOLDER_FLAG_SENTMAIL); - else if (redirectorType.Equals(NS_LITERAL_CSTRING("netscape")) && onlineName.Equals(NS_LITERAL_CSTRING("Draft"))) + else if (redirectorType.EqualsLiteral("netscape") && onlineName.EqualsLiteral("Draft")) child->SetFlag(MSG_FOLDER_FLAG_DRAFTS); - else if (redirectorType.Equals(NS_LITERAL_CSTRING("aol")) && onlineName.Equals(NS_LITERAL_CSTRING("RECYCLE"))) + else if (redirectorType.EqualsLiteral("aol") && onlineName.EqualsLiteral("RECYCLE")) child->SetFlag(MSG_FOLDER_FLAG_TRASH); if (NS_SUCCEEDED(rv)) diff --git a/mozilla/mailnews/imap/src/nsImapProtocol.cpp b/mozilla/mailnews/imap/src/nsImapProtocol.cpp index dce055e95ef..6b71ca4fd35 100644 --- a/mozilla/mailnews/imap/src/nsImapProtocol.cpp +++ b/mozilla/mailnews/imap/src/nsImapProtocol.cpp @@ -7394,7 +7394,7 @@ void nsImapProtocol::GetQuotaDataIfSupported(const char *aBoxName) return; nsXPIDLCString redirectorType; imapServer->GetRedirectorType(getter_Copies(redirectorType)); - if (redirectorType.Equals(NS_LITERAL_CSTRING("aol")) && PL_strcasecmp("Inbox", aBoxName)) + if (redirectorType.EqualsLiteral("aol") && PL_strcasecmp("Inbox", aBoxName)) return; IncrementCommandTagNumber(); diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraWin32.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraWin32.cpp index 9900ed84867..d428380aafc 100644 --- a/mozilla/mailnews/import/eudora/src/nsEudoraWin32.cpp +++ b/mozilla/mailnews/import/eudora/src/nsEudoraWin32.cpp @@ -287,7 +287,7 @@ nsresult nsEudoraWin32::IterateMailDir( nsIFileSpec *pFolder, nsISupportsArray * name = fName; } ToLowerCase(ext); - if (ext.Equals(NS_LITERAL_CSTRING(".fol"))) { + if (ext.EqualsLiteral(".fol")) { isFolder = PR_FALSE; entry->IsDirectory( &isFolder); if (isFolder) { @@ -301,7 +301,7 @@ nsresult nsEudoraWin32::IterateMailDir( nsIFileSpec *pFolder, nsISupportsArray * } } } - else if (ext.Equals(NS_LITERAL_CSTRING(".mbx"))) { + else if (ext.EqualsLiteral(".mbx")) { isFile = PR_FALSE; entry->IsFile( &isFile); if (isFile) { @@ -993,7 +993,7 @@ PRBool nsEudoraWin32::FindMimeIniFile( nsIFileSpec *pSpec) name = fName; } ToLowerCase(ext); - if (ext.Equals(NS_LITERAL_CSTRING(".ini"))) { + if (ext.EqualsLiteral(".ini")) { isFile = PR_FALSE; entry->IsFile( &isFile); if (isFile) { @@ -1352,7 +1352,7 @@ nsresult nsEudoraWin32::ScanAddressDir( nsIFileSpec *pDir, nsISupportsArray *pAr name = fName; } ToLowerCase(ext); - if (ext.Equals(NS_LITERAL_CSTRING(".txt"))) { + if (ext.EqualsLiteral(".txt")) { isFile = PR_FALSE; entry->IsFile( &isFile); if (isFile) { diff --git a/mozilla/mailnews/import/outlook/src/MapiApi.cpp b/mozilla/mailnews/import/outlook/src/MapiApi.cpp index 9a196f57545..020147d8ce0 100644 --- a/mozilla/mailnews/import/outlook/src/MapiApi.cpp +++ b/mozilla/mailnews/import/outlook/src/MapiApi.cpp @@ -310,22 +310,22 @@ BOOL CGetStoreFoldersIter::ExcludeFolderClass( const PRUnichar *pName) nsDependentString pNameStr(pName); if (m_isMail) { bResult = FALSE; - if (pNameStr.Equals(NS_LITERAL_STRING("IPF.Appointment"))) + if (pNameStr.EqualsLiteral("IPF.Appointment")) bResult = TRUE; - else if (pNameStr.Equals(NS_LITERAL_STRING("IPF.Contact"))) + else if (pNameStr.EqualsLiteral("IPF.Contact")) bResult = TRUE; - else if (pNameStr.Equals(NS_LITERAL_STRING("IPF.Journal"))) + else if (pNameStr.EqualsLiteral("IPF.Journal")) bResult = TRUE; - else if (pNameStr.Equals(NS_LITERAL_STRING("IPF.StickyNote"))) + else if (pNameStr.EqualsLiteral("IPF.StickyNote")) bResult = TRUE; - else if (pNameStr.Equals(NS_LITERAL_STRING("IPF.Task"))) + else if (pNameStr.EqualsLiteral("IPF.Task")) bResult = TRUE; // else if (!stricmp( pName, "IPF.Note")) // bResult = TRUE; } else { bResult = TRUE; - if (pNameStr.Equals(NS_LITERAL_STRING("IPF.Contact"))) + if (pNameStr.EqualsLiteral("IPF.Contact")) bResult = FALSE; } diff --git a/mozilla/mailnews/import/outlook/src/nsOutlookMail.cpp b/mozilla/mailnews/import/outlook/src/nsOutlookMail.cpp index 3ea05181b79..2799d1e5d8c 100644 --- a/mozilla/mailnews/import/outlook/src/nsOutlookMail.cpp +++ b/mozilla/mailnews/import/outlook/src/nsOutlookMail.cpp @@ -980,7 +980,7 @@ nsresult nsOutlookMail::ImportAddresses( PRUint32 *pCount, PRUint32 *pTotal, con if (pVal) { type.Truncate( 0); m_mapi.GetStringFromProp( pVal, type); - if (type.Equals(NS_LITERAL_CSTRING("IPM.Contact"))) { + if (type.EqualsLiteral("IPM.Contact")) { // This is a contact, add it to the address book! subject.Truncate( 0); pVal = m_mapi.GetMapiProperty( lpMsg, PR_SUBJECT); @@ -998,7 +998,7 @@ nsresult nsOutlookMail::ImportAddresses( PRUint32 *pCount, PRUint32 *pTotal, con } } } - else if (type.Equals(NS_LITERAL_CSTRING("IPM.DistList"))) + else if (type.EqualsLiteral("IPM.DistList")) { // This is a list/group, add it to the address book! subject.Truncate( 0); diff --git a/mozilla/mailnews/mime/src/mimetpfl.cpp b/mozilla/mailnews/mime/src/mimetpfl.cpp index be8e8d39dc0..d692e3229d1 100644 --- a/mozilla/mailnews/mime/src/mimetpfl.cpp +++ b/mozilla/mailnews/mime/src/mimetpfl.cpp @@ -433,8 +433,8 @@ MimeInlineTextPlainFlowed_parse_line (char *line, PRInt32 length, MimeObject *ob && lineSource[0] == '-' && ( - Substring(lineSource, 0, 4).Equals(NS_LITERAL_STRING("-- \r")) || - Substring(lineSource, 0, 4).Equals(NS_LITERAL_STRING("-- \n")) + Substring(lineSource, 0, 4).EqualsLiteral("-- \r") || + Substring(lineSource, 0, 4).EqualsLiteral("-- \n") ) ) { diff --git a/mozilla/mailnews/mime/src/mimetpla.cpp b/mozilla/mailnews/mime/src/mimetpla.cpp index 26fc7369f92..9e0ed262222 100644 --- a/mozilla/mailnews/mime/src/mimetpla.cpp +++ b/mozilla/mailnews/mime/src/mimetpla.cpp @@ -435,7 +435,7 @@ MimeInlineTextPlain_parse_line (char *line, PRInt32 length, MimeObject *obj) // recognize signature if ((lineSourceStr.Length() >= 4) && lineSourceStr.First() == '-' - && Substring(lineSourceStr, 0, 3).Equals(NS_LITERAL_STRING("-- ")) + && Substring(lineSourceStr, 0, 3).EqualsLiteral("-- ") && (lineSourceStr[3] == '\r' || lineSourceStr[3] == '\n') ) { text->mIsSig = PR_TRUE; diff --git a/mozilla/modules/oji/src/nsJVMConfigManagerUnix.cpp b/mozilla/modules/oji/src/nsJVMConfigManagerUnix.cpp index e9567fe2150..2be01156936 100644 --- a/mozilla/modules/oji/src/nsJVMConfigManagerUnix.cpp +++ b/mozilla/modules/oji/src/nsJVMConfigManagerUnix.cpp @@ -316,7 +316,7 @@ nsJVMConfigManagerUnix::ParseLine(nsAString& aLine) NS_ENSURE_SUCCESS(rv, rv); nsAutoString testPathStr(pathStr); - if (type.Equals(NS_LITERAL_STRING("jdk"))) + if (type.EqualsLiteral("jdk")) testPathStr.Append(NS_LITERAL_STRING("/jre")); testPathStr.Append(mozillaPluginPath); diff --git a/mozilla/netwerk/base/src/nsProtocolProxyService.cpp b/mozilla/netwerk/base/src/nsProtocolProxyService.cpp index 0f07b04b259..de927457452 100644 --- a/mozilla/netwerk/base/src/nsProtocolProxyService.cpp +++ b/mozilla/netwerk/base/src/nsProtocolProxyService.cpp @@ -527,25 +527,25 @@ nsProtocolProxyService::ExamineForProxy(nsIURI *aURI, nsIProxyInfo **aResult) } if (!mHTTPProxyHost.IsEmpty() && mHTTPProxyPort > 0 && - scheme.Equals(NS_LITERAL_CSTRING("http"))) { + scheme.EqualsLiteral("http")) { host = ToNewCString(mHTTPProxyHost); type = kProxyType_HTTP; port = mHTTPProxyPort; } else if (!mHTTPSProxyHost.IsEmpty() && mHTTPSProxyPort > 0 && - scheme.Equals(NS_LITERAL_CSTRING("https"))) { + scheme.EqualsLiteral("https")) { host = ToNewCString(mHTTPSProxyHost); type = kProxyType_HTTP; port = mHTTPSProxyPort; } else if (!mFTPProxyHost.IsEmpty() && mFTPProxyPort > 0 && - scheme.Equals(NS_LITERAL_CSTRING("ftp"))) { + scheme.EqualsLiteral("ftp")) { host = ToNewCString(mFTPProxyHost); type = kProxyType_HTTP; port = mFTPProxyPort; } else if (!mGopherProxyHost.IsEmpty() && mGopherProxyPort > 0 && - scheme.Equals(NS_LITERAL_CSTRING("gopher"))) { + scheme.EqualsLiteral("gopher")) { host = ToNewCString(mGopherProxyHost); type = kProxyType_HTTP; port = mGopherProxyPort; diff --git a/mozilla/netwerk/cookie/src/nsCookieService.cpp b/mozilla/netwerk/cookie/src/nsCookieService.cpp index 77d449bb837..3c33519b115 100644 --- a/mozilla/netwerk/cookie/src/nsCookieService.cpp +++ b/mozilla/netwerk/cookie/src/nsCookieService.cpp @@ -1667,7 +1667,7 @@ nsCookieService::CheckPrefs(nsIURI *aHostURI, } // don't let ftp sites get/set cookies (could be a security issue) - if (currentURIScheme.Equals(NS_LITERAL_CSTRING("ftp"))) { + if (currentURIScheme.EqualsLiteral("ftp")) { COOKIE_LOGFAILURE(aCookieHeader ? SET_COOKIE : GET_COOKIE, aHostURI, aCookieHeader, "ftp sites cannot read cookies"); return STATUS_REJECTED_WITH_ERROR; } diff --git a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp index 5488def95eb..dc04769fab8 100644 --- a/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp +++ b/mozilla/netwerk/protocol/ftp/src/nsFtpConnectionThread.cpp @@ -2233,7 +2233,7 @@ nsFtpState::Init(nsIFTPChannel* aChannel, if (NS_FAILED(rv)) return rv; - if (!uname.IsEmpty() && !uname.Equals(NS_LITERAL_CSTRING("anonymous"))) { + if (!uname.IsEmpty() && !uname.EqualsLiteral("anonymous")) { mAnonymous = PR_FALSE; CopyUTF8toUTF16(NS_UnescapeURL(uname), mUsername); diff --git a/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp b/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp index 405b756bd00..822ce606129 100644 --- a/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp @@ -794,15 +794,15 @@ nsHttpChannel::ProcessNormal() // Apache installs. const char *encoding = mResponseHead->PeekHeader(nsHttp::Content_Encoding); if (encoding && PL_strcasestr(encoding, "gzip") && ( - mResponseHead->ContentType().Equals(NS_LITERAL_CSTRING(APPLICATION_GZIP)) || - mResponseHead->ContentType().Equals(NS_LITERAL_CSTRING(APPLICATION_GZIP2)) || - mResponseHead->ContentType().Equals(NS_LITERAL_CSTRING(APPLICATION_GZIP3)))) { + mResponseHead->ContentType().EqualsLiteral(APPLICATION_GZIP) || + mResponseHead->ContentType().EqualsLiteral(APPLICATION_GZIP2) || + mResponseHead->ContentType().EqualsLiteral(APPLICATION_GZIP3))) { // clear the Content-Encoding header mResponseHead->ClearHeader(nsHttp::Content_Encoding); } else if (encoding && PL_strcasestr(encoding, "compress") && ( - mResponseHead->ContentType().Equals(NS_LITERAL_CSTRING(APPLICATION_COMPRESS)) || - mResponseHead->ContentType().Equals(NS_LITERAL_CSTRING(APPLICATION_COMPRESS2)))) { + mResponseHead->ContentType().EqualsLiteral(APPLICATION_COMPRESS) || + mResponseHead->ContentType().EqualsLiteral(APPLICATION_COMPRESS2))) { // clear the Content-Encoding header mResponseHead->ClearHeader(nsHttp::Content_Encoding); } diff --git a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp index 5bb2d544ed1..c59bdfe98c6 100644 --- a/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp +++ b/mozilla/parser/htmlparser/robot/nsDebugRobot.cpp @@ -95,15 +95,15 @@ NS_IMETHODIMP RobotSinkObserver::ProcessLink(const nsString& aURLSpec) // Geez this is ugly. temporary hack to only process html files str.Truncate(); nsString(aURLSpec).Right(str,1); - if (!str.Equals(NS_LITERAL_STRING("/"))) + if (!str.EqualsLiteral("/")) { str.Truncate(); nsString(aURLSpec).Right(str,4); - if (!str.Equals(NS_LITERAL_STRING("html"))) + if (!str.EqualsLiteral("html")) { str.Truncate(); nsString(aURLSpec).Right(str,3); - if (!str.Equals(NS_LITERAL_STRING("htm"))) + if (!str.EqualsLiteral("htm")) return NS_OK; } } @@ -124,7 +124,7 @@ NS_IMETHODIMP RobotSinkObserver::ProcessLink(const nsString& aURLSpec) g_duplicateList->AppendElement(new nsString(aURLSpec)); str.Truncate(); nsString(aURLSpec).Left(str,5); - if (str.Equals(NS_LITERAL_STRING("http:"))) { + if (str.EqualsLiteral("http:")) { ++g_iProcessed; if (g_iProcessed == (g_iMaxProcess > 0 ? g_iMaxProcess-1 : 0)) g_bHitTop = PR_TRUE; diff --git a/mozilla/parser/htmlparser/robot/nsRobotSink.cpp b/mozilla/parser/htmlparser/robot/nsRobotSink.cpp index ef2ed62cd96..83e5959ac7e 100644 --- a/mozilla/parser/htmlparser/robot/nsRobotSink.cpp +++ b/mozilla/parser/htmlparser/robot/nsRobotSink.cpp @@ -245,7 +245,7 @@ NS_IMETHODIMP RobotSink::OpenContainer(const nsIParserNode& aNode) { nsAutoString tmp; tmp.Assign(aNode.GetText()); ToLowerCase(tmp); - if (tmp.Equals(NS_LITERAL_STRING("a"))) { + if (tmp.EqualsLiteral("a")) { nsAutoString k, v; PRInt32 ac = aNode.GetAttributeCount(); for (PRInt32 i = 0; i < ac; ++i) { @@ -253,7 +253,7 @@ NS_IMETHODIMP RobotSink::OpenContainer(const nsIParserNode& aNode) const nsAString& key = aNode.GetKeyAt(i); k.Assign(key); ToLowerCase(k); - if (k.Equals(NS_LITERAL_STRING("href"))) { + if (k.EqualsLiteral("href")) { // Get value and remove mandatory quotes v.Truncate(); v.Append(aNode.GetValueAt(i)); diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp index 381109c41c6..e493fd5240b 100644 --- a/mozilla/parser/htmlparser/src/CNavDTD.cpp +++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp @@ -701,11 +701,11 @@ PRBool DoesRequireBody(CToken* aToken,nsITokenizer* aTokenizer) { const nsAString& name=attr->GetKey(); const nsAString& value=attr->GetValue(); - if((name.Equals(NS_LITERAL_STRING("type")) || - name.Equals(NS_LITERAL_STRING("TYPE"))) + if((name.EqualsLiteral("type") || + name.EqualsLiteral("TYPE")) && - !(value.Equals(NS_LITERAL_STRING("hidden")) || - value.Equals(NS_LITERAL_STRING("HIDDEN")))) { + !(value.EqualsLiteral("hidden") || + value.EqualsLiteral("HIDDEN"))) { result=PR_TRUE; break; } diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp index e605e5194aa..143e6947f42 100644 --- a/mozilla/parser/htmlparser/src/nsParser.cpp +++ b/mozilla/parser/htmlparser/src/nsParser.cpp @@ -1080,12 +1080,12 @@ void DetermineParseMode(const nsString& aBuffer, eParserDocType& aDocType, const nsACString& aMimeType) { - if (aMimeType.Equals(NS_LITERAL_CSTRING(kHTMLTextContentType))) { + if (aMimeType.EqualsLiteral(kHTMLTextContentType)) { DetermineHTMLParseMode(aBuffer, aParseMode, aDocType); - } else if (aMimeType.Equals(NS_LITERAL_CSTRING(kPlainTextContentType)) || - aMimeType.Equals(NS_LITERAL_CSTRING(kTextCSSContentType)) || - aMimeType.Equals(NS_LITERAL_CSTRING(kApplicationJSContentType)) || - aMimeType.Equals(NS_LITERAL_CSTRING(kTextJSContentType))) { + } else if (aMimeType.EqualsLiteral(kPlainTextContentType) || + aMimeType.EqualsLiteral(kTextCSSContentType) || + aMimeType.EqualsLiteral(kApplicationJSContentType) || + aMimeType.EqualsLiteral(kTextJSContentType)) { aDocType = ePlainText; aParseMode = eDTDMode_quirks; } else { // Some form of XML @@ -2181,7 +2181,7 @@ nsParser::DetectMetaTag(const char* aBytes, // XXX Only look inside HTML documents for now. For XML // documents we should be looking inside the XMLDecl. - if (!mParserContext->mMimeType.Equals(NS_LITERAL_CSTRING(kHTMLTextContentType))) { + if (!mParserContext->mMimeType.EqualsLiteral(kHTMLTextContentType)) { return PR_FALSE; } @@ -2331,11 +2331,11 @@ ParserWriteFunc(nsIInputStream* in, // one of a designated set that we ignore. if (NS_SUCCEEDED(result) && ((kCharsetFromByteOrderMark == guessSource) || - (!preferred.Equals(NS_LITERAL_CSTRING("UTF-16")) && - !preferred.Equals(NS_LITERAL_CSTRING("UTF-16BE")) && - !preferred.Equals(NS_LITERAL_CSTRING("UTF-16LE")) && - !preferred.Equals(NS_LITERAL_CSTRING("UTF-32BE")) && - !preferred.Equals(NS_LITERAL_CSTRING("UTF-32LE"))))) { + (!preferred.EqualsLiteral("UTF-16") && + !preferred.EqualsLiteral("UTF-16BE") && + !preferred.EqualsLiteral("UTF-16LE") && + !preferred.EqualsLiteral("UTF-32BE") && + !preferred.EqualsLiteral("UTF-32LE")))) { guess = preferred; pws->mParser->SetDocumentCharset(guess, guessSource); pws->mParser->SetSinkCharset(preferred); @@ -2450,7 +2450,7 @@ nsresult nsParser::OnStopRequest(nsIRequest *request, nsISupports* aContext, //If you're here, then OnDataAvailable() never got called. //Prior to necko, we never dealt with this case, but the problem may have existed. //What we'll do (for now at least) is construct a blank HTML document. - if (!mParserContext->mMimeType.Equals(NS_LITERAL_CSTRING(kPlainTextContentType))) + if (!mParserContext->mMimeType.EqualsLiteral(kPlainTextContentType)) { temp.Assign(NS_LITERAL_STRING("")); } diff --git a/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp b/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp index 394e716c182..633034fa4e3 100644 --- a/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp +++ b/mozilla/parser/htmlparser/tests/outsinks/Convert.cpp @@ -149,8 +149,8 @@ HTML2text(nsString& inString, nsString& inType, nsString& outType, } #else /* USE_SERIALIZER */ nsCOMPtr sink; - if (inType != NS_LITERAL_STRING("text/html") - || outType != NS_LITERAL_STRING("text/plain")) + if (!inType.EqualsLiteral("text/html") + || !outType.EqualsLiteral("text/plain")) { char* in = ToNewCString(inType); char* out = ToNewCString(outType); @@ -171,7 +171,7 @@ HTML2text(nsString& inString, nsString& inType, nsString& outType, parser->SetContentSink(sink); nsCOMPtr dtd; - if (inType.Equals(NS_LITERAL_STRING("text/html"))) { + if (inType.EqualsLiteral("text/html")) { static NS_DEFINE_CID(kNavDTDCID, NS_CNAVDTD_CID); rv=nsComponentManager::CreateInstance(kNavDTDCID,nsnull,NS_GET_IID(nsIDTD),getter_AddRefs(dtd)); } diff --git a/mozilla/rdf/base/src/nsRDFContentSink.cpp b/mozilla/rdf/base/src/nsRDFContentSink.cpp index 23e673c4507..743a5fb9716 100644 --- a/mozilla/rdf/base/src/nsRDFContentSink.cpp +++ b/mozilla/rdf/base/src/nsRDFContentSink.cpp @@ -1122,15 +1122,15 @@ RDFContentSinkImpl::SetParseMode(const PRUnichar **aAttributes) nsRDFParserUtils::StripAndConvert(v); if (!nameSpaceURI || 0 == PL_strcmp(nameSpaceURI, kRDFNameSpaceURI)) { - if (v == NS_LITERAL_STRING("Resource")) + if (v.EqualsLiteral("Resource")) mParseMode = eRDFContentSinkParseMode_Resource; break; } else if (0 == PL_strcmp(nameSpaceURI, kNCNameSpaceURI)) { - if (v == NS_LITERAL_STRING("Date")) + if (v.EqualsLiteral("Date")) mParseMode = eRDFContentSinkParseMode_Date; - else if (v == NS_LITERAL_STRING("Integer")) + else if (v.EqualsLiteral("Integer")) mParseMode = eRDFContentSinkParseMode_Int; break; diff --git a/mozilla/rdf/chrome/src/nsChromeRegistry.cpp b/mozilla/rdf/chrome/src/nsChromeRegistry.cpp index c5aa51613ad..a2916186269 100644 --- a/mozilla/rdf/chrome/src/nsChromeRegistry.cpp +++ b/mozilla/rdf/chrome/src/nsChromeRegistry.cpp @@ -577,10 +577,10 @@ nsChromeRegistry::GetBaseURL(const nsACString& aPackage, // Follow the "selectedSkin" or "selectedLocale" arc. nsCOMPtr arc; - if (aProvider.Equals(NS_LITERAL_CSTRING("skin"))) { + if (aProvider.EqualsLiteral("skin")) { arc = mSelectedSkin; } - else if (aProvider.Equals(NS_LITERAL_CSTRING("locale"))) { + else if (aProvider.EqualsLiteral("locale")) { arc = mSelectedLocale; } else @@ -664,8 +664,8 @@ nsChromeRegistry::GetOverrideURL(const nsACString& aPackage, // skins and locales get their name tacked on, like // skin/modern/foo.css or // locale/en-US/navigator.properties - if (aProvider.Equals(NS_LITERAL_CSTRING("skin")) || - aProvider.Equals(NS_LITERAL_CSTRING("locale"))) { + if (aProvider.EqualsLiteral("skin") || + aProvider.EqualsLiteral("locale")) { // little hack here to get the right arc nsIRDFResource* providerArc; @@ -2443,7 +2443,7 @@ nsChromeRegistry::InstallProvider(const nsACString& aProviderType, // See if we're a packages seq in a skin/locale. If so, we need to set up the baseURL, allowScripts // and package arcs. - if (val.Find(":packages") != -1 && !aProviderType.Equals(NS_LITERAL_CSTRING("package"))) { + if (val.Find(":packages") != -1 && !aProviderType.EqualsLiteral("package")) { PRBool doAppendPackage = appendPackage; PRInt32 perProviderPackageCount; container->GetCount(&perProviderPackageCount); @@ -2500,7 +2500,7 @@ nsChromeRegistry::InstallProvider(const nsACString& aProviderType, rv = nsChromeRegistry::UpdateArc(installSource, entry, mBaseURL, baseLiteral, aRemove); if (NS_FAILED(rv)) return rv; - if (aProviderType.Equals(NS_LITERAL_CSTRING("skin")) && !aAllowScripts) { + if (aProviderType.EqualsLiteral("skin") && !aAllowScripts) { rv = nsChromeRegistry::UpdateArc(installSource, entry, mAllowScripts, scriptLiteral, aRemove); if (NS_FAILED(rv)) return rv; } diff --git a/mozilla/security/manager/ssl/src/nsCrypto.cpp b/mozilla/security/manager/ssl/src/nsCrypto.cpp index 0da499ac403..c8bf6d7feaf 100644 --- a/mozilla/security/manager/ssl/src/nsCrypto.cpp +++ b/mozilla/security/manager/ssl/src/nsCrypto.cpp @@ -2167,8 +2167,8 @@ nsCrypto::SignText(const nsAString& aStringToSign, const nsAString& aCaOption, return NS_OK; } - if (!aCaOption.Equals(NS_LITERAL_STRING("auto")) && - !aCaOption.Equals(NS_LITERAL_STRING("ask"))) { + if (!aCaOption.EqualsLiteral("auto") && + !aCaOption.EqualsLiteral("ask")) { JS_ReportError(cx, "%s%s\n", JS_ERROR, "caOption argument must be ask or auto"); aResult.Append(internalError); @@ -2410,7 +2410,7 @@ nsCrypto::SignText(const nsAString& aStringToSign, const nsAString& aCaOption, // XXX Doing what nsFormSubmission::GetEncoder does (see // http://bugzilla.mozilla.org/show_bug.cgi?id=81203). - if (charset.Equals(NS_LITERAL_CSTRING("ISO-8859-1"))) { + if (charset.EqualsLiteral("ISO-8859-1")) { charset.Assign(NS_LITERAL_CSTRING("windows-1252")); } diff --git a/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp b/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp index f5604c0fd43..d3884d7bccf 100644 --- a/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp +++ b/mozilla/security/manager/ssl/src/nsKeygenHandler.cpp @@ -612,7 +612,7 @@ nsKeygenFormProcessor::ProcessValue(nsIDOMHTMLElement *aElement, nsAutoString pqgValue; res = selectElement->GetAttribute(NS_LITERAL_STRING("_moz-type"), keygenvalue); - if (NS_CONTENT_ATTR_HAS_VALUE == res && keygenvalue.Equals(NS_LITERAL_STRING("-mozilla-keygen"))) { + if (NS_CONTENT_ATTR_HAS_VALUE == res && keygenvalue.EqualsLiteral("-mozilla-keygen")) { res = selectElement->GetAttribute(NS_LITERAL_STRING("pqg"), pqgValue); res = selectElement->GetAttribute(NS_LITERAL_STRING("keytype"), keyTypeValue); diff --git a/mozilla/toolkit/components/autocomplete/src/nsAutoCompleteController.cpp b/mozilla/toolkit/components/autocomplete/src/nsAutoCompleteController.cpp index eaa951783b9..e40905ed966 100644 --- a/mozilla/toolkit/components/autocomplete/src/nsAutoCompleteController.cpp +++ b/mozilla/toolkit/components/autocomplete/src/nsAutoCompleteController.cpp @@ -553,9 +553,9 @@ nsAutoCompleteController::GetCellText(PRInt32 row, nsITreeColumn* col, nsAString const PRUnichar* colID; col->GetIdConst(&colID); - if (NS_LITERAL_STRING("treecolAutoCompleteValue").Equals(colID)) + if (colID.EqualsLiteral("treecolAutoCompleteValue")) GetValueAt(row, _retval); - else if (NS_LITERAL_STRING("treecolAutoCompleteComment").Equals(colID)) + else if(colID.EqualsLiteral("treecolAutoCompleteComment")) GetCommentAt(row, _retval); return NS_OK; diff --git a/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp b/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp index bf601a91bbd..e5573127dd6 100644 --- a/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp +++ b/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp @@ -841,7 +841,7 @@ nsGlobalHistory::AddNewPageToDatabase(const char *aURL, uri->GetHost(hostname); // Strip www. - if (Substring(hostname, 0, 4).Equals(NS_LITERAL_CSTRING("www."))) + if (Substring(hostname, 0, 4).EqualsLiteral("www.")) hostname.Cut(0, 4); SetRowValue(row, kToken_HostnameColumn, hostname.get()); @@ -3240,29 +3240,29 @@ nsGlobalHistory::TokenListToSearchQuery(const nsVoidArray& aTokens, // per-term tokens const nsASingleFragmentCString& tokenName = Substring(token->tokenName, token->tokenName + token->tokenNameLength); - if (tokenName.Equals(NS_LITERAL_CSTRING("datasource"))) { + if (tokenName.EqualsLiteral("datasource")) { datasource = token->tokenValue; datasourceLen = token->tokenValueLength; } - else if (tokenName.Equals(NS_LITERAL_CSTRING("match"))) { + else if (tokenName.EqualsLiteral("match")) { if (Substring(token->tokenValue, token->tokenValue+token->tokenValueLength).Equals("AgeInDays")) matchCallback = matchAgeInDaysCallback; property = token->tokenValue; propertyLen = token->tokenValueLength; } - else if (tokenName.Equals(NS_LITERAL_CSTRING("method"))) { + else if (tokenName.EqualsLiteral("method")) { method = token->tokenValue; methodLen = token->tokenValueLength; } - else if (tokenName.Equals(NS_LITERAL_CSTRING("text"))) { + else if (tokenName.EqualsLiteral("text")) { text = token->tokenValue; textLen = token->tokenValueLength; } // really, we should be storing the group-by as a column number or // rdf resource - else if (tokenName.Equals(NS_LITERAL_CSTRING("groupby"))) { + else if (tokenName.EqualsLiteral("groupby")) { mdb_err err; err = mStore->QueryToken(mEnv, nsCAutoString(token->tokenValue).get(), diff --git a/mozilla/toolkit/components/satchel/src/nsFormFillController.cpp b/mozilla/toolkit/components/satchel/src/nsFormFillController.cpp index 3b67213930a..a878264d829 100644 --- a/mozilla/toolkit/components/satchel/src/nsFormFillController.cpp +++ b/mozilla/toolkit/components/satchel/src/nsFormFillController.cpp @@ -512,7 +512,7 @@ nsFormFillController::Focus(nsIDOMEvent* aEvent) nsAutoString autocomplete; input->GetAttribute(NS_LITERAL_STRING("autocomplete"), autocomplete); - if (type.Equals(NS_LITERAL_STRING("text")) && + if (type.EqualsLiteral("text") && !autocomplete.EqualsIgnoreCase("off")) { nsCOMPtr form; diff --git a/mozilla/uriloader/base/nsURILoader.cpp b/mozilla/uriloader/base/nsURILoader.cpp index 1bd4d8a93f7..c2afb5c58ad 100644 --- a/mozilla/uriloader/base/nsURILoader.cpp +++ b/mozilla/uriloader/base/nsURILoader.cpp @@ -297,7 +297,7 @@ NS_IMETHODIMP nsDocumentOpenInfo::OnStartRequest(nsIRequest *request, nsISupport // be different, sends text/plain with iso-8859-1 charset. Don't do // general case-insensitive comparison, since we really want to apply this // crap as rarely as we can. - if (contentType.Equals(NS_LITERAL_CSTRING("text/plain")) || + if (contentType.EqualsLiteral("text/plain") || contentType.Equals( NS_LITERAL_CSTRING("text/plain; charset=ISO-8859-1")) || contentType.Equals( diff --git a/mozilla/uriloader/exthandler/os2/nsOSHelperAppService.cpp b/mozilla/uriloader/exthandler/os2/nsOSHelperAppService.cpp index 0106f265f69..69d591e2d80 100644 --- a/mozilla/uriloader/exthandler/os2/nsOSHelperAppService.cpp +++ b/mozilla/uriloader/exthandler/os2/nsOSHelperAppService.cpp @@ -1090,11 +1090,11 @@ nsOSHelperAppService::GetHandlerAndDescriptionFromMailcapFile(const nsAString& a nsDependentSubstring optionName(start_option_iter, end_optionname_iter); if (equalSignFound) { // This is an option that has a name and value - if (optionName.Equals(NS_LITERAL_STRING("description"))) { + if (optionName.EqualsLiteral("description")) { aDescription = Substring(++equal_sign_iter, semicolon_iter); - } else if (optionName.Equals(NS_LITERAL_STRING("x-mozilla-flags"))) { + } else if (optionName.EqualsLiteral("x-mozilla-flags")) { aMozillaFlags = Substring(++equal_sign_iter, semicolon_iter); - } else if (optionName.Equals(NS_LITERAL_STRING("test"))) { + } else if (optionName.EqualsLiteral("test")) { nsCAutoString testCommand; rv = UnescapeCommand(Substring(++equal_sign_iter, semicolon_iter), aMajorType, @@ -1192,10 +1192,10 @@ NS_IMETHODIMP nsOSHelperAppService::LoadUrl(nsIURI * aURL) char szAppFromINI[CCHMAXPATH] = "\0"; char szParamsFromINI[CCHMAXPATH]; /* Special case http, https, and ftp - if we get here, pass them to the shell */ - if ((uProtocol == NS_LITERAL_CSTRING("http")) || - (uProtocol == NS_LITERAL_CSTRING("https")) || - (uProtocol == NS_LITERAL_CSTRING("ftp"))) { - if (uProtocol == NS_LITERAL_CSTRING("ftp")) { + if ((uProtocol.EqualsLiteral("http")) || + (uProtocol.EqualsLiteral("https")) || + (uProtocol.EqualsLiteral("ftp"))) { + if (uProtocol.EqualsLiteral("ftp")) { PrfQueryProfileString(HINI_USER, "WPURLDEFAULTSETTINGS", "DefaultFTPExe", @@ -1210,8 +1210,8 @@ NS_IMETHODIMP nsOSHelperAppService::LoadUrl(nsIURI * aURL) sizeof(szParamsFromINI)) ; } /* If we didn't get a default ftp or it's http or https */ - if ((uProtocol == NS_LITERAL_CSTRING("http")) || - (uProtocol == NS_LITERAL_CSTRING("https")) || + if ((uProtocol.EqualsLiteral("http")) || + (uProtocol.EqualsLiteral("https")) || (szAppFromINI[0] == '\0')) { PrfQueryProfileString(HINI_USER, "WPURLDEFAULTSETTINGS", @@ -1238,9 +1238,9 @@ NS_IMETHODIMP nsOSHelperAppService::LoadUrl(nsIURI * aURL) sizeof(szParamsFromINI)); } } - } else if ((uProtocol == NS_LITERAL_CSTRING("mailto")) || - (uProtocol == NS_LITERAL_CSTRING("news"))) { - if (uProtocol == NS_LITERAL_CSTRING("news")) { + } else if ((uProtocol.EqualsLiteral("mailto")) || + (uProtocol.EqualsLiteral("news"))) { + if (uProtocol.EqualsLiteral("news")) { PrfQueryProfileString(HINI_USER, "WPURLDEFAULTSETTINGS", "DefaultNewsExe", @@ -1255,7 +1255,7 @@ NS_IMETHODIMP nsOSHelperAppService::LoadUrl(nsIURI * aURL) sizeof(szParamsFromINI)) ; } /* If we didn't get a default news or it's mailto */ - if ((uProtocol == NS_LITERAL_CSTRING("mailto")) || + if ((uProtocol.EqualsLiteral("mailto")) || (szAppFromINI[0] == '\0')) { PrfQueryProfileString(HINI_USER, "WPURLDEFAULTSETTINGS", diff --git a/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp index a2171543108..7a12774310e 100644 --- a/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp +++ b/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp @@ -1133,11 +1133,11 @@ nsOSHelperAppService::GetHandlerAndDescriptionFromMailcapFile(const nsAString& a nsDependentSubstring optionName(start_option_iter, end_optionname_iter); if (equalSignFound) { // This is an option that has a name and value - if (optionName.Equals(NS_LITERAL_STRING("description"))) { + if (optionName.EqualsLiteral("description")) { aDescription = Substring(++equal_sign_iter, semicolon_iter); - } else if (optionName.Equals(NS_LITERAL_STRING("x-mozilla-flags"))) { + } else if (optionName.EqualsLiteral("x-mozilla-flags")) { aMozillaFlags = Substring(++equal_sign_iter, semicolon_iter); - } else if (optionName.Equals(NS_LITERAL_STRING("test"))) { + } else if (optionName.EqualsLiteral("test")) { nsCAutoString testCommand; rv = UnescapeCommand(Substring(++equal_sign_iter, semicolon_iter), aMajorType, diff --git a/mozilla/widget/src/cocoa/nsMenuBarX.cpp b/mozilla/widget/src/cocoa/nsMenuBarX.cpp index dbfd01e8c72..5e108374f6c 100644 --- a/mozilla/widget/src/cocoa/nsMenuBarX.cpp +++ b/mozilla/widget/src/cocoa/nsMenuBarX.cpp @@ -489,7 +489,7 @@ nsMenuBarX::MenuConstruct( const nsMenuEvent & aMenuEvent, nsIWidget* aParentWin nsAutoString menuIDstring; menu->GetAttr(kNameSpaceID_None, nsWidgetAtoms::id, menuIDstring); - if ( menuIDstring == NS_LITERAL_STRING("menu_Help") ) { + if ( menuIDstring.EqualsLiteral("menu_Help") ) { nsMenuEvent event; MenuHandle handle = nsnull; #if !TARGET_CARBON @@ -579,7 +579,7 @@ NS_METHOD nsMenuBarX::AddMenu(nsIMenu * aMenu) aMenu->GetMenuContent(getter_AddRefs(menu)); nsAutoString menuHidden; menu->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, menuHidden); - if( menuHidden != NS_LITERAL_STRING("true")) { + if( !menuHidden.EqualsLiteral("true")) { // make sure we only increment |mNumMenus| if the menu is visible, since // we use it as an index of where to insert the next menu. mNumMenus++; diff --git a/mozilla/widget/src/cocoa/nsMenuItemX.cpp b/mozilla/widget/src/cocoa/nsMenuItemX.cpp index be73ad39fdc..a50aaf345ee 100644 --- a/mozilla/widget/src/cocoa/nsMenuItemX.cpp +++ b/mozilla/widget/src/cocoa/nsMenuItemX.cpp @@ -366,7 +366,7 @@ nsMenuItemX :: AttributeChanged ( nsIDocument *aDocument, PRInt32 aNameSpaceID, if ( mMenuType == eRadio ) { nsAutoString checked; mContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::checked, checked); - if (checked == NS_LITERAL_STRING("true") ) + if (checked.EqualsLiteral("true") ) UncheckRadioSiblings(mContent); } diff --git a/mozilla/widget/src/cocoa/nsMenuX.cpp b/mozilla/widget/src/cocoa/nsMenuX.cpp index db1a678ea5b..49032f1c787 100644 --- a/mozilla/widget/src/cocoa/nsMenuX.cpp +++ b/mozilla/widget/src/cocoa/nsMenuX.cpp @@ -177,7 +177,7 @@ nsMenuX::Create(nsISupports * aParent, const nsAString &aLabel, const nsAString nsAutoString hiddenValue, collapsedValue; mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hiddenValue); mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::collapsed, collapsedValue); - if ( hiddenValue == NS_LITERAL_STRING("true") || collapsedValue == NS_LITERAL_STRING("true") ) + if ( hiddenValue.EqualsLiteral("true") || collapsedValue.EqualsLiteral("true") ) mVisible = PR_FALSE; return NS_OK; @@ -261,7 +261,7 @@ NS_METHOD nsMenuX::AddMenuItem(nsIMenuItem * aMenuItem) // I want to be internationalized too! nsAutoString keyEquivalent(NS_LITERAL_STRING(" ")); aMenuItem->GetShortcutChar(keyEquivalent); - if (keyEquivalent != NS_LITERAL_STRING(" ")) { + if (!keyEquivalent.EqualsLiteral(" ")) { ToUpperCase(keyEquivalent); char keyStr[2]; keyEquivalent.ToCString(keyStr, sizeof(keyStr)); @@ -816,7 +816,7 @@ void nsMenuX::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent // if menu should be hidden, bail nsAutoString hidden; inMenuItemContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hidden); - if ( hidden == NS_LITERAL_STRING("true") ) + if ( hidden.EqualsLiteral("true") ) return; // Create nsMenuItem @@ -836,12 +836,12 @@ void nsMenuX::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent //printf("menuitem %s \n", NS_LossyConvertUCS2toASCII(menuitemName).get()); - PRBool enabled = ! (disabled == NS_LITERAL_STRING("true")); + PRBool enabled = ! (disabled.EqualsLiteral("true")); nsIMenuItem::EMenuItemType itemType = nsIMenuItem::eRegular; - if ( type == NS_LITERAL_STRING("checkbox") ) + if ( type.EqualsLiteral("checkbox") ) itemType = nsIMenuItem::eCheckbox; - else if ( type == NS_LITERAL_STRING("radio") ) + else if ( type.EqualsLiteral("radio") ) itemType = nsIMenuItem::eRadio; nsCOMPtr webShell = do_QueryReferent(mWebShellWeakRef); @@ -872,7 +872,7 @@ void nsMenuX::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent nsCOMPtr keyContent ( do_QueryInterface(keyElement) ); nsAutoString keyChar(NS_LITERAL_STRING(" ")); keyContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::key, keyChar); - if(keyChar != NS_LITERAL_STRING(" ")) + if(!keyChar.EqualsLiteral(" ")) pnsMenuItem->SetShortcutChar(keyChar); PRUint8 modifiers = knsMenuItemNoModifier; @@ -900,7 +900,7 @@ void nsMenuX::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent pnsMenuItem->SetModifiers ( modifiers ); } - if ( checked == NS_LITERAL_STRING("true") ) + if ( checked.EqualsLiteral("true") ) pnsMenuItem->SetChecked(PR_TRUE); else pnsMenuItem->SetChecked(PR_FALSE); @@ -917,7 +917,7 @@ nsMenuX::LoadSubMenu( nsIMenu * pParentMenu, nsIContent* inMenuItemContent ) // if menu should be hidden, bail nsAutoString hidden; inMenuItemContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hidden); - if ( hidden == NS_LITERAL_STRING("true") ) + if ( hidden.EqualsLiteral("true") ) return; nsAutoString menuName; @@ -937,7 +937,7 @@ nsMenuX::LoadSubMenu( nsIMenu * pParentMenu, nsIContent* inMenuItemContent ) // set if it's enabled or disabled nsAutoString disabled; inMenuItemContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::disabled, disabled); - if ( disabled == NS_LITERAL_STRING("true") ) + if ( disabled.EqualsLiteral("true") ) pnsMenu->SetEnabled ( PR_FALSE ); else pnsMenu->SetEnabled ( PR_TRUE ); @@ -955,7 +955,7 @@ nsMenuX::LoadSeparator ( nsIContent* inMenuItemContent ) // if item should be hidden, bail nsAutoString hidden; inMenuItemContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hidden); - if ( hidden == NS_LITERAL_STRING("true") ) + if ( hidden.EqualsLiteral("true") ) return; AddSeparator(); @@ -1223,7 +1223,7 @@ nsMenuX :: CountVisibleBefore ( PRUint32* outVisibleBefore ) nsAutoString hiddenValue, collapsedValue; menuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hiddenValue); menuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::collapsed, collapsedValue); - if ( hiddenValue != NS_LITERAL_STRING("true") && collapsedValue != NS_LITERAL_STRING("true")) + if ( !hiddenValue.EqualsLiteral("true") && !collapsedValue.EqualsLiteral("true")) ++(*outVisibleBefore); } } @@ -1259,7 +1259,7 @@ nsMenuX::AttributeChanged(nsIDocument *aDocument, PRInt32 aNameSpaceID, nsIAtom nsAutoString valueString; mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::disabled, valueString); - if(valueString == NS_LITERAL_STRING("true")) + if(valueString.EqualsLiteral("true")) SetEnabled(PR_FALSE); else SetEnabled(PR_TRUE); @@ -1290,7 +1290,7 @@ nsMenuX::AttributeChanged(nsIDocument *aDocument, PRInt32 aNameSpaceID, nsIAtom mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hiddenValue); mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::collapsed, collapsedValue); - if (hiddenValue == NS_LITERAL_STRING("true") || collapsedValue == NS_LITERAL_STRING("true")) { + if (hiddenValue.EqualsLiteral("true") || collapsedValue.EqualsLiteral("true")) { if ( mVisible ) { if ( menubarParent ) { PRUint32 indexToRemove = 0; diff --git a/mozilla/widget/src/gtk/nsClipboard.cpp b/mozilla/widget/src/gtk/nsClipboard.cpp index decc046b097..074719656f3 100644 --- a/mozilla/widget/src/gtk/nsClipboard.cpp +++ b/mozilla/widget/src/gtk/nsClipboard.cpp @@ -1464,7 +1464,7 @@ void ConvertHTMLtoUCS2(char* data, PRInt32 dataLength, { nsCAutoString charset; GetHTMLCharset(data, dataLength, charset);// get charset of HTML - if (charset.Equals(NS_LITERAL_CSTRING("UTF-16"))) {//current mozilla + if (charset.EqualsLiteral("UTF-16")) {//current mozilla outUnicodeLen = dataLength / 2 - 1; *unicodeData = NS_REINTERPRET_CAST(PRUnichar*, nsMemory::Alloc((outUnicodeLen + 1) * sizeof(PRUnichar))); @@ -1474,7 +1474,7 @@ void ConvertHTMLtoUCS2(char* data, PRInt32 dataLength, (*unicodeData)[outUnicodeLen] = '\0'; } } - else if (charset.Equals(NS_LITERAL_CSTRING("OLD-MOZILLA"))) {// old mozilla + else if (charset.EqualsLiteral("OLD-MOZILLA")) {// old mozilla outUnicodeLen = dataLength / 2; *unicodeData = NS_REINTERPRET_CAST(PRUnichar*, nsMemory::Alloc((outUnicodeLen + 1) * sizeof(PRUnichar))); diff --git a/mozilla/widget/src/gtk2/nsClipboard.cpp b/mozilla/widget/src/gtk2/nsClipboard.cpp index 46fbe76eec6..368006524ba 100644 --- a/mozilla/widget/src/gtk2/nsClipboard.cpp +++ b/mozilla/widget/src/gtk2/nsClipboard.cpp @@ -629,7 +629,7 @@ void ConvertHTMLtoUCS2(guchar * data, PRInt32 dataLength, { nsCAutoString charset; GetHTMLCharset(data, dataLength, charset);// get charset of HTML - if (charset.Equals(NS_LITERAL_CSTRING("UTF-16"))) {//current mozilla + if (charset.EqualsLiteral("UTF-16")) {//current mozilla outUnicodeLen = (dataLength / 2) - 1; *unicodeData = NS_REINTERPRET_CAST(PRUnichar*, nsMemory::Alloc((outUnicodeLen + sizeof('\0')) * @@ -639,7 +639,7 @@ void ConvertHTMLtoUCS2(guchar * data, PRInt32 dataLength, outUnicodeLen * sizeof(PRUnichar)); (*unicodeData)[outUnicodeLen] = '\0'; } - } else if (charset.Equals(NS_LITERAL_CSTRING("UNKNOWN"))) { + } else if (charset.EqualsLiteral("UNKNOWN")) { outUnicodeLen = 0; return; } else { diff --git a/mozilla/widget/src/mac/nsDragService.cpp b/mozilla/widget/src/mac/nsDragService.cpp index eedd69c2d65..82e6e7fb8aa 100644 --- a/mozilla/widget/src/mac/nsDragService.cpp +++ b/mozilla/widget/src/mac/nsDragService.cpp @@ -149,7 +149,7 @@ nsDragService::ComputeGlobalRectFromFrame ( nsIDOMNode* aDOMNode, Rect & outScre if ( parent ) { nsAutoString localName; parent->GetLocalName ( localName ); - if ( ! localName.Equals(NS_LITERAL_STRING("A")) ) + if ( ! localName.EqualsLiteral("A") ) return PR_FALSE; } else diff --git a/mozilla/widget/src/mac/nsMenu.cpp b/mozilla/widget/src/mac/nsMenu.cpp index eec6a3dada4..5c0cee6aeb9 100644 --- a/mozilla/widget/src/mac/nsMenu.cpp +++ b/mozilla/widget/src/mac/nsMenu.cpp @@ -263,7 +263,7 @@ NS_METHOD nsMenu::SetLabel(const nsAString &aText) else { nsAutoString menuIDstring; mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::id, menuIDstring); - if(menuIDstring == NS_LITERAL_STRING("menu_Help")) + if(menuIDstring.EqualsLiteral("menu_Help")) { mIsHelpMenu = PR_TRUE; ::HMGetHelpMenuHandle(&mMacMenuHandle); @@ -345,7 +345,7 @@ NS_METHOD nsMenu::AddMenuItem(nsIMenuItem * aMenuItem) // I want to be internationalized too! nsAutoString keyEquivalent(NS_LITERAL_STRING(" ")); aMenuItem->GetShortcutChar(keyEquivalent); - if(keyEquivalent != NS_LITERAL_STRING(" ")) { + if(!keyEquivalent.EqualsLiteral(" ")) { ToUpperCase(keyEquivalent); char keyStr[2]; keyEquivalent.ToCString(keyStr, sizeof(keyStr)); @@ -1003,7 +1003,7 @@ nsMenu::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent ) // if menu should be hidden, bail nsAutoString hidden; inMenuItemContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hidden); - if ( hidden == NS_LITERAL_STRING("true") ) + if ( hidden.EqualsLiteral("true") ) return; // Create nsMenuItem @@ -1023,12 +1023,12 @@ nsMenu::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent ) //printf("menuitem %s \n", NS_LossyConvertUCS2toASCII(menuitemName).get()); - PRBool enabled = ! (disabled == NS_LITERAL_STRING("true")); + PRBool enabled = ! (disabled.EqualsLiteral("true")); nsIMenuItem::EMenuItemType itemType = nsIMenuItem::eRegular; - if ( type == NS_LITERAL_STRING("checkbox") ) + if ( type.EqualsLiteral("checkbox") ) itemType = nsIMenuItem::eCheckbox; - else if ( type == NS_LITERAL_STRING("radio") ) + else if ( type.EqualsLiteral("radio") ) itemType = nsIMenuItem::eRadio; nsCOMPtr webShell = do_QueryReferent(mWebShellWeakRef); @@ -1059,7 +1059,7 @@ nsMenu::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent ) nsCOMPtr keyContent ( do_QueryInterface(keyElement) ); nsAutoString keyChar(NS_LITERAL_STRING(" ")); keyContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::key, keyChar); - if(keyChar != NS_LITERAL_STRING(" ")) + if(!keyChar.EqualsLiteral(" ")) pnsMenuItem->SetShortcutChar(keyChar); PRUint8 modifiers = knsMenuItemNoModifier; @@ -1087,7 +1087,7 @@ nsMenu::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent ) pnsMenuItem->SetModifiers ( modifiers ); } - if ( checked == NS_LITERAL_STRING("true") ) + if ( checked.EqualsLiteral("true") ) pnsMenuItem->SetChecked(PR_TRUE); else pnsMenuItem->SetChecked(PR_FALSE); @@ -1105,7 +1105,7 @@ nsMenu::LoadSubMenu( nsIMenu * pParentMenu, nsIContent* inMenuItemContent ) // if menu should be hidden, bail nsAutoString hidden; inMenuItemContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hidden); - if ( hidden == NS_LITERAL_STRING("true") ) + if ( hidden.EqualsLiteral("true") ) return; nsAutoString menuName; @@ -1125,7 +1125,7 @@ nsMenu::LoadSubMenu( nsIMenu * pParentMenu, nsIContent* inMenuItemContent ) // set if it's enabled or disabled nsAutoString disabled; inMenuItemContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::disabled, disabled); - if ( disabled == NS_LITERAL_STRING("true") ) + if ( disabled.EqualsLiteral("true") ) pnsMenu->SetEnabled ( PR_FALSE ); else pnsMenu->SetEnabled ( PR_TRUE ); @@ -1142,7 +1142,7 @@ nsMenu::LoadSeparator ( nsIContent* inMenuItemContent ) // if item should be hidden, bail nsAutoString hidden; inMenuItemContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hidden); - if ( hidden == NS_LITERAL_STRING("true") ) + if ( hidden.EqualsLiteral("true") ) return; AddSeparator(); @@ -1428,7 +1428,7 @@ nsMenu::GetNextVisibleMenu(nsIMenu** outNextVisibleMenu) nsAutoString hiddenValue, collapsedValue; menuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hiddenValue); menuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::collapsed, collapsedValue); - if ( hiddenValue != NS_LITERAL_STRING("true") && collapsedValue != NS_LITERAL_STRING("true")) + if ( !hiddenValue.EqualsLiteral("true") && !collapsedValue.EqualsLiteral("true")) { NS_IF_ADDREF(*outNextVisibleMenu = thisMenu); break; @@ -1470,7 +1470,7 @@ nsMenu::AttributeChanged(nsIDocument *aDocument, PRInt32 aNameSpaceID, nsIAtom * nsAutoString valueString; mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::disabled, valueString); - if(valueString == NS_LITERAL_STRING("true")) + if(valueString.EqualsLiteral("true")) SetEnabled(PR_FALSE); else SetEnabled(PR_TRUE); @@ -1529,7 +1529,7 @@ nsMenu::AttributeChanged(nsIDocument *aDocument, PRInt32 aNameSpaceID, nsIAtom * nsAutoString hiddenValue, collapsedValue; mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hiddenValue); mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::collapsed, collapsedValue); - if(hiddenValue == NS_LITERAL_STRING("true") || collapsedValue == NS_LITERAL_STRING("true")) { + if(hiddenValue.EqualsLiteral("true") || collapsedValue.EqualsLiteral("true")) { if ( !IsSpecialHierarchicalMenu(mMacMenuID) ) { // kill this menu, but not if we're special. baaaad things would happen if // we did that. diff --git a/mozilla/widget/src/mac/nsMenuBar.cpp b/mozilla/widget/src/mac/nsMenuBar.cpp index b46f9f56af4..55169b9a149 100644 --- a/mozilla/widget/src/mac/nsMenuBar.cpp +++ b/mozilla/widget/src/mac/nsMenuBar.cpp @@ -395,7 +395,7 @@ nsMenuBar::MenuConstruct( const nsMenuEvent & aMenuEvent, nsIWidget* aParentWind nsAutoString menuIDstring; menu->GetAttr(kNameSpaceID_None, nsWidgetAtoms::id, menuIDstring); - if ( menuIDstring == NS_LITERAL_STRING("menu_Help") ) { + if ( menuIDstring.EqualsLiteral("menu_Help") ) { nsMenuEvent event; MenuHandle handle = nsnull; ::HMGetHelpMenuHandle(&handle); @@ -506,7 +506,7 @@ NS_METHOD nsMenuBar::AddMenu(nsIMenu * aMenu) aMenu->GetMenuContent(getter_AddRefs(menu)); nsAutoString menuHidden; menu->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, menuHidden); - if( menuHidden != NS_LITERAL_STRING("true")) + if( !menuHidden.EqualsLiteral("true")) ::InsertMenu(menuHandle, 0); } diff --git a/mozilla/widget/src/mac/nsMenuBarX.cpp b/mozilla/widget/src/mac/nsMenuBarX.cpp index fc12286a49e..8808442b0c7 100644 --- a/mozilla/widget/src/mac/nsMenuBarX.cpp +++ b/mozilla/widget/src/mac/nsMenuBarX.cpp @@ -498,7 +498,7 @@ nsMenuBarX::MenuConstruct( const nsMenuEvent & aMenuEvent, nsIWidget* aParentWin nsAutoString menuIDstring; menu->GetAttr(kNameSpaceID_None, nsWidgetAtoms::id, menuIDstring); - if ( menuIDstring == NS_LITERAL_STRING("menu_Help") ) { + if ( menuIDstring.EqualsLiteral("menu_Help") ) { nsMenuEvent event; MenuHandle handle = nsnull; #if !TARGET_CARBON @@ -588,7 +588,7 @@ NS_METHOD nsMenuBarX::AddMenu(nsIMenu * aMenu) aMenu->GetMenuContent(getter_AddRefs(menu)); nsAutoString menuHidden; menu->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, menuHidden); - if( menuHidden != NS_LITERAL_STRING("true")) { + if( !menuHidden.EqualsLiteral("true")) { // make sure we only increment |mNumMenus| if the menu is visible, since // we use it as an index of where to insert the next menu. mNumMenus++; diff --git a/mozilla/widget/src/mac/nsMenuItem.cpp b/mozilla/widget/src/mac/nsMenuItem.cpp index b42e9e22046..9044017d559 100644 --- a/mozilla/widget/src/mac/nsMenuItem.cpp +++ b/mozilla/widget/src/mac/nsMenuItem.cpp @@ -397,7 +397,7 @@ nsMenuItem :: AttributeChanged ( nsIDocument *aDocument, PRInt32 aNameSpaceID, n if ( mMenuType == eRadio ) { nsAutoString checked; mContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::checked, checked); - if (checked == NS_LITERAL_STRING("true") ) + if (checked.EqualsLiteral("true") ) UncheckRadioSiblings(mContent); } diff --git a/mozilla/widget/src/mac/nsMenuItemX.cpp b/mozilla/widget/src/mac/nsMenuItemX.cpp index 45974b082f5..4fb565b9595 100644 --- a/mozilla/widget/src/mac/nsMenuItemX.cpp +++ b/mozilla/widget/src/mac/nsMenuItemX.cpp @@ -262,7 +262,7 @@ NS_METHOD nsMenuItemX::DoCommand() if (mMenuType == nsIMenuItem::eCheckbox || (mMenuType == nsIMenuItem::eRadio && !mIsChecked)) { nsAutoString value; mContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::autocheck, value); - if (!value.Equals(NS_LITERAL_STRING("false"))) + if (!value.EqualsLiteral("false")) SetChecked(!mIsChecked); /* the AttributeChanged code will update all the internal state */ } @@ -355,7 +355,7 @@ nsMenuItemX :: AttributeChanged ( nsIDocument *aDocument, PRInt32 aNameSpaceID, if ( mMenuType == eRadio ) { nsAutoString checked; mContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::checked, checked); - if (checked == NS_LITERAL_STRING("true") ) + if (checked.EqualsLiteral("true") ) UncheckRadioSiblings(mContent); } diff --git a/mozilla/widget/src/mac/nsMenuX.cpp b/mozilla/widget/src/mac/nsMenuX.cpp index 26a635fef2d..c869e02a4e4 100644 --- a/mozilla/widget/src/mac/nsMenuX.cpp +++ b/mozilla/widget/src/mac/nsMenuX.cpp @@ -183,7 +183,7 @@ nsMenuX::Create(nsISupports * aParent, const nsAString &aLabel, const nsAString nsAutoString hiddenValue, collapsedValue; mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hiddenValue); mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::collapsed, collapsedValue); - if ( hiddenValue == NS_LITERAL_STRING("true") || collapsedValue == NS_LITERAL_STRING("true") ) + if ( hiddenValue.EqualsLiteral("true") || collapsedValue.EqualsLiteral("true") ) mVisible = PR_FALSE; return NS_OK; @@ -267,7 +267,7 @@ NS_METHOD nsMenuX::AddMenuItem(nsIMenuItem * aMenuItem) // I want to be internationalized too! nsAutoString keyEquivalent(NS_LITERAL_STRING(" ")); aMenuItem->GetShortcutChar(keyEquivalent); - if (keyEquivalent != NS_LITERAL_STRING(" ")) { + if (!keyEquivalent.EqualsLiteral(" ")) { ToUpperCase(keyEquivalent); char keyStr[2]; keyEquivalent.ToCString(keyStr, sizeof(keyStr)); @@ -822,7 +822,7 @@ void nsMenuX::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent // if menu should be hidden, bail nsAutoString hidden; inMenuItemContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hidden); - if ( hidden == NS_LITERAL_STRING("true") ) + if ( hidden.EqualsLiteral("true") ) return; // Create nsMenuItem @@ -842,12 +842,12 @@ void nsMenuX::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent //printf("menuitem %s \n", NS_LossyConvertUCS2toASCII(menuitemName).get()); - PRBool enabled = ! (disabled == NS_LITERAL_STRING("true")); + PRBool enabled = ! (disabled.EqualsLiteral("true")); nsIMenuItem::EMenuItemType itemType = nsIMenuItem::eRegular; - if ( type == NS_LITERAL_STRING("checkbox") ) + if ( type.EqualsLiteral("checkbox") ) itemType = nsIMenuItem::eCheckbox; - else if ( type == NS_LITERAL_STRING("radio") ) + else if ( type.EqualsLiteral("radio") ) itemType = nsIMenuItem::eRadio; nsCOMPtr webShell = do_QueryReferent(mWebShellWeakRef); @@ -878,7 +878,7 @@ void nsMenuX::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent nsCOMPtr keyContent ( do_QueryInterface(keyElement) ); nsAutoString keyChar(NS_LITERAL_STRING(" ")); keyContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::key, keyChar); - if(keyChar != NS_LITERAL_STRING(" ")) + if(!keyChar.EqualsLiteral(" ")) pnsMenuItem->SetShortcutChar(keyChar); PRUint8 modifiers = knsMenuItemNoModifier; @@ -906,7 +906,7 @@ void nsMenuX::LoadMenuItem( nsIMenu* inParentMenu, nsIContent* inMenuItemContent pnsMenuItem->SetModifiers ( modifiers ); } - if ( checked == NS_LITERAL_STRING("true") ) + if ( checked.EqualsLiteral("true") ) pnsMenuItem->SetChecked(PR_TRUE); else pnsMenuItem->SetChecked(PR_FALSE); @@ -923,7 +923,7 @@ nsMenuX::LoadSubMenu( nsIMenu * pParentMenu, nsIContent* inMenuItemContent ) // if menu should be hidden, bail nsAutoString hidden; inMenuItemContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hidden); - if ( hidden == NS_LITERAL_STRING("true") ) + if ( hidden.EqualsLiteral("true") ) return; nsAutoString menuName; @@ -943,7 +943,7 @@ nsMenuX::LoadSubMenu( nsIMenu * pParentMenu, nsIContent* inMenuItemContent ) // set if it's enabled or disabled nsAutoString disabled; inMenuItemContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::disabled, disabled); - if ( disabled == NS_LITERAL_STRING("true") ) + if ( disabled.EqualsLiteral("true") ) pnsMenu->SetEnabled ( PR_FALSE ); else pnsMenu->SetEnabled ( PR_TRUE ); @@ -961,7 +961,7 @@ nsMenuX::LoadSeparator ( nsIContent* inMenuItemContent ) // if item should be hidden, bail nsAutoString hidden; inMenuItemContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hidden); - if ( hidden == NS_LITERAL_STRING("true") ) + if ( hidden.EqualsLiteral("true") ) return; AddSeparator(); @@ -1229,7 +1229,7 @@ nsMenuX :: CountVisibleBefore ( PRUint32* outVisibleBefore ) nsAutoString hiddenValue, collapsedValue; menuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hiddenValue); menuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::collapsed, collapsedValue); - if ( hiddenValue != NS_LITERAL_STRING("true") && collapsedValue != NS_LITERAL_STRING("true")) + if ( !hiddenValue.EqualsLiteral("true") && !collapsedValue.EqualsLiteral("true")) ++(*outVisibleBefore); } } @@ -1265,7 +1265,7 @@ nsMenuX::AttributeChanged(nsIDocument *aDocument, PRInt32 aNameSpaceID, nsIAtom nsAutoString valueString; mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::disabled, valueString); - if(valueString == NS_LITERAL_STRING("true")) + if(valueString.EqualsLiteral("true")) SetEnabled(PR_FALSE); else SetEnabled(PR_TRUE); @@ -1303,7 +1303,7 @@ nsMenuX::AttributeChanged(nsIDocument *aDocument, PRInt32 aNameSpaceID, nsIAtom mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::hidden, hiddenValue); mMenuContent->GetAttr(kNameSpaceID_None, nsWidgetAtoms::collapsed, collapsedValue); - if (hiddenValue == NS_LITERAL_STRING("true") || collapsedValue == NS_LITERAL_STRING("true")) { + if (hiddenValue.EqualsLiteral("true") || collapsedValue.EqualsLiteral("true")) { if ( mVisible ) { if ( menubarParent ) { PRUint32 indexToRemove = 0; diff --git a/mozilla/widget/src/windows/nsFilePicker.cpp b/mozilla/widget/src/windows/nsFilePicker.cpp index 7b42fa9431d..30d084c868e 100644 --- a/mozilla/widget/src/windows/nsFilePicker.cpp +++ b/mozilla/widget/src/windows/nsFilePicker.cpp @@ -530,13 +530,13 @@ nsFilePicker::AppendFilter(const nsAString& aTitle, const nsAString& aFilter) mFilterList.Append(aTitle); mFilterList.Append(PRUnichar('\0')); - if (aFilter.Equals(NS_LITERAL_STRING("..apps"))) + if (aFilter.EqualsLiteral("..apps")) mFilterList.Append(NS_LITERAL_STRING("*.exe;*.com")); else { nsAutoString filter(aFilter); filter.StripWhitespace(); - if (filter.Equals(NS_LITERAL_STRING("*"))) + if (filter.EqualsLiteral("*")) filter.Append(NS_LITERAL_STRING(".*")); mFilterList.Append(filter); } diff --git a/mozilla/xpcom/components/nsComponentManager.cpp b/mozilla/xpcom/components/nsComponentManager.cpp index e3e53ae9f4b..e55ea8ac197 100644 --- a/mozilla/xpcom/components/nsComponentManager.cpp +++ b/mozilla/xpcom/components/nsComponentManager.cpp @@ -1107,7 +1107,7 @@ nsComponentManagerImpl::ReadPersistentRegistry() goto out; // VersionLiteral - if (!nsDependentCString(values[0], lengths[0]).Equals(NS_LITERAL_CSTRING("Version"))) + if (!nsDependentCString(values[0], lengths[0]).EqualsLiteral("Version")) goto out; // major diff --git a/mozilla/xpcom/io/nsLocalFileUnix.cpp b/mozilla/xpcom/io/nsLocalFileUnix.cpp index e030b72491f..07a12fa6420 100644 --- a/mozilla/xpcom/io/nsLocalFileUnix.cpp +++ b/mozilla/xpcom/io/nsLocalFileUnix.cpp @@ -273,7 +273,7 @@ nsLocalFile::Clone(nsIFile **file) NS_IMETHODIMP nsLocalFile::InitWithNativePath(const nsACString &filePath) { - if (Substring(filePath, 0, 2) == NS_LITERAL_CSTRING("~/")) { + if (Substring(filePath, 0, 2).EqualsLiteral("~/")) { nsCOMPtr homeDir; nsCAutoString homePath; if (NS_FAILED(NS_GetSpecialDirectory(NS_OS_HOME_DIR, @@ -487,7 +487,7 @@ nsLocalFile::AppendRelativeNativePath(const nsACString &fragment) if (fragment.First() == '/') return NS_ERROR_FILE_UNRECOGNIZED_PATH; - if (mPath.Equals(NS_LITERAL_CSTRING("/"))) + if (mPath.EqualsLiteral("/")) mPath.Append(fragment); else mPath.Append(NS_LITERAL_CSTRING("/") + fragment); diff --git a/mozilla/xpcom/io/nsLocalFileWin.cpp b/mozilla/xpcom/io/nsLocalFileWin.cpp index c279b437112..90b155a719b 100644 --- a/mozilla/xpcom/io/nsLocalFileWin.cpp +++ b/mozilla/xpcom/io/nsLocalFileWin.cpp @@ -2116,7 +2116,7 @@ nsLocalFile::GetDirectoryEntries(nsISimpleEnumerator * *entries) nsresult rv; *entries = nsnull; - if (mWorkingPath.Equals(NS_LITERAL_CSTRING("\\\\."))) { + if (mWorkingPath.EqualsLiteral("\\\\.")) { nsDriveEnumerator *drives = new nsDriveEnumerator; if (!drives) return NS_ERROR_OUT_OF_MEMORY; diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp index 7dd3f95fc65..dfb1e96f46d 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp @@ -1454,7 +1454,7 @@ NS_IMETHODIMP nsAppShellService::Observe(nsISupports *aSubject, } ExitLastWindowClosingSurvivalArea(); } else if (!strcmp(aTopic, gProfileInitialStateTopic) && - nsDependentString(aData).Equals(NS_LITERAL_STRING("switch"))) { + nsDependentString(aData).EqualsLiteral("switch")) { // Now, establish the startup state according to the new prefs. PRBool openedWindow; CreateStartupState(SIZE_TO_CONTENT, SIZE_TO_CONTENT, &openedWindow); diff --git a/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp b/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp index 95980c44844..5fb5c9b4496 100644 --- a/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp +++ b/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp @@ -182,7 +182,7 @@ NS_IMETHODIMP nsChromeTreeOwner::FindItemWithName(const PRUnichar* aName, return NS_OK; // _main is an IE target which should be case-insensitive but isn't // see bug 217886 for details - if(name.EqualsIgnoreCase("_content") || name.Equals(NS_LITERAL_STRING("_main"))) + if(name.EqualsIgnoreCase("_content") || name.EqualsLiteral("_main")) { fIs_Content = PR_TRUE; mXULWindow->GetPrimaryContentShell(aFoundItem); diff --git a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp index 7e03f032836..d7b6f7d24ee 100644 --- a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp +++ b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp @@ -185,7 +185,7 @@ NS_IMETHODIMP nsContentTreeOwner::FindItemWithName(const PRUnichar* aName, return NS_OK; // _main is an IE target which should be case-insensitive but isn't // see bug 217886 for details - if(name.EqualsIgnoreCase("_content") || name.Equals(NS_LITERAL_STRING("_main"))) + if(name.EqualsIgnoreCase("_content") || name.EqualsLiteral("_main")) { fIs_Content = PR_TRUE; mXULWindow->GetPrimaryContentShell(aFoundItem); @@ -726,7 +726,7 @@ void nsContentTreeOwner::XULWindow(nsXULWindow* aXULWindow) if(docShellElement) { docShellElement->GetAttribute(NS_LITERAL_STRING("contenttitlesetting"), contentTitleSetting); - if(contentTitleSetting.Equals(NS_LITERAL_STRING("true"))) + if(contentTitleSetting.EqualsLiteral("true")) { mContentTitleSetting = PR_TRUE; docShellElement->GetAttribute(NS_LITERAL_STRING("titledefault"), mTitleDefault); diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp index c398615df61..c72eb042b2d 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp @@ -661,7 +661,7 @@ NS_IMETHODIMP nsWebShellWindow::CreateMenu(nsIMenuBar * aMenuBar, if (menuPopupElement) { nsString menuPopupNodeType; menuPopupElement->GetNodeName(menuPopupNodeType); - if (menuPopupNodeType.Equals(NS_LITERAL_STRING("menupopup"))) + if (menuPopupNodeType.EqualsLiteral("menupopup")) break; } nsCOMPtr oldMenuPopupNode(menuPopupNode); @@ -680,12 +680,12 @@ NS_IMETHODIMP nsWebShellWindow::CreateMenu(nsIMenuBar * aMenuBar, nsString menuitemNodeType; nsString menuitemName; menuitemElement->GetNodeName(menuitemNodeType); - if (menuitemNodeType.Equals(NS_LITERAL_STRING("menuitem"))) { + if (menuitemNodeType.EqualsLiteral("menuitem")) { // LoadMenuItem LoadMenuItem(pnsMenu, menuitemElement, menuitemNode); - } else if (menuitemNodeType.Equals(NS_LITERAL_STRING("menuseparator"))) { + } else if (menuitemNodeType.EqualsLiteral("menuseparator")) { pnsMenu->AddSeparator(); - } else if (menuitemNodeType.Equals(NS_LITERAL_STRING("menu"))) { + } else if (menuitemNodeType.EqualsLiteral("menu")) { // Load a submenu LoadSubMenu(pnsMenu, menuitemElement, menuitemNode); } @@ -766,16 +766,16 @@ NS_IMETHODIMP nsWebShellWindow::LoadMenuItem( keyElement->GetAttribute(altAtom, altValue); keyElement->GetAttribute(commandAtom, commandValue); - if(!keyChar.Equals(NS_LITERAL_STRING(" "))) + if(!keyChar.EqualsLiteral(" ")) pnsMenuItem->SetShortcutChar(keyChar); - if(shiftValue.Equals(NS_LITERAL_STRING("true"))) + if(shiftValue.EqualsLiteral("true")) modifiers |= knsMenuItemShiftModifier; - if(altValue.Equals(NS_LITERAL_STRING("true"))) + if(altValue.EqualsLiteral("true")) modifiers |= knsMenuItemAltModifier; - if(commandValue.Equals(NS_LITERAL_STRING("false"))) + if(commandValue.EqualsLiteral("false")) modifiers |= knsMenuItemCommandModifier; pnsMenuItem->SetModifiers(modifiers); @@ -874,7 +874,7 @@ void nsWebShellWindow::LoadSubMenu( if (menuPopupElement) { nsString menuPopupNodeType; menuPopupElement->GetNodeName(menuPopupNodeType); - if (menuPopupNodeType.Equals(NS_LITERAL_STRING("menupopup"))) + if (menuPopupNodeType.EqualsLiteral("menupopup")) break; } nsCOMPtr oldMenuPopupNode(menuPopupNode); @@ -897,12 +897,12 @@ void nsWebShellWindow::LoadSubMenu( printf("Type [%s] %d\n", NS_LossyConvertUCS2toASCII(menuitemNodeType).get(), menuitemNodeType.Equals("menuseparator")); #endif - if (menuitemNodeType.Equals(NS_LITERAL_STRING("menuitem"))) { + if (menuitemNodeType.EqualsLiteral("menuitem")) { // Load a menuitem LoadMenuItem(pnsMenu, menuitemElement, menuitemNode); - } else if (menuitemNodeType.Equals(NS_LITERAL_STRING("menuseparator"))) { + } else if (menuitemNodeType.EqualsLiteral("menuseparator")) { pnsMenu->AddSeparator(); - } else if (menuitemNodeType.Equals(NS_LITERAL_STRING("menu"))) { + } else if (menuitemNodeType.EqualsLiteral("menu")) { // Add a submenu LoadSubMenu(pnsMenu, menuitemElement, menuitemNode); } @@ -1031,7 +1031,7 @@ void nsWebShellWindow::LoadMenus(nsIDOMDocument * aDOMDoc, nsIWidget * aParentWi nsString menuNodeType; nsString menuName; menuElement->GetNodeName(menuNodeType); - if (menuNodeType.Equals(NS_LITERAL_STRING("menu"))) { + if (menuNodeType.EqualsLiteral("menu")) { menuElement->GetAttribute(NS_LITERAL_STRING("label"), menuName); #ifdef DEBUG_rods @@ -1365,7 +1365,7 @@ nsCOMPtr nsWebShellWindow::GetNamedDOMDoc(const nsAString & aWeb // first get the toolbar child docShell nsCOMPtr childDocShell; - if (aWebShellName.Equals(NS_LITERAL_STRING("this"))) { // XXX small kludge for code reused + if (aWebShellName.EqualsLiteral("this")) { // XXX small kludge for code reused childDocShell = mDocShell; } else { nsCOMPtr docShellAsItem; diff --git a/mozilla/xpfe/bootstrap/appleevents/nsWindowUtils.cpp b/mozilla/xpfe/bootstrap/appleevents/nsWindowUtils.cpp index 30bb627ccb8..b2e6f6418a9 100644 --- a/mozilla/xpfe/bootstrap/appleevents/nsWindowUtils.cpp +++ b/mozilla/xpfe/bootstrap/appleevents/nsWindowUtils.cpp @@ -172,22 +172,22 @@ static TWindowKind WindowKindFromTypeString(const nsString& inWindowType) if (inWindowType.IsEmpty()) return kAnyWindowKind; - if (inWindowType.Equals(NS_LITERAL_STRING("navigator:browser"))) + if (inWindowType.EqualsLiteral("navigator:browser")) return kBrowserWindowKind; - if (inWindowType.Equals(NS_LITERAL_STRING("mail:3pane"))) + if (inWindowType.EqualsLiteral("mail:3pane")) return kMailWindowKind; - if (inWindowType.Equals(NS_LITERAL_STRING("msgcompose"))) + if (inWindowType.EqualsLiteral("msgcompose")) return kMailComposeWindowKind; - if (inWindowType.Equals(NS_LITERAL_STRING("mail:addressbook"))) + if (inWindowType.EqualsLiteral("mail:addressbook")) return kAddressBookWindowKind; - if (inWindowType.Equals(NS_LITERAL_STRING("composer:html"))) + if (inWindowType.EqualsLiteral("composer:html")) return kComposerWindowKind; - if (inWindowType.Equals(NS_LITERAL_STRING("composer:text"))) + if (inWindowType.EqualsLiteral("composer:text")) return kComposerWindowKind; return kOtherWindowKind; diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp index 2b15d9267d7..40602557a05 100644 --- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -1741,7 +1741,7 @@ nsBookmarksService::Init() if (NS_SUCCEEDED(useProfile) && profileCount == 1) { ToLowerCase(currentProfileName); - if (currentProfileName.Equals(NS_LITERAL_STRING("default"))) + if (currentProfileName.EqualsLiteral("default")) useProfile = NS_ERROR_FAILURE; } } diff --git a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp index 3f379a3f914..18482cbc31b 100644 --- a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp +++ b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp @@ -829,7 +829,7 @@ nsDownloadManager::HandleEvent(nsIDOMEvent* aEvent) // the event is either load or unload nsAutoString eventType; aEvent->GetType(eventType); - if (eventType.Equals(NS_LITERAL_STRING("unload"))) + if (eventType.EqualsLiteral("unload")) return OnClose(); nsCOMPtr target; diff --git a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp index 859fa263c0d..31c6958074a 100644 --- a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp +++ b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp @@ -2686,8 +2686,8 @@ nsGlobalHistory::InitByteOrder(PRBool aForce) if (!aForce) rv = GetByteOrder(getter_Copies(file_byte_order)); if (aForce || NS_FAILED(rv) || - !(file_byte_order.Equals(NS_LITERAL_CSTRING("BE")) || - file_byte_order.Equals(NS_LITERAL_CSTRING("LE")))) { + !(file_byte_order.EqualsLiteral("BE") || + file_byte_order.EqualsLiteral("LE"))) { // Byte order is not yet set, or needs to be reset; initialize it. mReverseByteOrder = PR_FALSE; rv = SaveByteOrder(machine_byte_order.get()); @@ -3292,29 +3292,29 @@ nsGlobalHistory::TokenListToSearchQuery(const nsVoidArray& aTokens, // per-term tokens const nsASingleFragmentCString& tokenName = Substring(token->tokenName, token->tokenName + token->tokenNameLength); - if (tokenName.Equals(NS_LITERAL_CSTRING("datasource"))) { + if (tokenName.EqualsLiteral("datasource")) { datasource = token->tokenValue; datasourceLen = token->tokenValueLength; } - else if (tokenName.Equals(NS_LITERAL_CSTRING("match"))) { + else if (tokenName.EqualsLiteral("match")) { if (Substring(token->tokenValue, token->tokenValue+token->tokenValueLength).Equals("AgeInDays")) matchCallback = matchAgeInDaysCallback; property = token->tokenValue; propertyLen = token->tokenValueLength; } - else if (tokenName.Equals(NS_LITERAL_CSTRING("method"))) { + else if (tokenName.EqualsLiteral("method")) { method = token->tokenValue; methodLen = token->tokenValueLength; } - else if (tokenName.Equals(NS_LITERAL_CSTRING("text"))) { + else if (tokenName.EqualsLiteral("text")) { text = token->tokenValue; textLen = token->tokenValueLength; } // really, we should be storing the group-by as a column number or // rdf resource - else if (tokenName.Equals(NS_LITERAL_CSTRING("groupby"))) { + else if (tokenName.EqualsLiteral("groupby")) { mdb_err err; err = mStore->QueryToken(mEnv, nsCAutoString(token->tokenValue).get(), diff --git a/mozilla/xpfe/components/intl/nsCharsetMenu.cpp b/mozilla/xpfe/components/intl/nsCharsetMenu.cpp index 4057ed4c333..40b9df8d56b 100644 --- a/mozilla/xpfe/components/intl/nsCharsetMenu.cpp +++ b/mozilla/xpfe/components/intl/nsCharsetMenu.cpp @@ -421,24 +421,24 @@ NS_IMETHODIMP nsCharsetMenuObserver::Observe(nsISupports *aSubject, const char * if (!nsCRT::strcmp(aTopic, "charsetmenu-selected")) { nsDependentString nodeName(someData); rv = mCharsetMenu->Init(); - if (nodeName.Equals(NS_LITERAL_STRING("browser"))) { + if (nodeName.EqualsLiteral("browser")) { rv = mCharsetMenu->InitBrowserMenu(); } - if (nodeName.Equals(NS_LITERAL_STRING("composer"))) { + if (nodeName.EqualsLiteral("composer")) { rv = mCharsetMenu->InitComposerMenu(); } - if (nodeName.Equals(NS_LITERAL_STRING("mailview"))) { + if (nodeName.EqualsLiteral("mailview")) { rv = mCharsetMenu->InitMailviewMenu(); } - if (nodeName.Equals(NS_LITERAL_STRING("mailedit"))) { + if (nodeName.EqualsLiteral("mailedit")) { rv = mCharsetMenu->InitMaileditMenu(); rv = mCharsetMenu->InitOthers(); } - if (nodeName.Equals(NS_LITERAL_STRING("more-menu"))) { + if (nodeName.EqualsLiteral("more-menu")) { rv = mCharsetMenu->InitSecondaryTiers(); rv = mCharsetMenu->InitAutodetMenu(); } - if (nodeName.Equals(NS_LITERAL_STRING("other"))) { + if (nodeName.EqualsLiteral("other")) { rv = mCharsetMenu->InitOthers(); rv = mCharsetMenu->InitMaileditMenu(); } @@ -448,7 +448,7 @@ NS_IMETHODIMP nsCharsetMenuObserver::Observe(nsISupports *aSubject, const char * if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) { nsDependentString prefName(someData); - if (prefName.Equals(NS_LITERAL_STRING(kBrowserStaticPrefKey))) { + if (prefName.EqualsLiteral(kBrowserStaticPrefKey)) { // refresh menus which share this pref rv = mCharsetMenu->RefreshBrowserMenu(); NS_ENSURE_SUCCESS(rv, rv); @@ -456,7 +456,7 @@ NS_IMETHODIMP nsCharsetMenuObserver::Observe(nsISupports *aSubject, const char * NS_ENSURE_SUCCESS(rv, rv); rv = mCharsetMenu->RefreshComposerMenu(); } - else if (prefName.Equals(NS_LITERAL_STRING(kMaileditPrefKey))) { + else if (prefName.EqualsLiteral(kMaileditPrefKey)) { rv = mCharsetMenu->RefreshMaileditMenu(); } } diff --git a/mozilla/xpfe/components/intl/nsFontPackageHandler.cpp b/mozilla/xpfe/components/intl/nsFontPackageHandler.cpp index 623337a4e00..2b5a02583ba 100644 --- a/mozilla/xpfe/components/intl/nsFontPackageHandler.cpp +++ b/mozilla/xpfe/components/intl/nsFontPackageHandler.cpp @@ -139,8 +139,8 @@ NS_IMETHODIMP nsFontPackageHandler::NeedFontPackage(const char *aFontPackID) rv = domElement->GetAttribute(NS_LITERAL_STRING("windowtype"), windowType); NS_ENSURE_SUCCESS(rv, NS_ERROR_ABORT); - if (windowType.Equals(NS_LITERAL_STRING("mail:3pane")) || - windowType.Equals(NS_LITERAL_STRING("mail:messageWindow"))) { + if (windowType.EqualsLiteral("mail:3pane") || + windowType.EqualsLiteral("mail:messageWindow")) { return NS_ERROR_ABORT; } } diff --git a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp index 621075515b0..2591c40c14b 100755 --- a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp +++ b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp @@ -5812,7 +5812,7 @@ InternetSearchDataSource::ParseHTML(nsIURI *aURL, nsIRDFResource *mParent, } } - if ((!relItem.IsEmpty()) && (!relItem.Equals(NS_LITERAL_STRING("-")))) + if ((!relItem.IsEmpty()) && (!relItem.EqualsLiteral("-"))) { // If its a percentage, remove "%" if (relItem[relItem.Length()-1] == PRUnichar('%')) diff --git a/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp b/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp index 0284d5f9fdc..bb12adeb5d7 100755 --- a/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp +++ b/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp @@ -369,13 +369,13 @@ LocalSearchDataSource::doMatch(nsIRDFLiteral *literal, if (! str) return(found); nsAutoString value(str); - if (matchMethod.Equals(NS_LITERAL_STRING("contains"))) + if (matchMethod.EqualsLiteral("contains")) { if (FindInReadable(matchText, value, nsCaseInsensitiveStringComparator())) found = PR_TRUE; } - else if (matchMethod.Equals(NS_LITERAL_STRING("startswith"))) + else if (matchMethod.EqualsLiteral("startswith")) { nsAString::const_iterator start, realstart, end; value.BeginReading(start); @@ -388,7 +388,7 @@ LocalSearchDataSource::doMatch(nsIRDFLiteral *literal, found = PR_TRUE; } - else if (matchMethod.Equals(NS_LITERAL_STRING("endswith"))) + else if (matchMethod.EqualsLiteral("endswith")) { nsAString::const_iterator start, end, realend; value.BeginReading(start); @@ -401,17 +401,17 @@ LocalSearchDataSource::doMatch(nsIRDFLiteral *literal, found = PR_TRUE; } - else if (matchMethod.Equals(NS_LITERAL_STRING("is"))) + else if (matchMethod.EqualsLiteral("is")) { if (value.Equals(matchText, nsCaseInsensitiveStringComparator())) found = PR_TRUE; } - else if (matchMethod.Equals(NS_LITERAL_STRING("isnot"))) + else if (matchMethod.EqualsLiteral("isnot")) { if (!value.Equals(matchText, nsCaseInsensitiveStringComparator())) found = PR_TRUE; } - else if (matchMethod.Equals(NS_LITERAL_STRING("doesntcontain"))) + else if (matchMethod.EqualsLiteral("doesntcontain")) { if (!FindInReadable(matchText, value, nsCaseInsensitiveStringComparator())) @@ -427,8 +427,8 @@ LocalSearchDataSource::doDateMatch(nsIRDFDate *aDate, { PRBool found = PR_FALSE; - if (matchMethod.Equals(NS_LITERAL_STRING("isbefore")) || - matchMethod.Equals(NS_LITERAL_STRING("isafter"))) + if (matchMethod.EqualsLiteral("isbefore") || + matchMethod.EqualsLiteral("isafter")) { PRInt64 matchDate; nsresult rv = parseDate(matchText, &matchDate); @@ -455,11 +455,11 @@ LocalSearchDataSource::doIntMatch(nsIRDFInt *aInt, PRInt32 matchVal = matchText.ToInteger(&error); if (error != 0) return PR_FALSE; - if (matchMethod.Equals(NS_LITERAL_STRING("is"))) + if (matchMethod.EqualsLiteral("is")) found = (val == matchVal); - else if (matchMethod.Equals(NS_LITERAL_STRING("isgreater"))) + else if (matchMethod.EqualsLiteral("isgreater")) found = (val > matchVal); - else if (matchMethod.Equals(NS_LITERAL_STRING("isless"))) + else if (matchMethod.EqualsLiteral("isless")) found = (val < matchVal); return found; @@ -491,13 +491,13 @@ LocalSearchDataSource::dateMatches(nsIRDFDate *aDate, aDate->GetValue(&date); PRBool matches = PR_FALSE; - if (method.Equals(NS_LITERAL_STRING("isbefore"))) + if (method.EqualsLiteral("isbefore")) matches = LL_CMP(date, <, matchDate); - else if (method.Equals(NS_LITERAL_STRING("isafter"))) + else if (method.EqualsLiteral("isafter")) matches = LL_CMP(date, >, matchDate); - else if (method.Equals(NS_LITERAL_STRING("is"))) + else if (method.EqualsLiteral("is")) matches = LL_EQ(date, matchDate); return matches; diff --git a/mozilla/xpfe/components/winhooks/nsWindowsHooksUtil.cpp b/mozilla/xpfe/components/winhooks/nsWindowsHooksUtil.cpp index bc14821e131..64f48e89d28 100644 --- a/mozilla/xpfe/components/winhooks/nsWindowsHooksUtil.cpp +++ b/mozilla/xpfe/components/winhooks/nsWindowsHooksUtil.cpp @@ -524,7 +524,7 @@ nsresult ProtocolRegistryEntry::set() { // We must take care of this first because setting the "protocol entry" // for http will cause WindowsXP to do stuff automatically for us, // thereby making it impossible for us to propertly reset. - if ( protocol == NS_LITERAL_CSTRING( "http" ) ) { + if ( protocol.EqualsLiteral( "http" ) ) { setWindowsXP(); } @@ -634,7 +634,7 @@ nsresult ProtocolRegistryEntry::reset() { ProtocolIconRegistryEntry( protocol.get() ).reset(); // For http:, on WindowsXP, we need to do some extra cleanup. - if ( protocol == NS_LITERAL_CSTRING( "http" ) ) { + if ( protocol.EqualsLiteral( "http" ) ) { resetWindowsXP(); } diff --git a/mozilla/xpinstall/src/nsInstall.cpp b/mozilla/xpinstall/src/nsInstall.cpp index e95fb6c09d5..8d07a7e0030 100644 --- a/mozilla/xpinstall/src/nsInstall.cpp +++ b/mozilla/xpinstall/src/nsInstall.cpp @@ -2358,7 +2358,7 @@ nsInstall::GetQualifiedPackageName( const nsString& name, nsString& qualifiedNam nsString startOfName; name.Left(startOfName, 7); - if ( startOfName.Equals(NS_LITERAL_STRING("=USER=/")) ) + if ( startOfName.EqualsLiteral("=USER=/") ) { CurrentUserNode(qualifiedName); qualifiedName += name; @@ -2398,7 +2398,7 @@ nsInstall::GetQualifiedRegName(const nsString& name, nsString& qualifiedRegName nsString startOfName; name.Left(startOfName, 7); - if ( startOfName.Equals(NS_LITERAL_STRING("=COMM=/")) || startOfName.Equals(NS_LITERAL_STRING("=USER=/"))) + if ( startOfName.EqualsLiteral("=COMM=/") || startOfName.EqualsLiteral("=USER=/")) { qualifiedRegName = startOfName; }