From c43a97f1d52ff349d449e431895823af86bbb4e1 Mon Sep 17 00:00:00 2001 From: "dbaron%fas.harvard.edu" Date: Sat, 23 Mar 2002 23:54:46 +0000 Subject: [PATCH] Convert users of nsAReadable[C]String and nsAWritable[C]String typedefs to [const] nsA[C]String. b=131899 r=scc sr=jag a=asa git-svn-id: svn://10.0.0.236/trunk@117353 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/public/nsContentUtils.h | 6 +- mozilla/content/base/public/nsIContent.h | 12 +- mozilla/content/base/public/nsIContentList.h | 2 +- .../base/public/nsIContentSerializer.h | 18 +-- mozilla/content/base/public/nsIDocument.h | 20 +-- .../content/base/public/nsIDocumentEncoder.h | 14 +- mozilla/content/base/public/nsIFrameLoader.h | 2 +- .../content/base/public/nsIHTMLToTextSink.h | 4 +- mozilla/content/base/public/nsINameSpace.h | 4 +- .../content/base/public/nsINameSpaceManager.h | 8 +- mozilla/content/base/public/nsITextContent.h | 4 +- mozilla/content/base/src/nsCommentNode.cpp | 2 +- mozilla/content/base/src/nsContentList.cpp | 6 +- mozilla/content/base/src/nsContentList.h | 6 +- mozilla/content/base/src/nsContentUtils.cpp | 4 +- mozilla/content/base/src/nsDOMAttribute.cpp | 36 ++--- mozilla/content/base/src/nsDOMAttribute.h | 2 +- .../content/base/src/nsDOMAttributeMap.cpp | 12 +- .../content/base/src/nsDOMDocumentType.cpp | 26 ++-- mozilla/content/base/src/nsDOMDocumentType.h | 16 +-- mozilla/content/base/src/nsDocument.cpp | 136 +++++++++--------- mozilla/content/base/src/nsDocument.h | 20 +-- .../content/base/src/nsDocumentEncoder.cpp | 78 +++++----- .../content/base/src/nsDocumentFragment.cpp | 38 ++--- .../content/base/src/nsGenericDOMDataNode.cpp | 54 +++---- .../content/base/src/nsGenericDOMDataNode.h | 82 +++++------ mozilla/content/base/src/nsGenericElement.cpp | 102 ++++++------- mozilla/content/base/src/nsGenericElement.h | 122 ++++++++-------- .../base/src/nsHTMLContentSerializer.cpp | 34 ++--- .../base/src/nsHTMLContentSerializer.h | 34 ++--- .../content/base/src/nsNameSpaceManager.cpp | 26 ++-- .../base/src/nsPlainTextSerializer.cpp | 22 +-- .../content/base/src/nsPlainTextSerializer.h | 26 ++-- mozilla/content/base/src/nsRange.cpp | 4 +- mozilla/content/base/src/nsRange.h | 4 +- .../content/base/src/nsStyleLinkElement.cpp | 2 +- mozilla/content/base/src/nsStyleLinkElement.h | 10 +- mozilla/content/base/src/nsTextNode.cpp | 2 +- .../base/src/nsXMLContentSerializer.cpp | 40 +++--- .../content/base/src/nsXMLContentSerializer.h | 42 +++--- 40 files changed, 541 insertions(+), 541 deletions(-) diff --git a/mozilla/content/base/public/nsContentUtils.h b/mozilla/content/base/public/nsContentUtils.h index f0a9f3e5d3f..24caabc17b1 100644 --- a/mozilla/content/base/public/nsContentUtils.h +++ b/mozilla/content/base/public/nsContentUtils.h @@ -38,7 +38,7 @@ #define nsContentUtils_h___ #include "jspubtd.h" -#include "nsAReadableString.h" +#include "nsAString.h" #include "nsIDOMScriptObjectFactory.h" class nsIScriptContext; @@ -74,13 +74,13 @@ public: static nsresult GetDynamicScriptContext(JSContext *aContext, nsIScriptContext** aScriptContext); - static PRUint32 CopyNewlineNormalizedUnicodeTo(const nsAReadableString& aSource, + static PRUint32 CopyNewlineNormalizedUnicodeTo(const nsAString& aSource, PRUint32 aSrcOffset, PRUnichar* aDest, PRUint32 aLength, PRBool& aLastCharCR); - static PRUint32 CopyNewlineNormalizedUnicodeTo(nsReadingIterator& aSrcStart, const nsReadingIterator& aSrcEnd, nsAWritableString& aDest); + static PRUint32 CopyNewlineNormalizedUnicodeTo(nsReadingIterator& aSrcStart, const nsReadingIterator& aSrcEnd, nsAString& aDest); static nsISupports * GetClassInfoInstance(nsDOMClassInfoID aID); diff --git a/mozilla/content/base/public/nsIContent.h b/mozilla/content/base/public/nsIContent.h index e52fc5be8cf..e5c4237995f 100644 --- a/mozilla/content/base/public/nsIContent.h +++ b/mozilla/content/base/public/nsIContent.h @@ -41,7 +41,7 @@ #include #include "nsISupports.h" #include "nsEvent.h" -#include "nsAWritableString.h" +#include "nsAString.h" // Forward declarations class nsIAtom; @@ -113,7 +113,7 @@ public: * @param aName out parameter representing the complete name of the * attribute */ - NS_IMETHOD NormalizeAttrString(const nsAReadableString& aStr, + NS_IMETHOD NormalizeAttrString(const nsAString& aStr, nsINodeInfo*& aNodeInfo) = 0; /** @@ -131,7 +131,7 @@ public: * notified of the attribute change. */ NS_IMETHOD SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, - const nsAReadableString& aValue, + const nsAString& aValue, PRBool aNotify) = 0; /** @@ -149,7 +149,7 @@ public: * notified of the attribute change. */ NS_IMETHOD SetAttr(nsINodeInfo* aNodeInfo, - const nsAReadableString& aValue, + const nsAString& aValue, PRBool aNotify) = 0; /** @@ -170,7 +170,7 @@ public: * */ NS_IMETHOD GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, - nsAWritableString& aResult) const = 0; + nsAString& aResult) const = 0; /** * Get the current value and prefix of the attribute. This returns a form @@ -193,7 +193,7 @@ public: */ NS_IMETHOD GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, - nsIAtom*& aPrefix, nsAWritableString& aResult) const = 0; + nsIAtom*& aPrefix, nsAString& aResult) const = 0; /** * Determine if an attribute has been set. diff --git a/mozilla/content/base/public/nsIContentList.h b/mozilla/content/base/public/nsIContentList.h index 06613801ada..17b4a7d96fe 100644 --- a/mozilla/content/base/public/nsIContentList.h +++ b/mozilla/content/base/public/nsIContentList.h @@ -65,7 +65,7 @@ public: NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn, PRBool aDoFlush) = 0; - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn, + NS_IMETHOD NamedItem(const nsAString& aName, nsIDOMNode** aReturn, PRBool aDoFlush) = 0; NS_IMETHOD IndexOf(nsIContent *aContent, PRInt32& aIndex, diff --git a/mozilla/content/base/public/nsIContentSerializer.h b/mozilla/content/base/public/nsIContentSerializer.h index 5d475def722..964e12a280f 100644 --- a/mozilla/content/base/public/nsIContentSerializer.h +++ b/mozilla/content/base/public/nsIContentSerializer.h @@ -40,7 +40,7 @@ #define _nsIContentSerializer_h__ #include "nsISupports.h" -#include "nsAWritableString.h" +#include "nsAString.h" #include "nsIAtom.h" class nsIDOMText; /* forward declaration */ @@ -66,30 +66,30 @@ class nsIContentSerializer : public nsISupports { nsIAtom* aCharSet, PRBool aIsCopying) = 0; NS_IMETHOD AppendText(nsIDOMText* aText, PRInt32 aStartOffset, - PRInt32 aEndOffset, nsAWritableString& aStr) = 0; + PRInt32 aEndOffset, nsAString& aStr) = 0; NS_IMETHOD AppendCDATASection(nsIDOMCDATASection* aCDATASection, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr) = 0; + nsAString& aStr) = 0; NS_IMETHOD AppendProcessingInstruction(nsIDOMProcessingInstruction* aPI, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr) = 0; + nsAString& aStr) = 0; NS_IMETHOD AppendComment(nsIDOMComment* aComment, PRInt32 aStartOffset, - PRInt32 aEndOffset, nsAWritableString& aStr) = 0; + PRInt32 aEndOffset, nsAString& aStr) = 0; NS_IMETHOD AppendDoctype(nsIDOMDocumentType *aDoctype, - nsAWritableString& aStr) = 0; + nsAString& aStr) = 0; NS_IMETHOD AppendElementStart(nsIDOMElement *aElement, - nsAWritableString& aStr) = 0; + nsAString& aStr) = 0; NS_IMETHOD AppendElementEnd(nsIDOMElement *aElement, - nsAWritableString& aStr) = 0; + nsAString& aStr) = 0; - NS_IMETHOD Flush(nsAWritableString& aStr) = 0; + NS_IMETHOD Flush(nsAString& aStr) = 0; }; #define NS_CONTENTSERIALIZER_CONTRACTID_PREFIX \ diff --git a/mozilla/content/base/public/nsIDocument.h b/mozilla/content/base/public/nsIDocument.h index 991b35cea63..cfb53010ba8 100644 --- a/mozilla/content/base/public/nsIDocument.h +++ b/mozilla/content/base/public/nsIDocument.h @@ -40,7 +40,7 @@ #include "nsISupports.h" #include "nsEvent.h" -#include "nsAWritableString.h" +#include "nsAString.h" #include "nsString.h" class nsIAtom; @@ -151,15 +151,15 @@ public: /** * Get/Set the base target of a link in a document. */ - NS_IMETHOD GetBaseTarget(nsAWritableString &aBaseTarget)=0; - NS_IMETHOD SetBaseTarget(const nsAReadableString &aBaseTarget)=0; + NS_IMETHOD GetBaseTarget(nsAString &aBaseTarget)=0; + NS_IMETHOD SetBaseTarget(const nsAString &aBaseTarget)=0; /** * Return a standard name for the document's character set. This will * trigger a startDocumentLoad if necessary to answer the question. */ - NS_IMETHOD GetDocumentCharacterSet(nsAWritableString& oCharSetID) = 0; - NS_IMETHOD SetDocumentCharacterSet(const nsAReadableString& aCharSetID) = 0; + NS_IMETHOD GetDocumentCharacterSet(nsAString& oCharSetID) = 0; + NS_IMETHOD SetDocumentCharacterSet(const nsAString& aCharSetID) = 0; NS_IMETHOD GetDocumentCharacterSetSource(PRInt32* aCharsetSource) = 0; NS_IMETHOD SetDocumentCharacterSetSource(PRInt32 aCharsetSource) = 0; @@ -176,7 +176,7 @@ public: /** * Return the language of this document. */ - NS_IMETHOD GetContentLanguage(nsAWritableString& aContentLanguage) const = 0; + NS_IMETHOD GetContentLanguage(nsAString& aContentLanguage) const = 0; #ifdef IBMBIDI // The state BidiEnabled should persist across multiple views (screen, print) @@ -209,8 +209,8 @@ public: * Access HTTP header data (this may also get set from other sources, like * HTML META tags). */ - NS_IMETHOD GetHeaderData(nsIAtom* aHeaderField, nsAWritableString& aData) const = 0; - NS_IMETHOD SetHeaderData(nsIAtom* aheaderField, const nsAReadableString& aData) = 0; + NS_IMETHOD GetHeaderData(nsIAtom* aHeaderField, nsAString& aData) const = 0; + NS_IMETHOD SetHeaderData(nsIAtom* aheaderField, const nsAString& aData) = 0; /** * Create a new presentation shell that will use aContext for @@ -396,8 +396,8 @@ extern NS_EXPORT nsresult nsIDocument* aOwnerDocument); extern NS_EXPORT nsresult NS_NewDOMDocument(nsIDOMDocument** aInstancePtrResult, - const nsAReadableString& aNamespaceURI, - const nsAReadableString& aQualifiedName, + const nsAString& aNamespaceURI, + const nsAString& aQualifiedName, nsIDOMDocumentType* aDoctype, nsIURI* aBaseURI); diff --git a/mozilla/content/base/public/nsIDocumentEncoder.h b/mozilla/content/base/public/nsIDocumentEncoder.h index c4dff8eae04..affc6ddf05e 100644 --- a/mozilla/content/base/public/nsIDocumentEncoder.h +++ b/mozilla/content/base/public/nsIDocumentEncoder.h @@ -162,7 +162,7 @@ public: /** * Initialize with a pointer to the document and the mime type. */ - NS_IMETHOD Init(nsIDocument* aDocument, const nsAReadableString& aMimeType, + NS_IMETHOD Init(nsIDocument* aDocument, const nsAString& aMimeType, PRUint32 flags) = 0; /** @@ -188,7 +188,7 @@ public: * * Possible result codes: NS_ERROR_NO_CHARSET_CONVERTER */ - NS_IMETHOD SetCharset(const nsAReadableString& aCharset) = 0; + NS_IMETHOD SetCharset(const nsAString& aCharset) = 0; /** * Set a wrap column. This may have no effect in some types of encoders. @@ -201,7 +201,7 @@ public: * if you ask it to copy html that really represents plaintext content. * Call this AFTER Init() and SetSelection() have both been called. */ - NS_IMETHOD GetMimeType(nsAWritableString& aMimeType) = 0; + NS_IMETHOD GetMimeType(nsAString& aMimeType) = 0; /** * The document is encoded, the result is sent to the @@ -211,7 +211,7 @@ public: * might have been encountered. */ NS_IMETHOD EncodeToStream(nsIOutputStream* aStream) = 0; - NS_IMETHOD EncodeToString(nsAWritableString& aOutputString) = 0; + NS_IMETHOD EncodeToString(nsAString& aOutputString) = 0; /** * The document is encoded, the result is sent to the @@ -219,9 +219,9 @@ public: * to aContextString. Extra context info is encoded in aInfoString. * */ - NS_IMETHOD EncodeToStringWithContext(nsAWritableString& aEncodedString, - nsAWritableString& aContextString, - nsAWritableString& aInfoString) = 0; + NS_IMETHOD EncodeToStringWithContext(nsAString& aEncodedString, + nsAString& aContextString, + nsAString& aInfoString) = 0; /** * Set the fixup object associated with node persistence. diff --git a/mozilla/content/base/public/nsIFrameLoader.h b/mozilla/content/base/public/nsIFrameLoader.h index 66bf4e3abca..1fcfcc4b1d4 100644 --- a/mozilla/content/base/public/nsIFrameLoader.h +++ b/mozilla/content/base/public/nsIFrameLoader.h @@ -40,7 +40,7 @@ #define nsIFrameLoader_h___ #include "nsISupports.h" -#include "nsAWritableString.h" +#include "nsAString.h" // Forward declarations class nsIDOMElement; diff --git a/mozilla/content/base/public/nsIHTMLToTextSink.h b/mozilla/content/base/public/nsIHTMLToTextSink.h index 09928bcfd1a..05bdc374de2 100644 --- a/mozilla/content/base/public/nsIHTMLToTextSink.h +++ b/mozilla/content/base/public/nsIHTMLToTextSink.h @@ -40,7 +40,7 @@ #define _nsIPlainTextSink_h__ #include "nsISupports.h" -#include "nsAWritableString.h" +#include "nsAString.h" #define NS_PLAINTEXTSINK_CONTRACTID "@mozilla.org/layout/plaintextsink;1" @@ -57,7 +57,7 @@ class nsIHTMLToTextSink : public nsISupports { NS_DEFINE_STATIC_IID_ACCESSOR(NS_IHTMLTOTEXTSINK_IID) - NS_IMETHOD Initialize(nsAWritableString* aOutString, + NS_IMETHOD Initialize(nsAString* aOutString, PRUint32 aFlags, PRUint32 aWrapCol) = 0; }; diff --git a/mozilla/content/base/public/nsINameSpace.h b/mozilla/content/base/public/nsINameSpace.h index fb6fe6a7cd3..a282d9c6af2 100644 --- a/mozilla/content/base/public/nsINameSpace.h +++ b/mozilla/content/base/public/nsINameSpace.h @@ -69,7 +69,7 @@ public: // Get data of this name space NS_IMETHOD GetNameSpaceID(PRInt32& aID) const = 0; - NS_IMETHOD GetNameSpaceURI(nsAWritableString& aURI) const = 0; + NS_IMETHOD GetNameSpaceURI(nsAString& aURI) const = 0; NS_IMETHOD GetNameSpacePrefix(nsIAtom*& aPrefix) const = 0; NS_IMETHOD GetParentNameSpace(nsINameSpace*& aParent) const = 0; @@ -81,7 +81,7 @@ public: // create new child name space NS_IMETHOD CreateChildNameSpace(nsIAtom* aPrefix, - const nsAReadableString& aURI, + const nsAString& aURI, nsINameSpace*& aChildNameSpace) = 0; NS_IMETHOD CreateChildNameSpace(nsIAtom* aPrefix, PRInt32 aNameSpaceID, diff --git a/mozilla/content/base/public/nsINameSpaceManager.h b/mozilla/content/base/public/nsINameSpaceManager.h index 5519e3c8785..58993dff52e 100644 --- a/mozilla/content/base/public/nsINameSpaceManager.h +++ b/mozilla/content/base/public/nsINameSpaceManager.h @@ -40,7 +40,7 @@ #define nsINameSpaceManager_h___ #include "nsISupports.h" -#include "nsAWritableString.h" +#include "nsAString.h" class nsIAtom; class nsString; @@ -93,12 +93,12 @@ public: NS_IMETHOD CreateRootNameSpace(nsINameSpace*& aRootNameSpace) = 0; - NS_IMETHOD RegisterNameSpace(const nsAReadableString& aURI, + NS_IMETHOD RegisterNameSpace(const nsAString& aURI, PRInt32& aNameSpaceID) = 0; NS_IMETHOD GetNameSpaceURI(PRInt32 aNameSpaceID, - nsAWritableString& aURI) = 0; - NS_IMETHOD GetNameSpaceID(const nsAReadableString& aURI, + nsAString& aURI) = 0; + NS_IMETHOD GetNameSpaceID(const nsAString& aURI, PRInt32& aNameSpaceID) = 0; NS_IMETHOD GetElementFactory(PRInt32 aNameSpaceID, diff --git a/mozilla/content/base/public/nsITextContent.h b/mozilla/content/base/public/nsITextContent.h index d92b0c6bf8c..fcc8c3b710c 100644 --- a/mozilla/content/base/public/nsITextContent.h +++ b/mozilla/content/base/public/nsITextContent.h @@ -67,7 +67,7 @@ public: /** * Make a copy of the text content in aResult. */ - NS_IMETHOD CopyText(nsAWritableString& aResult) = 0; + NS_IMETHOD CopyText(nsAString& aResult) = 0; /** * Set the text to the given value. If aNotify is PR_TRUE then @@ -81,7 +81,7 @@ public: * Set the text to the given value. If aNotify is PR_TRUE then * the document is notified of the content change. */ - NS_IMETHOD SetText(const nsAReadableString& aStr, + NS_IMETHOD SetText(const nsAString& aStr, PRBool aNotify) = 0; /** diff --git a/mozilla/content/base/src/nsCommentNode.cpp b/mozilla/content/base/src/nsCommentNode.cpp index 4cb580e5918..ccc65f76216 100644 --- a/mozilla/content/base/src/nsCommentNode.cpp +++ b/mozilla/content/base/src/nsCommentNode.cpp @@ -121,7 +121,7 @@ nsCommentNode::GetTag(nsIAtom*& aResult) const } NS_IMETHODIMP -nsCommentNode::GetNodeName(nsAWritableString& aNodeName) +nsCommentNode::GetNodeName(nsAString& aNodeName) { aNodeName.Assign(NS_LITERAL_STRING("#comment")); return NS_OK; diff --git a/mozilla/content/base/src/nsContentList.cpp b/mozilla/content/base/src/nsContentList.cpp index 11c83ce32cf..e6088561fba 100644 --- a/mozilla/content/base/src/nsContentList.cpp +++ b/mozilla/content/base/src/nsContentList.cpp @@ -327,7 +327,7 @@ nsContentList::nsContentList(nsIDocument *aDocument, nsContentList::nsContentList(nsIDocument *aDocument, nsContentListMatchFunc aFunc, - const nsAReadableString& aData, + const nsAString& aData, nsIContent* aRootContent) : nsBaseContentList() { @@ -423,7 +423,7 @@ nsContentList::Item(PRUint32 aIndex, nsIDOMNode** aReturn, PRBool aDoFlush) } NS_IMETHODIMP -nsContentList::NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn, PRBool aDoFlush) +nsContentList::NamedItem(const nsAString& aName, nsIDOMNode** aReturn, PRBool aDoFlush) { nsresult result = CheckDocumentExistence(); @@ -482,7 +482,7 @@ nsContentList::Item(PRUint32 aIndex, nsIDOMNode** aReturn) } NS_IMETHODIMP -nsContentList::NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn) +nsContentList::NamedItem(const nsAString& aName, nsIDOMNode** aReturn) { return NamedItem(aName, aReturn, PR_TRUE); } diff --git a/mozilla/content/base/src/nsContentList.h b/mozilla/content/base/src/nsContentList.h index 9314e0ef024..e1a6286f0e0 100644 --- a/mozilla/content/base/src/nsContentList.h +++ b/mozilla/content/base/src/nsContentList.h @@ -106,20 +106,20 @@ public: nsIContent* aRootContent=nsnull); nsContentList(nsIDocument *aDocument, nsContentListMatchFunc aFunc, - const nsAReadableString& aData, + const nsAString& aData, nsIContent* aRootContent=nsnull); virtual ~nsContentList(); // nsIDOMHTMLCollection NS_IMETHOD GetLength(PRUint32* aLength); NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn); - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn); + NS_IMETHOD NamedItem(const nsAString& aName, nsIDOMNode** aReturn); /// nsIContentList NS_IMETHOD GetLength(PRUint32* aLength, PRBool aDoFlush); NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn, PRBool aDoFlush); - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn, + NS_IMETHOD NamedItem(const nsAString& aName, nsIDOMNode** aReturn, PRBool aDoFlush); NS_IMETHOD IndexOf(nsIContent *aContent, PRInt32& aIndex, PRBool aDoFlush); diff --git a/mozilla/content/base/src/nsContentUtils.cpp b/mozilla/content/base/src/nsContentUtils.cpp index 89bd8b4cfdb..f004c055621 100644 --- a/mozilla/content/base/src/nsContentUtils.cpp +++ b/mozilla/content/base/src/nsContentUtils.cpp @@ -281,7 +281,7 @@ class CopyNormalizeNewlines // static PRUint32 -nsContentUtils::CopyNewlineNormalizedUnicodeTo(const nsAReadableString& aSource, +nsContentUtils::CopyNewlineNormalizedUnicodeTo(const nsAString& aSource, PRUint32 aSrcOffset, PRUnichar* aDest, PRUint32 aLength, @@ -301,7 +301,7 @@ nsContentUtils::CopyNewlineNormalizedUnicodeTo(const nsAReadableString& aSource, // static PRUint32 -nsContentUtils::CopyNewlineNormalizedUnicodeTo(nsReadingIterator& aSrcStart, const nsReadingIterator& aSrcEnd, nsAWritableString& aDest) +nsContentUtils::CopyNewlineNormalizedUnicodeTo(nsReadingIterator& aSrcStart, const nsReadingIterator& aSrcEnd, nsAString& aDest) { typedef nsWritingIterator WritingIterator; typedef NormalizeNewlinesCharTraits sink_traits; diff --git a/mozilla/content/base/src/nsDOMAttribute.cpp b/mozilla/content/base/src/nsDOMAttribute.cpp index 3892f068837..9289a9db981 100644 --- a/mozilla/content/base/src/nsDOMAttribute.cpp +++ b/mozilla/content/base/src/nsDOMAttribute.cpp @@ -48,7 +48,7 @@ //---------------------------------------------------------------------- nsDOMAttribute::nsDOMAttribute(nsIContent* aContent, nsINodeInfo *aNodeInfo, - const nsAReadableString& aValue) + const nsAString& aValue) : mContent(aContent), mNodeInfo(aNodeInfo), mValue(aValue), mChild(nsnull), mChildList(nsnull) { @@ -108,7 +108,7 @@ nsDOMAttribute::GetContent(nsIContent** aContent) } nsresult -nsDOMAttribute::GetName(nsAWritableString& aName) +nsDOMAttribute::GetName(nsAString& aName) { NS_ENSURE_TRUE(mNodeInfo, NS_ERROR_FAILURE); @@ -116,7 +116,7 @@ nsDOMAttribute::GetName(nsAWritableString& aName) } nsresult -nsDOMAttribute::GetValue(nsAWritableString& aValue) +nsDOMAttribute::GetValue(nsAString& aValue) { NS_ENSURE_TRUE(mNodeInfo, NS_ERROR_FAILURE); @@ -140,7 +140,7 @@ nsDOMAttribute::GetValue(nsAWritableString& aValue) } nsresult -nsDOMAttribute::SetValue(const nsAReadableString& aValue) +nsDOMAttribute::SetValue(const nsAString& aValue) { NS_ENSURE_TRUE(mNodeInfo, NS_ERROR_FAILURE); @@ -199,19 +199,19 @@ nsDOMAttribute::GetOwnerElement(nsIDOMElement** aOwnerElement) } NS_IMETHODIMP -nsDOMAttribute::GetNodeName(nsAWritableString& aNodeName) +nsDOMAttribute::GetNodeName(nsAString& aNodeName) { return GetName(aNodeName); } NS_IMETHODIMP -nsDOMAttribute::GetNodeValue(nsAWritableString& aNodeValue) +nsDOMAttribute::GetNodeValue(nsAString& aNodeValue) { return GetValue(aNodeValue); } NS_IMETHODIMP -nsDOMAttribute::SetNodeValue(const nsAReadableString& aNodeValue) +nsDOMAttribute::SetNodeValue(const nsAString& aNodeValue) { return SetValue(aNodeValue); } @@ -410,7 +410,7 @@ nsDOMAttribute::GetOwnerDocument(nsIDOMDocument** aOwnerDocument) } NS_IMETHODIMP -nsDOMAttribute::GetNamespaceURI(nsAWritableString& aNamespaceURI) +nsDOMAttribute::GetNamespaceURI(nsAString& aNamespaceURI) { NS_ENSURE_TRUE(mNodeInfo, NS_ERROR_FAILURE); @@ -418,7 +418,7 @@ nsDOMAttribute::GetNamespaceURI(nsAWritableString& aNamespaceURI) } NS_IMETHODIMP -nsDOMAttribute::GetPrefix(nsAWritableString& aPrefix) +nsDOMAttribute::GetPrefix(nsAString& aPrefix) { NS_ENSURE_TRUE(mNodeInfo, NS_ERROR_FAILURE); @@ -426,7 +426,7 @@ nsDOMAttribute::GetPrefix(nsAWritableString& aPrefix) } NS_IMETHODIMP -nsDOMAttribute::SetPrefix(const nsAReadableString& aPrefix) +nsDOMAttribute::SetPrefix(const nsAString& aPrefix) { NS_ENSURE_TRUE(mNodeInfo, NS_ERROR_FAILURE); nsCOMPtr newNodeInfo; @@ -461,7 +461,7 @@ nsDOMAttribute::SetPrefix(const nsAReadableString& aPrefix) } NS_IMETHODIMP -nsDOMAttribute::GetLocalName(nsAWritableString& aLocalName) +nsDOMAttribute::GetLocalName(nsAString& aLocalName) { NS_ENSURE_TRUE(mNodeInfo, NS_ERROR_FAILURE); @@ -476,15 +476,15 @@ nsDOMAttribute::Normalize() } NS_IMETHODIMP -nsDOMAttribute::IsSupported(const nsAReadableString& aFeature, - const nsAReadableString& aVersion, +nsDOMAttribute::IsSupported(const nsAString& aFeature, + const nsAString& aVersion, PRBool* aReturn) { return nsGenericElement::InternalIsSupported(aFeature, aVersion, aReturn); } NS_IMETHODIMP -nsDOMAttribute::GetBaseURI(nsAWritableString &aURI) +nsDOMAttribute::GetBaseURI(nsAString &aURI) { aURI.Truncate(); nsresult rv = NS_OK; @@ -495,8 +495,8 @@ nsDOMAttribute::GetBaseURI(nsAWritableString &aURI) } NS_IMETHODIMP -nsDOMAttribute::LookupNamespacePrefix(const nsAReadableString& aNamespaceURI, - nsAWritableString& aPrefix) +nsDOMAttribute::LookupNamespacePrefix(const nsAString& aNamespaceURI, + nsAString& aPrefix) { aPrefix.Truncate(); nsresult rv = NS_OK; @@ -507,8 +507,8 @@ nsDOMAttribute::LookupNamespacePrefix(const nsAReadableString& aNamespaceURI, } NS_IMETHODIMP -nsDOMAttribute::LookupNamespaceURI(const nsAReadableString& aNamespacePrefix, - nsAWritableString& aNamespaceURI) +nsDOMAttribute::LookupNamespaceURI(const nsAString& aNamespacePrefix, + nsAString& aNamespaceURI) { aNamespaceURI.Truncate(); nsresult rv = NS_OK; diff --git a/mozilla/content/base/src/nsDOMAttribute.h b/mozilla/content/base/src/nsDOMAttribute.h index 906c276943f..229aa490673 100644 --- a/mozilla/content/base/src/nsDOMAttribute.h +++ b/mozilla/content/base/src/nsDOMAttribute.h @@ -87,7 +87,7 @@ class nsDOMAttribute : public nsIDOMAttr, { public: nsDOMAttribute(nsIContent* aContent, nsINodeInfo *aNodeInfo, - const nsAReadableString& aValue); + const nsAString& aValue); virtual ~nsDOMAttribute(); NS_DECL_ISUPPORTS diff --git a/mozilla/content/base/src/nsDOMAttributeMap.cpp b/mozilla/content/base/src/nsDOMAttributeMap.cpp index de849356383..58c159658e5 100644 --- a/mozilla/content/base/src/nsDOMAttributeMap.cpp +++ b/mozilla/content/base/src/nsDOMAttributeMap.cpp @@ -76,7 +76,7 @@ NS_IMPL_ADDREF(nsDOMAttributeMap) NS_IMPL_RELEASE(nsDOMAttributeMap) nsresult -nsDOMAttributeMap::GetNamedItem(const nsAReadableString& aAttrName, +nsDOMAttributeMap::GetNamedItem(const nsAString& aAttrName, nsIDOMNode** aAttribute) { NS_ENSURE_ARG_POINTER(aAttribute); @@ -169,7 +169,7 @@ nsDOMAttributeMap::SetNamedItem(nsIDOMNode *aNode, nsIDOMNode **aReturn) } NS_IMETHODIMP -nsDOMAttributeMap::RemoveNamedItem(const nsAReadableString& aName, +nsDOMAttributeMap::RemoveNamedItem(const nsAString& aName, nsIDOMNode** aReturn) { NS_ENSURE_ARG_POINTER(aReturn); @@ -272,8 +272,8 @@ nsDOMAttributeMap::GetLength(PRUint32 *aLength) } nsresult -nsDOMAttributeMap::GetNamedItemNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aLocalName, +nsDOMAttributeMap::GetNamedItemNS(const nsAString& aNamespaceURI, + const nsAString& aLocalName, nsIDOMNode** aReturn) { NS_ENSURE_ARG_POINTER(aReturn); @@ -387,8 +387,8 @@ nsDOMAttributeMap::SetNamedItemNS(nsIDOMNode* aArg, nsIDOMNode** aReturn) } nsresult -nsDOMAttributeMap::RemoveNamedItemNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aLocalName, +nsDOMAttributeMap::RemoveNamedItemNS(const nsAString& aNamespaceURI, + const nsAString& aLocalName, nsIDOMNode** aReturn) { NS_ENSURE_ARG_POINTER(aReturn); diff --git a/mozilla/content/base/src/nsDOMDocumentType.cpp b/mozilla/content/base/src/nsDOMDocumentType.cpp index 58208ca6343..cae777eba73 100644 --- a/mozilla/content/base/src/nsDOMDocumentType.cpp +++ b/mozilla/content/base/src/nsDOMDocumentType.cpp @@ -46,12 +46,12 @@ nsresult NS_NewDOMDocumentType(nsIDOMDocumentType** aDocType, - const nsAReadableString& aName, + const nsAString& aName, nsIDOMNamedNodeMap *aEntities, nsIDOMNamedNodeMap *aNotations, - const nsAReadableString& aPublicId, - const nsAReadableString& aSystemId, - const nsAReadableString& aInternalSubset) + const nsAString& aPublicId, + const nsAString& aSystemId, + const nsAString& aInternalSubset) { NS_ENSURE_ARG_POINTER(aDocType); @@ -66,12 +66,12 @@ NS_NewDOMDocumentType(nsIDOMDocumentType** aDocType, return NS_OK; } -nsDOMDocumentType::nsDOMDocumentType(const nsAReadableString& aName, +nsDOMDocumentType::nsDOMDocumentType(const nsAString& aName, nsIDOMNamedNodeMap *aEntities, nsIDOMNamedNodeMap *aNotations, - const nsAReadableString& aPublicId, - const nsAReadableString& aSystemId, - const nsAReadableString& aInternalSubset) : + const nsAString& aPublicId, + const nsAString& aSystemId, + const nsAString& aInternalSubset) : mName(aName), mPublicId(aPublicId), mSystemId(aSystemId), @@ -109,7 +109,7 @@ NS_IMPL_RELEASE(nsDOMDocumentType) NS_IMETHODIMP -nsDOMDocumentType::GetName(nsAWritableString& aName) +nsDOMDocumentType::GetName(nsAString& aName) { aName=mName; @@ -141,7 +141,7 @@ nsDOMDocumentType::GetNotations(nsIDOMNamedNodeMap** aNotations) } NS_IMETHODIMP -nsDOMDocumentType::GetPublicId(nsAWritableString& aPublicId) +nsDOMDocumentType::GetPublicId(nsAString& aPublicId) { aPublicId = mPublicId; @@ -149,7 +149,7 @@ nsDOMDocumentType::GetPublicId(nsAWritableString& aPublicId) } NS_IMETHODIMP -nsDOMDocumentType::GetSystemId(nsAWritableString& aSystemId) +nsDOMDocumentType::GetSystemId(nsAString& aSystemId) { aSystemId = mSystemId; @@ -157,7 +157,7 @@ nsDOMDocumentType::GetSystemId(nsAWritableString& aSystemId) } NS_IMETHODIMP -nsDOMDocumentType::GetInternalSubset(nsAWritableString& aInternalSubset) +nsDOMDocumentType::GetInternalSubset(nsAString& aInternalSubset) { // XXX: null string aInternalSubset = mInternalSubset; @@ -174,7 +174,7 @@ nsDOMDocumentType::GetTag(nsIAtom*& aResult) const } NS_IMETHODIMP -nsDOMDocumentType::GetNodeName(nsAWritableString& aNodeName) +nsDOMDocumentType::GetNodeName(nsAString& aNodeName) { aNodeName=mName; diff --git a/mozilla/content/base/src/nsDOMDocumentType.h b/mozilla/content/base/src/nsDOMDocumentType.h index 27dbaf932f7..037eec6320c 100644 --- a/mozilla/content/base/src/nsDOMDocumentType.h +++ b/mozilla/content/base/src/nsDOMDocumentType.h @@ -54,12 +54,12 @@ class nsDOMDocumentType : public nsGenericDOMDataNode, public nsIDOMDocumentType { public: - nsDOMDocumentType(const nsAReadableString& aName, + nsDOMDocumentType(const nsAString& aName, nsIDOMNamedNodeMap *aEntities, nsIDOMNamedNodeMap *aNotations, - const nsAReadableString& aPublicId, - const nsAReadableString& aSystemId, - const nsAReadableString& aInternalSubset); + const nsAString& aPublicId, + const nsAString& aSystemId, + const nsAString& aInternalSubset); virtual ~nsDOMDocumentType(); @@ -90,11 +90,11 @@ protected: extern nsresult NS_NewDOMDocumentType(nsIDOMDocumentType** aDocType, - const nsAReadableString& aName, + const nsAString& aName, nsIDOMNamedNodeMap *aEntities, nsIDOMNamedNodeMap *aNotations, - const nsAReadableString& aPublicId, - const nsAReadableString& aSystemId, - const nsAReadableString& aInternalSubset); + const nsAString& aPublicId, + const nsAString& aSystemId, + const nsAString& aInternalSubset); #endif // nsDOMDocument_h___ diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index 657c49813fd..d2c1b2b2e4b 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -290,16 +290,16 @@ public: NS_DECL_ISUPPORTS // nsIDOMDOMImplementation - NS_IMETHOD HasFeature(const nsAReadableString& aFeature, - const nsAReadableString& aVersion, + NS_IMETHOD HasFeature(const nsAString& aFeature, + const nsAString& aVersion, PRBool* aReturn); - NS_IMETHOD CreateDocumentType(const nsAReadableString& aQualifiedName, - const nsAReadableString& aPublicId, - const nsAReadableString& aSystemId, + NS_IMETHOD CreateDocumentType(const nsAString& aQualifiedName, + const nsAString& aPublicId, + const nsAString& aSystemId, nsIDOMDocumentType** aReturn); - NS_IMETHOD CreateDocument(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aQualifiedName, + NS_IMETHOD CreateDocument(const nsAString& aNamespaceURI, + const nsAString& aQualifiedName, nsIDOMDocumentType* aDoctype, nsIDOMDocument** aReturn); @@ -344,17 +344,17 @@ NS_IMPL_RELEASE(nsDOMImplementation); NS_IMETHODIMP -nsDOMImplementation::HasFeature(const nsAReadableString& aFeature, - const nsAReadableString& aVersion, +nsDOMImplementation::HasFeature(const nsAString& aFeature, + const nsAString& aVersion, PRBool* aReturn) { return nsGenericElement::InternalIsSupported(aFeature, aVersion, aReturn); } NS_IMETHODIMP -nsDOMImplementation::CreateDocumentType(const nsAReadableString& aQualifiedName, - const nsAReadableString& aPublicId, - const nsAReadableString& aSystemId, +nsDOMImplementation::CreateDocumentType(const nsAString& aQualifiedName, + const nsAString& aPublicId, + const nsAString& aSystemId, nsIDOMDocumentType** aReturn) { NS_ENSURE_ARG_POINTER(aReturn); @@ -364,8 +364,8 @@ nsDOMImplementation::CreateDocumentType(const nsAReadableString& aQualifiedName, } NS_IMETHODIMP -nsDOMImplementation::CreateDocument(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aQualifiedName, +nsDOMImplementation::CreateDocument(const nsAString& aNamespaceURI, + const nsAString& aQualifiedName, nsIDOMDocumentType* aDoctype, nsIDOMDocument** aReturn) { @@ -851,14 +851,14 @@ nsDocument::AddPrincipal(nsIPrincipal *aNewPrincipal) } NS_IMETHODIMP -nsDocument::GetContentType(nsAWritableString& aContentType) +nsDocument::GetContentType(nsAString& aContentType) { aContentType = mContentType; return NS_OK; } NS_IMETHODIMP -nsDocument::GetContentLanguage(nsAWritableString& aContentLanguage) const +nsDocument::GetContentLanguage(nsAString& aContentLanguage) const { aContentLanguage = mContentLanguage; return NS_OK; @@ -904,25 +904,25 @@ nsDocument::SetBaseURL(nsIURI* aURL) } NS_IMETHODIMP -nsDocument::GetBaseTarget(nsAWritableString &aBaseTarget) +nsDocument::GetBaseTarget(nsAString &aBaseTarget) { aBaseTarget.Truncate(); return NS_OK; } NS_IMETHODIMP -nsDocument::SetBaseTarget(const nsAReadableString &aBaseTarget) +nsDocument::SetBaseTarget(const nsAString &aBaseTarget) { return NS_OK; } -NS_IMETHODIMP nsDocument::GetDocumentCharacterSet(nsAWritableString& oCharSetID) +NS_IMETHODIMP nsDocument::GetDocumentCharacterSet(nsAString& oCharSetID) { oCharSetID = mCharacterSet; return NS_OK; } -NS_IMETHODIMP nsDocument::SetDocumentCharacterSet(const nsAReadableString& aCharSetID) +NS_IMETHODIMP nsDocument::SetDocumentCharacterSet(const nsAString& aCharSetID) { if (!mCharacterSet.Equals(aCharSetID)) { mCharacterSet = aCharSetID; @@ -1007,7 +1007,7 @@ NS_IMETHODIMP nsDocument::SetWordBreaker(nsIWordBreaker* aWordBreaker) } NS_IMETHODIMP -nsDocument::GetHeaderData(nsIAtom* aHeaderField, nsAWritableString& aData) const +nsDocument::GetHeaderData(nsIAtom* aHeaderField, nsAString& aData) const { aData.Truncate(); const nsDocHeaderData* data = mHeaderData; @@ -1022,7 +1022,7 @@ nsDocument::GetHeaderData(nsIAtom* aHeaderField, nsAWritableString& aData) const } NS_IMETHODIMP -nsDocument::SetHeaderData(nsIAtom* aHeaderField, const nsAReadableString& aData) +nsDocument::SetHeaderData(nsIAtom* aHeaderField, const nsAString& aData) { if (nsnull != aHeaderField) { if (nsnull == mHeaderData) { @@ -2156,7 +2156,7 @@ nsDocument::GetDocumentElement(nsIDOMElement** aDocumentElement) } NS_IMETHODIMP -nsDocument::CreateElement(const nsAReadableString& aTagName, +nsDocument::CreateElement(const nsAString& aTagName, nsIDOMElement** aReturn) { // Should be implemented by subclass @@ -2164,8 +2164,8 @@ nsDocument::CreateElement(const nsAReadableString& aTagName, } NS_IMETHODIMP -nsDocument::CreateElementNS(const nsAReadableString & namespaceURI, - const nsAReadableString & qualifiedName, +nsDocument::CreateElementNS(const nsAString & namespaceURI, + const nsAString & qualifiedName, nsIDOMElement **_retval) { // Should be implemented by subclass @@ -2173,7 +2173,7 @@ nsDocument::CreateElementNS(const nsAReadableString & namespaceURI, } NS_IMETHODIMP -nsDocument::CreateTextNode(const nsAReadableString& aData, nsIDOMText** aReturn) +nsDocument::CreateTextNode(const nsAString& aData, nsIDOMText** aReturn) { nsCOMPtr text; nsresult rv = NS_NewTextNode(getter_AddRefs(text)); @@ -2193,7 +2193,7 @@ nsDocument::CreateDocumentFragment(nsIDOMDocumentFragment** aReturn) } NS_IMETHODIMP -nsDocument::CreateComment(const nsAReadableString& aData, nsIDOMComment** aReturn) +nsDocument::CreateComment(const nsAString& aData, nsIDOMComment** aReturn) { nsCOMPtr comment; nsresult rv = NS_NewCommentNode(getter_AddRefs(comment)); @@ -2207,15 +2207,15 @@ nsDocument::CreateComment(const nsAReadableString& aData, nsIDOMComment** aRetur } NS_IMETHODIMP -nsDocument::CreateCDATASection(const nsAReadableString& aData, nsIDOMCDATASection** aReturn) +nsDocument::CreateCDATASection(const nsAString& aData, nsIDOMCDATASection** aReturn) { // Should be implemented by subclass return NS_ERROR_NOT_IMPLEMENTED; } NS_IMETHODIMP -nsDocument::CreateProcessingInstruction(const nsAReadableString& aTarget, - const nsAReadableString& aData, +nsDocument::CreateProcessingInstruction(const nsAString& aTarget, + const nsAString& aData, nsIDOMProcessingInstruction** aReturn) { // Should be implemented by subclass @@ -2223,7 +2223,7 @@ nsDocument::CreateProcessingInstruction(const nsAReadableString& aTarget, } NS_IMETHODIMP -nsDocument::CreateAttribute(const nsAReadableString& aName, +nsDocument::CreateAttribute(const nsAString& aName, nsIDOMAttr** aReturn) { NS_ENSURE_ARG_POINTER(aReturn); @@ -2244,8 +2244,8 @@ nsDocument::CreateAttribute(const nsAReadableString& aName, } NS_IMETHODIMP -nsDocument::CreateAttributeNS(const nsAReadableString & namespaceURI, - const nsAReadableString & qualifiedName, +nsDocument::CreateAttributeNS(const nsAString & namespaceURI, + const nsAString & qualifiedName, nsIDOMAttr **_retval) { // Should be implemented by subclass @@ -2253,7 +2253,7 @@ nsDocument::CreateAttributeNS(const nsAReadableString & namespaceURI, } NS_IMETHODIMP -nsDocument::CreateEntityReference(const nsAReadableString& aName, +nsDocument::CreateEntityReference(const nsAString& aName, nsIDOMEntityReference** aReturn) { // Should be implemented by subclass @@ -2261,7 +2261,7 @@ nsDocument::CreateEntityReference(const nsAReadableString& aName, } NS_IMETHODIMP -nsDocument::GetElementsByTagName(const nsAReadableString& aTagname, +nsDocument::GetElementsByTagName(const nsAString& aTagname, nsIDOMNodeList** aReturn) { nsCOMPtr nameAtom(dont_AddRef(NS_NewAtom(aTagname))); @@ -2273,8 +2273,8 @@ nsDocument::GetElementsByTagName(const nsAReadableString& aTagname, } NS_IMETHODIMP -nsDocument::GetElementsByTagNameNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aLocalName, +nsDocument::GetElementsByTagNameNS(const nsAString& aNamespaceURI, + const nsAString& aLocalName, nsIDOMNodeList** aReturn) { @@ -2302,7 +2302,7 @@ nsDocument::GetElementsByTagNameNS(const nsAReadableString& aNamespaceURI, } NS_IMETHODIMP -nsDocument::GetElementById(const nsAReadableString & elementId, +nsDocument::GetElementById(const nsAString & elementId, nsIDOMElement **_retval) { // Should be implemented by subclass @@ -2310,7 +2310,7 @@ nsDocument::GetElementById(const nsAReadableString & elementId, } NS_IMETHODIMP -nsDocument::Load(const nsAReadableString& aUrl) +nsDocument::Load(const nsAString& aUrl) { NS_ERROR("nsDocument::Load() should be overriden by subclass!"); @@ -2318,7 +2318,7 @@ nsDocument::Load(const nsAReadableString& aUrl) } NS_IMETHODIMP -nsDocument::EvaluateFIXptr(const nsAReadableString& aExpression, nsIDOMRange **aRange) +nsDocument::EvaluateFIXptr(const nsAString& aExpression, nsIDOMRange **aRange) { NS_ERROR("nsDocument::EvaluateFIXptr() should be overriden by subclass!"); @@ -2342,7 +2342,7 @@ nsDocument::GetStyleSheets(nsIDOMStyleSheetList** aStyleSheets) } NS_IMETHODIMP -nsDocument::GetCharacterSet(nsAWritableString& aCharacterSet) +nsDocument::GetCharacterSet(nsAString& aCharacterSet) { return GetDocumentCharacterSet(aCharacterSet); } @@ -2359,7 +2359,7 @@ nsDocument::ImportNode(nsIDOMNode* aImportedNode, } NS_IMETHODIMP -nsDocument::AddBinding(nsIDOMElement* aContent, const nsAReadableString& aURL) +nsDocument::AddBinding(nsIDOMElement* aContent, const nsAString& aURL) { nsCOMPtr bm; GetBindingManager(getter_AddRefs(bm)); @@ -2369,7 +2369,7 @@ nsDocument::AddBinding(nsIDOMElement* aContent, const nsAReadableString& aURL) } NS_IMETHODIMP -nsDocument::RemoveBinding(nsIDOMElement* aContent, const nsAReadableString& aURL) +nsDocument::RemoveBinding(nsIDOMElement* aContent, const nsAString& aURL) { if (mBindingManager) { nsCOMPtr content(do_QueryInterface(aContent)); @@ -2380,7 +2380,7 @@ nsDocument::RemoveBinding(nsIDOMElement* aContent, const nsAReadableString& aURL } NS_IMETHODIMP -nsDocument::LoadBindingDocument(const nsAReadableString& aURL, nsIDOMDocument** aResult) +nsDocument::LoadBindingDocument(const nsAString& aURL, nsIDOMDocument** aResult) { if (mBindingManager) { nsCOMPtr doc; @@ -2413,7 +2413,7 @@ nsDocument::GetBindingParent(nsIDOMNode* aNode, nsIDOMElement** aResult) static nsresult GetElementByAttribute(nsIContent* aContent, nsIAtom* aAttrName, - const nsAReadableString& aAttrValue, + const nsAString& aAttrValue, PRBool aUniversalMatch, nsIDOMElement** aResult) { @@ -2442,8 +2442,8 @@ GetElementByAttribute(nsIContent* aContent, NS_IMETHODIMP nsDocument::GetAnonymousElementByAttribute(nsIDOMElement* aElement, - const nsAReadableString& aAttrName, - const nsAReadableString& aAttrValue, + const nsAString& aAttrName, + const nsAString& aAttrValue, nsIDOMElement** aResult) { *aResult = nsnull; @@ -2567,7 +2567,7 @@ nsDocument::GetLocation(nsIDOMLocation **_retval) } NS_IMETHODIMP -nsDocument::GetTitle(nsAWritableString& aTitle) +nsDocument::GetTitle(nsAString& aTitle) { aTitle.Assign(mDocumentTitle); @@ -2575,7 +2575,7 @@ nsDocument::GetTitle(nsAWritableString& aTitle) } NS_IMETHODIMP -nsDocument::SetTitle(const nsAReadableString& aTitle) +nsDocument::SetTitle(const nsAString& aTitle) { for (PRInt32 i = mPresShells.Count() - 1; i >= 0; --i) { nsIPresShell* shell = NS_STATIC_CAST(nsIPresShell*, mPresShells[i]); @@ -2725,7 +2725,7 @@ static const DirTable dirAttributes[] = { * @lina 01/09/2001 */ NS_IMETHODIMP -nsDocument::GetDir(nsAWritableString& aDirection) +nsDocument::GetDir(nsAString& aDirection) { #ifdef IBMBIDI nsIPresShell* shell = (nsIPresShell*) mPresShells.SafeElementAt(0); @@ -2755,7 +2755,7 @@ nsDocument::GetDir(nsAWritableString& aDirection) * @lina 01/09/2001 */ NS_IMETHODIMP -nsDocument::SetDir(const nsAReadableString& aDirection) +nsDocument::SetDir(const nsAString& aDirection) { #ifdef IBMBIDI if (mPresShells.Count() != 0) { @@ -2787,14 +2787,14 @@ nsDocument::SetDir(const nsAReadableString& aDirection) // nsIDOMNode methods // NS_IMETHODIMP -nsDocument::GetNodeName(nsAWritableString& aNodeName) +nsDocument::GetNodeName(nsAString& aNodeName) { aNodeName.Assign(NS_LITERAL_STRING("#document")); return NS_OK; } NS_IMETHODIMP -nsDocument::GetNodeValue(nsAWritableString& aNodeValue) +nsDocument::GetNodeValue(nsAString& aNodeValue) { SetDOMStringToNull(aNodeValue); @@ -2802,7 +2802,7 @@ nsDocument::GetNodeValue(nsAWritableString& aNodeValue) } NS_IMETHODIMP -nsDocument::SetNodeValue(const nsAReadableString& aNodeValue) +nsDocument::SetNodeValue(const nsAString& aNodeValue) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; } @@ -2913,7 +2913,7 @@ nsDocument::GetAttributes(nsIDOMNamedNodeMap** aAttributes) } NS_IMETHODIMP -nsDocument::GetNamespaceURI(nsAWritableString& aNamespaceURI) +nsDocument::GetNamespaceURI(nsAString& aNamespaceURI) { SetDOMStringToNull(aNamespaceURI); @@ -2921,7 +2921,7 @@ nsDocument::GetNamespaceURI(nsAWritableString& aNamespaceURI) } NS_IMETHODIMP -nsDocument::GetPrefix(nsAWritableString& aPrefix) +nsDocument::GetPrefix(nsAString& aPrefix) { SetDOMStringToNull(aPrefix); @@ -2929,13 +2929,13 @@ nsDocument::GetPrefix(nsAWritableString& aPrefix) } NS_IMETHODIMP -nsDocument::SetPrefix(const nsAReadableString& aPrefix) +nsDocument::SetPrefix(const nsAString& aPrefix) { return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; } NS_IMETHODIMP -nsDocument::GetLocalName(nsAWritableString& aLocalName) +nsDocument::GetLocalName(nsAString& aLocalName) { SetDOMStringToNull(aLocalName); @@ -3136,15 +3136,15 @@ nsDocument::Normalize() } NS_IMETHODIMP -nsDocument::IsSupported(const nsAReadableString& aFeature, - const nsAReadableString& aVersion, +nsDocument::IsSupported(const nsAString& aFeature, + const nsAString& aVersion, PRBool* aReturn) { return nsGenericElement::InternalIsSupported(aFeature, aVersion, aReturn); } NS_IMETHODIMP -nsDocument::GetBaseURI(nsAWritableString &aURI) +nsDocument::GetBaseURI(nsAString &aURI) { aURI.Truncate(); if (mDocumentBaseURL) { @@ -3156,16 +3156,16 @@ nsDocument::GetBaseURI(nsAWritableString &aURI) } NS_IMETHODIMP -nsDocument::LookupNamespacePrefix(const nsAReadableString& aNamespaceURI, - nsAWritableString& aPrefix) +nsDocument::LookupNamespacePrefix(const nsAString& aNamespaceURI, + nsAString& aPrefix) { aPrefix.Truncate(); return NS_OK; } NS_IMETHODIMP -nsDocument::LookupNamespaceURI(const nsAReadableString& aNamespacePrefix, - nsAWritableString& aNamespaceURI) +nsDocument::LookupNamespaceURI(const nsAString& aNamespacePrefix, + nsAString& aNamespaceURI) { aNamespaceURI.Truncate(); return NS_OK; @@ -3290,7 +3290,7 @@ nsresult nsDocument::RemoveEventListenerByIID(nsIDOMEventListener *aListener, co return NS_ERROR_FAILURE; } -nsresult nsDocument::AddEventListener(const nsAReadableString& aType, nsIDOMEventListener* aListener, +nsresult nsDocument::AddEventListener(const nsAString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture) { nsCOMPtr manager; @@ -3305,7 +3305,7 @@ nsresult nsDocument::AddEventListener(const nsAReadableString& aType, nsIDOMEven return NS_ERROR_FAILURE; } -nsresult nsDocument::RemoveEventListener(const nsAReadableString& aType, nsIDOMEventListener* aListener, +nsresult nsDocument::RemoveEventListener(const nsAString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture) { if (nsnull != mListenerManager) { @@ -3344,7 +3344,7 @@ nsDocument::DispatchEvent(nsIDOMEvent* aEvent, PRBool *_retval) } NS_IMETHODIMP -nsDocument::CreateEvent(const nsAReadableString& aEventType, +nsDocument::CreateEvent(const nsAString& aEventType, nsIDOMEvent** aReturn) { NS_ENSURE_ARG_POINTER(aReturn); diff --git a/mozilla/content/base/src/nsDocument.h b/mozilla/content/base/src/nsDocument.h index 786297049de..22b2e9d1b42 100644 --- a/mozilla/content/base/src/nsDocument.h +++ b/mozilla/content/base/src/nsDocument.h @@ -99,7 +99,7 @@ protected: class nsDocHeaderData { public: - nsDocHeaderData(nsIAtom* aField, const nsAReadableString& aData) + nsDocHeaderData(nsIAtom* aField, const nsAString& aData) { mField = aField; NS_IF_ADDREF(mField); @@ -277,7 +277,7 @@ public: /** * Return the content language of this document. */ - NS_IMETHOD GetContentLanguage(nsAWritableString& aContentLanguage) const; + NS_IMETHOD GetContentLanguage(nsAString& aContentLanguage) const; /** * Return the LoadGroup for the document. May return null. @@ -293,15 +293,15 @@ public: /** * Get/Set the base target of a link in a document. */ - NS_IMETHOD GetBaseTarget(nsAWritableString &aBaseTarget); - NS_IMETHOD SetBaseTarget(const nsAReadableString &aBaseTarget); + NS_IMETHOD GetBaseTarget(nsAString &aBaseTarget); + NS_IMETHOD SetBaseTarget(const nsAString &aBaseTarget); /** * Return a standard name for the document's character set. This will * trigger a startDocumentLoad if necessary to answer the question. */ - NS_IMETHOD GetDocumentCharacterSet(nsAWritableString& oCharsetID); - NS_IMETHOD SetDocumentCharacterSet(const nsAReadableString& aCharSetID); + NS_IMETHOD GetDocumentCharacterSet(nsAString& oCharsetID); + NS_IMETHOD SetDocumentCharacterSet(const nsAString& aCharSetID); NS_IMETHOD GetDocumentCharacterSetSource(PRInt32* aCharsetSource); NS_IMETHOD SetDocumentCharacterSetSource(PRInt32 aCharsetSource); @@ -341,9 +341,9 @@ public: * HTML META tags). */ NS_IMETHOD GetHeaderData(nsIAtom* aHeaderField, - nsAWritableString& aData) const; + nsAString& aData) const; NS_IMETHOD SetHeaderData(nsIAtom* aheaderField, - const nsAReadableString& aData); + const nsAString& aData); /** * Create a new presentation shell that will use aContext for @@ -535,10 +535,10 @@ public: NS_IMETHOD HandleEvent(nsIDOMEvent *aEvent); // nsIDOMEventTarget interface - NS_IMETHOD AddEventListener(const nsAReadableString& aType, + NS_IMETHOD AddEventListener(const nsAString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture); - NS_IMETHOD RemoveEventListener(const nsAReadableString& aType, + NS_IMETHOD RemoveEventListener(const nsAString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture); NS_IMETHOD DispatchEvent(nsIDOMEvent* aEvent, PRBool *_retval); diff --git a/mozilla/content/base/src/nsDocumentEncoder.cpp b/mozilla/content/base/src/nsDocumentEncoder.cpp index 40231a59ee7..d4b2c6a6f68 100644 --- a/mozilla/content/base/src/nsDocumentEncoder.cpp +++ b/mozilla/content/base/src/nsDocumentEncoder.cpp @@ -100,7 +100,7 @@ public: nsDocumentEncoder(); virtual ~nsDocumentEncoder(); - NS_IMETHOD Init(nsIDocument* aDocument, const nsAReadableString& aMimeType, PRUint32 aFlags); + NS_IMETHOD Init(nsIDocument* aDocument, const nsAString& aMimeType, PRUint32 aFlags); /* Interfaces for addref and release and queryinterface */ NS_DECL_ISUPPORTS @@ -109,33 +109,33 @@ public: NS_IMETHOD SetSelection(nsISelection* aSelection); NS_IMETHOD SetRange(nsIDOMRange* aRange); NS_IMETHOD SetWrapColumn(PRUint32 aWC); - NS_IMETHOD SetCharset(const nsAReadableString& aCharset); - NS_IMETHOD GetMimeType(nsAWritableString& aMimeType); + NS_IMETHOD SetCharset(const nsAString& aCharset); + NS_IMETHOD GetMimeType(nsAString& aMimeType); NS_IMETHOD EncodeToStream(nsIOutputStream* aStream); - NS_IMETHOD EncodeToString(nsAWritableString& aOutputString); - NS_IMETHOD EncodeToStringWithContext(nsAWritableString& aEncodedString, - nsAWritableString& aContextString, - nsAWritableString& aInfoString); + NS_IMETHOD EncodeToString(nsAString& aOutputString); + NS_IMETHOD EncodeToStringWithContext(nsAString& aEncodedString, + nsAString& aContextString, + nsAString& aInfoString); NS_IMETHOD SetNodeFixup(nsIDocumentEncoderNodeFixup *aFixup); protected: nsresult SerializeNodeStart(nsIDOMNode* aNode, PRInt32 aStartOffset, - PRInt32 aEndOffset, nsAWritableString& aStr); + PRInt32 aEndOffset, nsAString& aStr); nsresult SerializeToStringRecursive(nsIDOMNode* aNode, - nsAWritableString& aStr); - nsresult SerializeNodeEnd(nsIDOMNode* aNode, nsAWritableString& aStr); + nsAString& aStr); + nsresult SerializeNodeEnd(nsIDOMNode* aNode, nsAString& aStr); nsresult SerializeRangeToString(nsIDOMRange *aRange, - nsAWritableString& aOutputString); + nsAString& aOutputString); nsresult SerializeRangeNodes(nsIDOMRange* aRange, nsIDOMNode* aNode, - nsAWritableString& aString, + nsAString& aString, PRInt32 aDepth); nsresult SerializeRangeContextStart(const nsVoidArray& aAncestorArray, - nsAWritableString& aString); + nsAString& aString); nsresult SerializeRangeContextEnd(const nsVoidArray& aAncestorArray, - nsAWritableString& aString); + nsAString& aString); - nsresult FlushText(nsAWritableString& aString, PRBool aForce); + nsresult FlushText(nsAString& aString, PRBool aForce); static PRBool IsTag(nsIDOMNode* aNode, nsIAtom* aAtom); @@ -228,7 +228,7 @@ IsScriptEnabled(nsIDocument *aDoc) NS_IMETHODIMP nsDocumentEncoder::Init(nsIDocument* aDocument, - const nsAReadableString& aMimeType, + const nsAString& aMimeType, PRUint32 aFlags) { if (!aDocument) @@ -266,14 +266,14 @@ nsDocumentEncoder::SetRange(nsIDOMRange* aRange) } NS_IMETHODIMP -nsDocumentEncoder::SetCharset(const nsAReadableString& aCharset) +nsDocumentEncoder::SetCharset(const nsAString& aCharset) { mCharset = aCharset; return NS_OK; } NS_IMETHODIMP -nsDocumentEncoder::GetMimeType(nsAWritableString& aMimeType) +nsDocumentEncoder::GetMimeType(nsAString& aMimeType) { aMimeType = mMimeType; return NS_OK; @@ -289,7 +289,7 @@ nsDocumentEncoder::IncludeInContext(nsIDOMNode *aNode) nsresult nsDocumentEncoder::SerializeNodeStart(nsIDOMNode* aNode, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr) + nsAString& aStr) { PRUint16 type; @@ -349,7 +349,7 @@ nsDocumentEncoder::SerializeNodeStart(nsIDOMNode* aNode, PRInt32 aStartOffset, nsresult nsDocumentEncoder::SerializeNodeEnd(nsIDOMNode* aNode, - nsAWritableString& aStr) + nsAString& aStr) { PRUint16 type; @@ -368,7 +368,7 @@ nsDocumentEncoder::SerializeNodeEnd(nsIDOMNode* aNode, nsresult nsDocumentEncoder::SerializeToStringRecursive(nsIDOMNode* aNode, - nsAWritableString& aStr) + nsAString& aStr) { nsresult rv = SerializeNodeStart(aNode, 0, -1, aStr); NS_ENSURE_SUCCESS(rv, rv); @@ -423,7 +423,7 @@ nsDocumentEncoder::IsTag(nsIDOMNode* aNode, nsIAtom* aAtom) } static nsresult -ConvertAndWrite(nsAReadableString& aString, +ConvertAndWrite(const nsAString& aString, nsIOutputStream* aStream, nsIUnicodeEncoder* aEncoder) { @@ -484,7 +484,7 @@ ConvertAndWrite(nsAReadableString& aString, } nsresult -nsDocumentEncoder::FlushText(nsAWritableString& aString, PRBool aForce) +nsDocumentEncoder::FlushText(nsAString& aString, PRBool aForce) { if (!mStream) return NS_OK; @@ -650,7 +650,7 @@ static nsresult GetLengthOfDOMNode(nsIDOMNode *aNode, PRUint32 &aCount) nsresult nsDocumentEncoder::SerializeRangeNodes(nsIDOMRange* aRange, nsIDOMNode* aNode, - nsAWritableString& aString, + nsAString& aString, PRInt32 aDepth) { nsCOMPtr content = do_QueryInterface(aNode); @@ -769,7 +769,7 @@ nsDocumentEncoder::SerializeRangeNodes(nsIDOMRange* aRange, nsresult nsDocumentEncoder::SerializeRangeContextStart(const nsVoidArray& aAncestorArray, - nsAWritableString& aString) + nsAString& aString) { PRInt32 i = aAncestorArray.Count(); nsresult rv = NS_OK; @@ -793,7 +793,7 @@ nsDocumentEncoder::SerializeRangeContextStart(const nsVoidArray& aAncestorArray, nsresult nsDocumentEncoder::SerializeRangeContextEnd(const nsVoidArray& aAncestorArray, - nsAWritableString& aString) + nsAString& aString) { PRInt32 i = 0; PRInt32 count = aAncestorArray.Count(); @@ -818,7 +818,7 @@ nsDocumentEncoder::SerializeRangeContextEnd(const nsVoidArray& aAncestorArray, nsresult nsDocumentEncoder::SerializeRangeToString(nsIDOMRange *aRange, - nsAWritableString& aOutputString) + nsAString& aOutputString) { if (!aRange) return NS_OK; @@ -881,7 +881,7 @@ nsDocumentEncoder::SerializeRangeToString(nsIDOMRange *aRange, } NS_IMETHODIMP -nsDocumentEncoder::EncodeToString(nsAWritableString& aOutputString) +nsDocumentEncoder::EncodeToString(nsAString& aOutputString) { if (!mDocument) return NS_ERROR_NOT_INITIALIZED; @@ -980,9 +980,9 @@ nsDocumentEncoder::EncodeToStream(nsIOutputStream* aStream) } NS_IMETHODIMP -nsDocumentEncoder::EncodeToStringWithContext(nsAWritableString& aEncodedString, - nsAWritableString& aContextString, - nsAWritableString& aInfoString) +nsDocumentEncoder::EncodeToStringWithContext(nsAString& aEncodedString, + nsAString& aContextString, + nsAString& aInfoString) { return NS_ERROR_NOT_IMPLEMENTED; } @@ -1021,13 +1021,13 @@ public: nsHTMLCopyEncoder(); virtual ~nsHTMLCopyEncoder(); - NS_IMETHOD Init(nsIDocument* aDocument, const nsAReadableString& aMimeType, PRUint32 aFlags); + NS_IMETHOD Init(nsIDocument* aDocument, const nsAString& aMimeType, PRUint32 aFlags); // overridden methods from nsDocumentEncoder NS_IMETHOD SetSelection(nsISelection* aSelection); - NS_IMETHOD EncodeToStringWithContext(nsAWritableString& aEncodedString, - nsAWritableString& aContextString, - nsAWritableString& aInfoString); + NS_IMETHOD EncodeToStringWithContext(nsAString& aEncodedString, + nsAString& aContextString, + nsAString& aInfoString); protected: @@ -1069,7 +1069,7 @@ nsHTMLCopyEncoder::~nsHTMLCopyEncoder() NS_IMETHODIMP nsHTMLCopyEncoder::Init(nsIDocument* aDocument, - const nsAReadableString& aMimetype, + const nsAString& aMimetype, PRUint32 aFlags) { if (!aDocument) @@ -1207,9 +1207,9 @@ nsHTMLCopyEncoder::SetSelection(nsISelection* aSelection) } NS_IMETHODIMP -nsHTMLCopyEncoder::EncodeToStringWithContext(nsAWritableString& aEncodedString, - nsAWritableString& aContextString, - nsAWritableString& aInfoString) +nsHTMLCopyEncoder::EncodeToStringWithContext(nsAString& aEncodedString, + nsAString& aContextString, + nsAString& aInfoString) { nsresult rv = EncodeToString(aEncodedString); NS_ENSURE_SUCCESS(rv, rv); diff --git a/mozilla/content/base/src/nsDocumentFragment.cpp b/mozilla/content/base/src/nsDocumentFragment.cpp index a861d20055d..4438d5af696 100644 --- a/mozilla/content/base/src/nsDocumentFragment.cpp +++ b/mozilla/content/base/src/nsDocumentFragment.cpp @@ -65,11 +65,11 @@ public: NS_IMETHOD DropChildReferences(); // interface nsIDOMDocumentFragment - NS_IMETHOD GetNodeName(nsAWritableString& aNodeName) + NS_IMETHOD GetNodeName(nsAString& aNodeName) { return nsGenericContainerElement::GetNodeName(aNodeName); } - NS_IMETHOD GetNodeValue(nsAWritableString& aNodeValue) + NS_IMETHOD GetNodeValue(nsAString& aNodeValue) { return nsGenericContainerElement::GetNodeValue(aNodeValue); } - NS_IMETHOD SetNodeValue(const nsAReadableString& aNodeValue) + NS_IMETHOD SetNodeValue(const nsAString& aNodeValue) { return nsGenericContainerElement::SetNodeValue(aNodeValue); } NS_IMETHOD GetNodeType(PRUint16* aNodeType); NS_IMETHOD GetParentNode(nsIDOMNode** aParentNode) @@ -107,30 +107,30 @@ public: NS_IMETHOD HasAttributes(PRBool* aReturn) { return nsGenericContainerElement::HasAttributes(aReturn); } NS_IMETHOD CloneNode(PRBool aDeep, nsIDOMNode** aReturn); - NS_IMETHOD GetPrefix(nsAWritableString& aPrefix) + NS_IMETHOD GetPrefix(nsAString& aPrefix) { return nsGenericContainerElement::GetPrefix(aPrefix); } - NS_IMETHOD SetPrefix(const nsAReadableString& aPrefix); - NS_IMETHOD GetNamespaceURI(nsAWritableString& aNamespaceURI) + NS_IMETHOD SetPrefix(const nsAString& aPrefix); + NS_IMETHOD GetNamespaceURI(nsAString& aNamespaceURI) { return nsGenericContainerElement::GetNamespaceURI(aNamespaceURI); } - NS_IMETHOD GetLocalName(nsAWritableString& aLocalName) + NS_IMETHOD GetLocalName(nsAString& aLocalName) { return nsGenericContainerElement::GetLocalName(aLocalName); } NS_IMETHOD Normalize() { return nsGenericContainerElement::Normalize(); } - NS_IMETHOD IsSupported(const nsAReadableString& aFeature, - const nsAReadableString& aVersion, + NS_IMETHOD IsSupported(const nsAString& aFeature, + const nsAString& aVersion, PRBool* aReturn) { return nsGenericContainerElement::IsSupported(aFeature, aVersion, aReturn); } // nsIDOM3Node - NS_IMETHOD GetBaseURI(nsAWritableString& aURI) + NS_IMETHOD GetBaseURI(nsAString& aURI) { aURI.Truncate(); return NS_OK; } - NS_IMETHOD LookupNamespacePrefix(const nsAReadableString& aNamespaceURI, - nsAWritableString& aPrefix) { + NS_IMETHOD LookupNamespacePrefix(const nsAString& aNamespaceURI, + nsAString& aPrefix) { aPrefix.Truncate(); return NS_OK; } - NS_IMETHOD LookupNamespaceURI(const nsAReadableString& aNamespacePrefix, - nsAWritableString& aNamespaceURI) { + NS_IMETHOD LookupNamespaceURI(const nsAString& aNamespacePrefix, + nsAString& aNamespaceURI) { aNamespaceURI.Truncate(); return NS_OK; } @@ -138,18 +138,18 @@ public: NS_IMETHOD SetParent(nsIContent* aParent) { return NS_OK; } NS_IMETHOD SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, - const nsAReadableString& aValue, + const nsAString& aValue, PRBool aNotify) { return NS_OK; } NS_IMETHOD SetAttr(nsINodeInfo* aNodeInfo, - const nsAReadableString& aValue, + const nsAString& aValue, PRBool aNotify) { return NS_OK; } NS_IMETHOD GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, - nsAWritableString& aResult) const + nsAString& aResult) const { return NS_CONTENT_ATTR_NOT_THERE; } NS_IMETHOD GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, - nsIAtom*& aPrefix, nsAWritableString& aResult) const + nsIAtom*& aPrefix, nsAString& aResult) const { return NS_CONTENT_ATTR_NOT_THERE; } NS_IMETHOD UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRBool aNotify) @@ -338,7 +338,7 @@ nsDocumentFragment::GetOwnerDocument(nsIDOMDocument** aOwnerDocument) } NS_IMETHODIMP -nsDocumentFragment::SetPrefix(const nsAReadableString& aPrefix) +nsDocumentFragment::SetPrefix(const nsAString& aPrefix) { return NS_ERROR_DOM_NAMESPACE_ERR; } diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp index 9b18ed591c1..b9c7b2dbc78 100644 --- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp +++ b/mozilla/content/base/src/nsGenericDOMDataNode.cpp @@ -185,13 +185,13 @@ NS_INTERFACE_MAP_END nsresult -nsGenericDOMDataNode::GetNodeValue(nsAWritableString& aNodeValue) +nsGenericDOMDataNode::GetNodeValue(nsAString& aNodeValue) { return GetData(aNodeValue); } nsresult -nsGenericDOMDataNode::SetNodeValue(const nsAReadableString& aNodeValue) +nsGenericDOMDataNode::SetNodeValue(const nsAString& aNodeValue) { return SetData(aNodeValue); } @@ -317,7 +317,7 @@ nsGenericDOMDataNode::GetOwnerDocument(nsIDOMDocument** aOwnerDocument) } nsresult -nsGenericDOMDataNode::GetNamespaceURI(nsAWritableString& aNamespaceURI) +nsGenericDOMDataNode::GetNamespaceURI(nsAString& aNamespaceURI) { SetDOMStringToNull(aNamespaceURI); @@ -325,7 +325,7 @@ nsGenericDOMDataNode::GetNamespaceURI(nsAWritableString& aNamespaceURI) } nsresult -nsGenericDOMDataNode::GetPrefix(nsAWritableString& aPrefix) +nsGenericDOMDataNode::GetPrefix(nsAString& aPrefix) { SetDOMStringToNull(aPrefix); @@ -333,13 +333,13 @@ nsGenericDOMDataNode::GetPrefix(nsAWritableString& aPrefix) } nsresult -nsGenericDOMDataNode::SetPrefix(const nsAReadableString& aPrefix) +nsGenericDOMDataNode::SetPrefix(const nsAString& aPrefix) { return NS_ERROR_DOM_NAMESPACE_ERR; } nsresult -nsGenericDOMDataNode::GetLocalName(nsAWritableString& aLocalName) +nsGenericDOMDataNode::GetLocalName(nsAString& aLocalName) { SetDOMStringToNull(aLocalName); @@ -353,15 +353,15 @@ nsGenericDOMDataNode::Normalize() } nsresult -nsGenericDOMDataNode::IsSupported(const nsAReadableString& aFeature, - const nsAReadableString& aVersion, +nsGenericDOMDataNode::IsSupported(const nsAString& aFeature, + const nsAString& aVersion, PRBool* aReturn) { return nsGenericElement::InternalIsSupported(aFeature, aVersion, aReturn); } nsresult -nsGenericDOMDataNode::GetBaseURI(nsAWritableString& aURI) +nsGenericDOMDataNode::GetBaseURI(nsAString& aURI) { aURI.Truncate(); nsresult rv = NS_OK; @@ -385,8 +385,8 @@ nsGenericDOMDataNode::GetBaseURI(nsAWritableString& aURI) } nsresult -nsGenericDOMDataNode::LookupNamespacePrefix(const nsAReadableString& aNamespaceURI, - nsAWritableString& aPrefix) +nsGenericDOMDataNode::LookupNamespacePrefix(const nsAString& aNamespaceURI, + nsAString& aPrefix) { aPrefix.Truncate(); @@ -403,8 +403,8 @@ nsGenericDOMDataNode::LookupNamespacePrefix(const nsAReadableString& aNamespaceU } nsresult -nsGenericDOMDataNode::LookupNamespaceURI(const nsAReadableString& aNamespacePrefix, - nsAWritableString& aNamespaceURI) +nsGenericDOMDataNode::LookupNamespaceURI(const nsAString& aNamespacePrefix, + nsAString& aNamespaceURI) { aNamespaceURI.Truncate(); @@ -425,7 +425,7 @@ nsGenericDOMDataNode::LookupNamespaceURI(const nsAReadableString& aNamespacePref // Implementation of nsIDOMCharacterData nsresult -nsGenericDOMDataNode::GetData(nsAWritableString& aData) +nsGenericDOMDataNode::GetData(nsAString& aData) { if (mText.Is2b()) { aData.Assign(mText.Get2b(), mText.GetLength()); @@ -441,7 +441,7 @@ nsGenericDOMDataNode::GetData(nsAWritableString& aData) } nsresult -nsGenericDOMDataNode::SetData(const nsAReadableString& aData) +nsGenericDOMDataNode::SetData(const nsAString& aData) { // inform any enclosed ranges of change // we can lie and say we are deleting all the text, since in a total @@ -465,7 +465,7 @@ nsGenericDOMDataNode::GetLength(PRUint32* aLength) nsresult nsGenericDOMDataNode::SubstringData(PRUint32 aStart, PRUint32 aCount, - nsAWritableString& aReturn) + nsAString& aReturn) { aReturn.Truncate(); @@ -496,7 +496,7 @@ nsGenericDOMDataNode::SubstringData(PRUint32 aStart, PRUint32 aCount, //---------------------------------------------------------------------- nsresult -nsGenericDOMDataNode::AppendData(const nsAReadableString& aData) +nsGenericDOMDataNode::AppendData(const nsAString& aData) { #if 1 nsresult rv = NS_OK; @@ -533,7 +533,7 @@ nsGenericDOMDataNode::AppendData(const nsAReadableString& aData) nsresult nsGenericDOMDataNode::InsertData(PRUint32 aOffset, - const nsAReadableString& aData) + const nsAString& aData) { return ReplaceData(aOffset, 0, aData); } @@ -547,7 +547,7 @@ nsGenericDOMDataNode::DeleteData(PRUint32 aOffset, PRUint32 aCount) nsresult nsGenericDOMDataNode::ReplaceData(PRUint32 aOffset, PRUint32 aCount, - const nsAReadableString& aData) + const nsAString& aData) { nsresult result = NS_OK; @@ -647,7 +647,7 @@ nsGenericDOMDataNode::GetListenerManager(nsIEventListenerManager** aResult) #ifdef DEBUG void -nsGenericDOMDataNode::ToCString(nsAWritableString& aBuf, PRInt32 aOffset, +nsGenericDOMDataNode::ToCString(nsAString& aBuf, PRInt32 aOffset, PRInt32 aLen) const { if (mText.Is2b()) { @@ -747,7 +747,7 @@ nsGenericDOMDataNode::GetNameSpaceID(PRInt32& aID) const } NS_IMETHODIMP -nsGenericDOMDataNode::NormalizeAttrString(const nsAReadableString& aStr, +nsGenericDOMDataNode::NormalizeAttrString(const nsAString& aStr, nsINodeInfo*& aNodeInfo) { aNodeInfo = nsnull; @@ -756,14 +756,14 @@ nsGenericDOMDataNode::NormalizeAttrString(const nsAReadableString& aStr, NS_IMETHODIMP nsGenericDOMDataNode::SetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttr, - const nsAReadableString& aValue, PRBool aNotify) + const nsAString& aValue, PRBool aNotify) { return NS_OK; } NS_IMETHODIMP nsGenericDOMDataNode::SetAttr(nsINodeInfo *aNodeInfo, - const nsAReadableString& aValue, PRBool aNotify) + const nsAString& aValue, PRBool aNotify) { return NS_OK; } @@ -777,7 +777,7 @@ nsGenericDOMDataNode::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttr, NS_IMETHODIMP nsGenericDOMDataNode::GetAttr(PRInt32 aNameSpaceID, nsIAtom *aAttr, - nsAWritableString& aResult) const + nsAString& aResult) const { aResult.Truncate(); @@ -787,7 +787,7 @@ nsGenericDOMDataNode::GetAttr(PRInt32 aNameSpaceID, nsIAtom *aAttr, NS_IMETHODIMP nsGenericDOMDataNode::GetAttr(PRInt32 aNameSpaceID, nsIAtom *aAttr, nsIAtom*& aPrefix, - nsAWritableString& aResult) const + nsAString& aResult) const { aPrefix = nsnull; aResult.Truncate(); @@ -1211,7 +1211,7 @@ nsGenericDOMDataNode::GetTextLength(PRInt32* aLengthResult) } NS_IMETHODIMP -nsGenericDOMDataNode::CopyText(nsAWritableString& aResult) +nsGenericDOMDataNode::CopyText(nsAString& aResult) { if (mText.Is2b()) { aResult.Assign(mText.Get2b(), mText.GetLength()); @@ -1317,7 +1317,7 @@ nsGenericDOMDataNode::SetText(const char* aBuffer, PRInt32 aLength, } NS_IMETHODIMP -nsGenericDOMDataNode::SetText(const nsAReadableString& aStr, +nsGenericDOMDataNode::SetText(const nsAString& aStr, PRBool aNotify) { if (aNotify && mDocument) { diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.h b/mozilla/content/base/src/nsGenericDOMDataNode.h index f7ec272e85b..1823798ff2f 100644 --- a/mozilla/content/base/src/nsGenericDOMDataNode.h +++ b/mozilla/content/base/src/nsGenericDOMDataNode.h @@ -69,8 +69,8 @@ public: virtual ~nsGenericDOMDataNode(); // Implementation for nsIDOMNode - nsresult GetNodeValue(nsAWritableString& aNodeValue); - nsresult SetNodeValue(const nsAReadableString& aNodeValue); + nsresult GetNodeValue(nsAString& aNodeValue); + nsresult SetNodeValue(const nsAString& aNodeValue); nsresult GetParentNode(nsIDOMNode** aParentNode); nsresult GetAttributes(nsIDOMNamedNodeMap** aAttributes) { @@ -141,31 +141,31 @@ public: return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR; } nsresult GetOwnerDocument(nsIDOMDocument** aOwnerDocument); - nsresult GetNamespaceURI(nsAWritableString& aNamespaceURI); - nsresult GetLocalName(nsAWritableString& aLocalName); - nsresult GetPrefix(nsAWritableString& aPrefix); - nsresult SetPrefix(const nsAReadableString& aPrefix); + nsresult GetNamespaceURI(nsAString& aNamespaceURI); + nsresult GetLocalName(nsAString& aLocalName); + nsresult GetPrefix(nsAString& aPrefix); + nsresult SetPrefix(const nsAString& aPrefix); nsresult Normalize(); - nsresult IsSupported(const nsAReadableString& aFeature, - const nsAReadableString& aVersion, + nsresult IsSupported(const nsAString& aFeature, + const nsAString& aVersion, PRBool* aReturn); - nsresult GetBaseURI(nsAWritableString& aURI); - nsresult LookupNamespacePrefix(const nsAReadableString& aNamespaceURI, - nsAWritableString& aPrefix); - nsresult LookupNamespaceURI(const nsAReadableString& aNamespacePrefix, - nsAWritableString& aNamespaceURI); + nsresult GetBaseURI(nsAString& aURI); + nsresult LookupNamespacePrefix(const nsAString& aNamespaceURI, + nsAString& aPrefix); + nsresult LookupNamespaceURI(const nsAString& aNamespacePrefix, + nsAString& aNamespaceURI); // Implementation for nsIDOMCharacterData - nsresult GetData(nsAWritableString& aData); - nsresult SetData(const nsAReadableString& aData); + nsresult GetData(nsAString& aData); + nsresult SetData(const nsAString& aData); nsresult GetLength(PRUint32* aLength); nsresult SubstringData(PRUint32 aOffset, PRUint32 aCount, - nsAWritableString& aReturn); - nsresult AppendData(const nsAReadableString& aArg); - nsresult InsertData(PRUint32 aOffset, const nsAReadableString& aArg); + nsAString& aReturn); + nsresult AppendData(const nsAString& aArg); + nsresult InsertData(PRUint32 aOffset, const nsAString& aArg); nsresult DeleteData(PRUint32 aOffset, PRUint32 aCount); nsresult ReplaceData(PRUint32 aOffset, PRUint32 aCount, - const nsAReadableString& aArg); + const nsAString& aArg); // Implementation for nsIContent NS_IMETHOD GetDocument(nsIDocument*& aResult) const; @@ -174,18 +174,18 @@ public: NS_IMETHOD GetParent(nsIContent*& aResult) const; NS_IMETHOD SetParent(nsIContent* aParent); NS_IMETHOD GetNameSpaceID(PRInt32& aID) const; - NS_IMETHOD NormalizeAttrString(const nsAReadableString& aStr, + NS_IMETHOD NormalizeAttrString(const nsAString& aStr, nsINodeInfo*& aNodeInfo); NS_IMETHOD SetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute, - const nsAReadableString& aValue, PRBool aNotify); + const nsAString& aValue, PRBool aNotify); NS_IMETHOD SetAttr(nsINodeInfo *aNodeInfo, - const nsAReadableString& aValue, PRBool aNotify); + const nsAString& aValue, PRBool aNotify); NS_IMETHOD UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRBool aNotify); NS_IMETHOD GetAttr(PRInt32 aNameSpaceID, nsIAtom *aAttribute, - nsAWritableString& aResult) const; + nsAString& aResult) const; NS_IMETHOD GetAttr(PRInt32 aNameSpaceID, nsIAtom *aAttribute, - nsIAtom*& aPrefix, nsAWritableString& aResult) const; + nsIAtom*& aPrefix, nsAString& aResult) const; NS_IMETHOD_(PRBool) HasAttr(PRInt32 aNameSpaceID, nsIAtom *aAttribute) const; NS_IMETHOD GetAttrNameAt(PRInt32 aIndex, PRInt32& aNameSpaceID, nsIAtom*& aName, nsIAtom*& aPrefix) const; @@ -233,10 +233,10 @@ public: NS_IMETHOD GetText(const nsTextFragment** aFragmentsResult); NS_IMETHOD GetTextLength(PRInt32* aLengthResult); - NS_IMETHOD CopyText(nsAWritableString& aResult); + NS_IMETHOD CopyText(nsAString& aResult); NS_IMETHOD SetText(const PRUnichar* aBuffer, PRInt32 aLength, PRBool aNotify); - NS_IMETHOD SetText(const nsAReadableString& aStr, PRBool aNotify); + NS_IMETHOD SetText(const nsAString& aStr, PRBool aNotify); NS_IMETHOD SetText(const char* aBuffer, PRInt32 aLength, PRBool aNotify); NS_IMETHOD IsOnlyWhitespace(PRBool* aResult); NS_IMETHOD CloneContent(PRBool aCloneText, nsITextContent** aClone); @@ -244,7 +244,7 @@ public: //---------------------------------------- #ifdef DEBUG - void ToCString(nsAWritableString& aBuf, PRInt32 aOffset, PRInt32 aLen) const; + void ToCString(nsAString& aBuf, PRInt32 aOffset, PRInt32 aLen) const; #endif static void Shutdown(); @@ -316,14 +316,14 @@ private: * NS_IMETHOD CloneNode(PRBool aDeep, nsIDOMNode** aReturn); */ #define NS_IMPL_NSIDOMNODE_USING_GENERIC_DOM_DATA \ - NS_IMETHOD GetNodeName(nsAWritableString& aNodeName); \ - NS_IMETHOD GetLocalName(nsAWritableString& aLocalName) { \ + NS_IMETHOD GetNodeName(nsAString& aNodeName); \ + NS_IMETHOD GetLocalName(nsAString& aLocalName) { \ return nsGenericDOMDataNode::GetLocalName(aLocalName); \ } \ - NS_IMETHOD GetNodeValue(nsAWritableString& aNodeValue) { \ + NS_IMETHOD GetNodeValue(nsAString& aNodeValue) { \ return nsGenericDOMDataNode::GetNodeValue(aNodeValue); \ } \ - NS_IMETHOD SetNodeValue(const nsAReadableString& aNodeValue) { \ + NS_IMETHOD SetNodeValue(const nsAString& aNodeValue) { \ return nsGenericDOMDataNode::SetNodeValue(aNodeValue); \ } \ NS_IMETHOD GetNodeType(PRUint16* aNodeType); \ @@ -373,33 +373,33 @@ private: NS_IMETHOD GetOwnerDocument(nsIDOMDocument** aOwnerDocument) { \ return nsGenericDOMDataNode::GetOwnerDocument(aOwnerDocument); \ } \ - NS_IMETHOD GetNamespaceURI(nsAWritableString& aNamespaceURI) { \ + NS_IMETHOD GetNamespaceURI(nsAString& aNamespaceURI) { \ return nsGenericDOMDataNode::GetNamespaceURI(aNamespaceURI); \ } \ - NS_IMETHOD GetPrefix(nsAWritableString& aPrefix) { \ + NS_IMETHOD GetPrefix(nsAString& aPrefix) { \ return nsGenericDOMDataNode::GetPrefix(aPrefix); \ } \ - NS_IMETHOD SetPrefix(const nsAReadableString& aPrefix) { \ + NS_IMETHOD SetPrefix(const nsAString& aPrefix) { \ return nsGenericDOMDataNode::SetPrefix(aPrefix); \ } \ NS_IMETHOD Normalize() { \ return NS_OK; \ } \ - NS_IMETHOD IsSupported(const nsAReadableString& aFeature, \ - const nsAReadableString& aVersion, \ + NS_IMETHOD IsSupported(const nsAString& aFeature, \ + const nsAString& aVersion, \ PRBool* aReturn) { \ return nsGenericDOMDataNode::IsSupported(aFeature, aVersion, aReturn); \ } \ - NS_IMETHOD GetBaseURI(nsAWritableString& aURI) { \ + NS_IMETHOD GetBaseURI(nsAString& aURI) { \ return nsGenericDOMDataNode::GetBaseURI(aURI); \ } \ - NS_IMETHOD LookupNamespacePrefix(const nsAReadableString& aNamespaceURI, \ - nsAWritableString& aPrefix) { \ + NS_IMETHOD LookupNamespacePrefix(const nsAString& aNamespaceURI, \ + nsAString& aPrefix) { \ return nsGenericDOMDataNode::LookupNamespacePrefix(aNamespaceURI, \ aPrefix); \ } \ - NS_IMETHOD LookupNamespaceURI(const nsAReadableString& aNamespacePrefix, \ - nsAWritableString& aNamespaceURI) { \ + NS_IMETHOD LookupNamespaceURI(const nsAString& aNamespacePrefix, \ + nsAString& aNamespaceURI) { \ return nsGenericDOMDataNode::LookupNamespaceURI(aNamespacePrefix, \ aNamespaceURI); \ } \ diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index 2bb0fd95d1e..daa694dc70b 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/content/base/src/nsGenericElement.cpp @@ -193,7 +193,7 @@ NS_IMPL_RELEASE(nsNode3Tearoff) NS_IMETHODIMP -nsNode3Tearoff::GetBaseURI(nsAWritableString& aURI) +nsNode3Tearoff::GetBaseURI(nsAString& aURI) { nsCOMPtr uri; @@ -246,8 +246,8 @@ nsNode3Tearoff::GetBaseURI(nsAWritableString& aURI) } NS_IMETHODIMP -nsNode3Tearoff::LookupNamespacePrefix(const nsAReadableString& aNamespaceURI, - nsAWritableString& aPrefix) +nsNode3Tearoff::LookupNamespacePrefix(const nsAString& aNamespaceURI, + nsAString& aPrefix) { SetDOMStringToNull(aPrefix); @@ -338,8 +338,8 @@ nsNode3Tearoff::LookupNamespacePrefix(const nsAReadableString& aNamespaceURI, } NS_IMETHODIMP -nsNode3Tearoff::LookupNamespaceURI(const nsAReadableString& aNamespacePrefix, - nsAWritableString& aNamespaceURI) +nsNode3Tearoff::LookupNamespaceURI(const nsAString& aNamespacePrefix, + nsAString& aNamespaceURI) { nsCOMPtr name; @@ -511,7 +511,7 @@ nsDOMEventRTTearoff::HandleEvent(nsIDOMEvent *aEvent) // nsIDOMEventTarget NS_IMETHODIMP -nsDOMEventRTTearoff::AddEventListener(const nsAReadableString& type, +nsDOMEventRTTearoff::AddEventListener(const nsAString& type, nsIDOMEventListener *listener, PRBool useCapture) { @@ -523,7 +523,7 @@ nsDOMEventRTTearoff::AddEventListener(const nsAReadableString& type, } NS_IMETHODIMP -nsDOMEventRTTearoff::RemoveEventListener(const nsAReadableString& type, +nsDOMEventRTTearoff::RemoveEventListener(const nsAString& type, nsIDOMEventListener *listener, PRBool useCapture) { @@ -643,19 +643,19 @@ nsGenericElement::Init(nsINodeInfo *aNodeInfo) } NS_IMETHODIMP -nsGenericElement::GetNodeName(nsAWritableString& aNodeName) +nsGenericElement::GetNodeName(nsAString& aNodeName) { return mNodeInfo->GetQualifiedName(aNodeName); } NS_IMETHODIMP -nsGenericElement::GetLocalName(nsAWritableString& aLocalName) +nsGenericElement::GetLocalName(nsAString& aLocalName) { return mNodeInfo->GetLocalName(aLocalName); } NS_IMETHODIMP -nsGenericElement::GetNodeValue(nsAWritableString& aNodeValue) +nsGenericElement::GetNodeValue(nsAString& aNodeValue) { SetDOMStringToNull(aNodeValue); @@ -663,7 +663,7 @@ nsGenericElement::GetNodeValue(nsAWritableString& aNodeValue) } NS_IMETHODIMP -nsGenericElement::SetNodeValue(const nsAReadableString& aNodeValue) +nsGenericElement::SetNodeValue(const nsAString& aNodeValue) { // The node value can't be modified return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; @@ -794,19 +794,19 @@ nsGenericElement::GetOwnerDocument(nsIDOMDocument** aOwnerDocument) } NS_IMETHODIMP -nsGenericElement::GetNamespaceURI(nsAWritableString& aNamespaceURI) +nsGenericElement::GetNamespaceURI(nsAString& aNamespaceURI) { return mNodeInfo->GetNamespaceURI(aNamespaceURI); } NS_IMETHODIMP -nsGenericElement::GetPrefix(nsAWritableString& aPrefix) +nsGenericElement::GetPrefix(nsAString& aPrefix) { return mNodeInfo->GetPrefix(aPrefix); } NS_IMETHODIMP -nsGenericElement::SetPrefix(const nsAReadableString& aPrefix) +nsGenericElement::SetPrefix(const nsAString& aPrefix) { // XXX: Validate the prefix string! @@ -829,8 +829,8 @@ nsGenericElement::SetPrefix(const nsAReadableString& aPrefix) } nsresult -nsGenericElement::InternalIsSupported(const nsAReadableString& aFeature, - const nsAReadableString& aVersion, +nsGenericElement::InternalIsSupported(const nsAString& aFeature, + const nsAString& aVersion, PRBool* aReturn) { NS_ENSURE_ARG_POINTER(aReturn); @@ -863,8 +863,8 @@ nsGenericElement::InternalIsSupported(const nsAReadableString& aFeature, } NS_IMETHODIMP -nsGenericElement::IsSupported(const nsAReadableString& aFeature, - const nsAReadableString& aVersion, +nsGenericElement::IsSupported(const nsAString& aFeature, + const nsAString& aVersion, PRBool* aReturn) { return InternalIsSupported(aFeature, aVersion, aReturn); @@ -910,7 +910,7 @@ nsGenericElement::GetAttributes(nsIDOMNamedNodeMap** aAttributes) } NS_IMETHODIMP -nsGenericElement::GetTagName(nsAWritableString& aTagName) +nsGenericElement::GetTagName(nsAString& aTagName) { aTagName.Truncate(); if (mNodeInfo) { @@ -920,8 +920,8 @@ nsGenericElement::GetTagName(nsAWritableString& aTagName) } nsresult -nsGenericElement::GetAttribute(const nsAReadableString& aName, - nsAWritableString& aReturn) +nsGenericElement::GetAttribute(const nsAString& aName, + nsAString& aReturn) { nsCOMPtr ni; NormalizeAttrString(aName, *getter_AddRefs(ni)); @@ -944,8 +944,8 @@ nsGenericElement::GetAttribute(const nsAReadableString& aName, } nsresult -nsGenericElement::SetAttribute(const nsAReadableString& aName, - const nsAReadableString& aValue) +nsGenericElement::SetAttribute(const nsAString& aName, + const nsAString& aValue) { nsCOMPtr ni; NormalizeAttrString(aName, *getter_AddRefs(ni)); @@ -953,7 +953,7 @@ nsGenericElement::SetAttribute(const nsAReadableString& aName, } nsresult -nsGenericElement::RemoveAttribute(const nsAReadableString& aName) +nsGenericElement::RemoveAttribute(const nsAString& aName) { nsCOMPtr ni; NormalizeAttrString(aName, *getter_AddRefs(ni)); @@ -969,7 +969,7 @@ nsGenericElement::RemoveAttribute(const nsAReadableString& aName) } nsresult -nsGenericElement::GetAttributeNode(const nsAReadableString& aName, +nsGenericElement::GetAttributeNode(const nsAString& aName, nsIDOMAttr** aReturn) { if (nsnull == aReturn) { @@ -1053,7 +1053,7 @@ nsGenericElement::RemoveAttributeNode(nsIDOMAttr* aAttribute, } nsresult -nsGenericElement::GetElementsByTagName(const nsAReadableString& aTagname, +nsGenericElement::GetElementsByTagName(const nsAString& aTagname, nsIDOMNodeList** aReturn) { nsCOMPtr nameAtom; @@ -1073,9 +1073,9 @@ nsGenericElement::GetElementsByTagName(const nsAReadableString& aTagname, } nsresult -nsGenericElement::GetAttributeNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aLocalName, - nsAWritableString& aReturn) +nsGenericElement::GetAttributeNS(const nsAString& aNamespaceURI, + const nsAString& aLocalName, + nsAString& aReturn) { nsCOMPtr name(dont_AddRef(NS_NewAtom(aLocalName))); PRInt32 nsid; @@ -1103,9 +1103,9 @@ nsGenericElement::GetAttributeNS(const nsAReadableString& aNamespaceURI, } nsresult -nsGenericElement::SetAttributeNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aQualifiedName, - const nsAReadableString& aValue) +nsGenericElement::SetAttributeNS(const nsAString& aNamespaceURI, + const nsAString& aQualifiedName, + const nsAString& aValue) { nsCOMPtr nimgr; mNodeInfo->GetNodeInfoManager(*getter_AddRefs(nimgr)); @@ -1120,8 +1120,8 @@ nsGenericElement::SetAttributeNS(const nsAReadableString& aNamespaceURI, } nsresult -nsGenericElement::RemoveAttributeNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aLocalName) +nsGenericElement::RemoveAttributeNS(const nsAString& aNamespaceURI, + const nsAString& aLocalName) { nsCOMPtr name(dont_AddRef(NS_NewAtom(aLocalName))); PRInt32 nsid; @@ -1149,8 +1149,8 @@ nsGenericElement::RemoveAttributeNS(const nsAReadableString& aNamespaceURI, } nsresult -nsGenericElement::GetAttributeNodeNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aLocalName, +nsGenericElement::GetAttributeNodeNS(const nsAString& aNamespaceURI, + const nsAString& aLocalName, nsIDOMAttr** aReturn) { NS_ENSURE_ARG_POINTER(aReturn); @@ -1202,8 +1202,8 @@ nsGenericElement::SetAttributeNodeNS(nsIDOMAttr* aNewAttr, } nsresult -nsGenericElement::GetElementsByTagNameNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aLocalName, +nsGenericElement::GetElementsByTagNameNS(const nsAString& aNamespaceURI, + const nsAString& aLocalName, nsIDOMNodeList** aReturn) { nsCOMPtr nameAtom(dont_AddRef(NS_NewAtom(aLocalName))); @@ -1238,7 +1238,7 @@ nsGenericElement::GetElementsByTagNameNS(const nsAReadableString& aNamespaceURI, } nsresult -nsGenericElement::HasAttribute(const nsAReadableString& aName, PRBool* aReturn) +nsGenericElement::HasAttribute(const nsAString& aName, PRBool* aReturn) { NS_ENSURE_ARG_POINTER(aReturn); @@ -1257,8 +1257,8 @@ nsGenericElement::HasAttribute(const nsAReadableString& aName, PRBool* aReturn) } nsresult -nsGenericElement::HasAttributeNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aLocalName, +nsGenericElement::HasAttributeNS(const nsAString& aNamespaceURI, + const nsAString& aLocalName, PRBool* aReturn) { NS_ENSURE_ARG_POINTER(aReturn); @@ -1828,14 +1828,14 @@ nsGenericElement::GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRul NS_IMETHODIMP nsGenericElement::AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, - nsAWritableString& aResult) const + nsAString& aResult) const { return NS_ERROR_NOT_IMPLEMENTED; } NS_IMETHODIMP nsGenericElement::StringToAttribute(nsIAtom* aAttribute, - const nsAReadableString& aValue, + const nsAString& aValue, nsHTMLValue& aResult) { return NS_CONTENT_ATTR_NOT_THERE; @@ -1848,7 +1848,7 @@ nsGenericElement::GetBaseURL(nsIURI*& aBaseURL) const } NS_IMETHODIMP -nsGenericElement::GetBaseTarget(nsAWritableString& aBaseTarget) const +nsGenericElement::GetBaseTarget(nsAString& aBaseTarget) const { return NS_ERROR_NOT_IMPLEMENTED; } @@ -2640,7 +2640,7 @@ nsGenericElement::TriggerLink(nsIPresContext* aPresContext, nsresult nsGenericElement::AddScriptEventListener(nsIAtom* aAttribute, - const nsAReadableString& aValue) + const nsAString& aValue) { nsresult ret = NS_OK; nsCOMPtr context = nsnull; @@ -2707,7 +2707,7 @@ nsGenericElement::AddScriptEventListener(nsIAtom* aAttribute, struct nsGenericAttribute { - nsGenericAttribute(nsINodeInfo *aNodeInfo, const nsAReadableString& aValue) + nsGenericAttribute(nsINodeInfo *aNodeInfo, const nsAString& aValue) : mNodeInfo(aNodeInfo), mValue(aValue) { @@ -2762,7 +2762,7 @@ nsGenericContainerElement::~nsGenericContainerElement() } nsresult -nsGenericContainerElement::NormalizeAttrString(const nsAReadableString& aStr, nsINodeInfo*& aNodeInfo) +nsGenericContainerElement::NormalizeAttrString(const nsAString& aStr, nsINodeInfo*& aNodeInfo) { if (mAttributes) { PRInt32 indx, count = mAttributes->Count(); @@ -2902,7 +2902,7 @@ nsGenericContainerElement::GetLastChild(nsIDOMNode** aNode) nsresult nsGenericContainerElement::SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, - const nsAReadableString& aValue, + const nsAString& aValue, PRBool aNotify) { nsresult rv; @@ -2990,7 +2990,7 @@ PRBool nsGenericElement::HasMutationListeners(nsIContent* aContent, nsresult nsGenericContainerElement::SetAttr(nsINodeInfo* aNodeInfo, - const nsAReadableString& aValue, + const nsAString& aValue, PRBool aNotify) { NS_ENSURE_ARG_POINTER(aNodeInfo); @@ -3088,7 +3088,7 @@ nsGenericContainerElement::SetAttr(nsINodeInfo* aNodeInfo, nsresult nsGenericContainerElement::GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, - nsAWritableString& aResult) const + nsAString& aResult) const { nsCOMPtr prefix; return GetAttr(aNameSpaceID, aName, *getter_AddRefs(prefix), aResult); @@ -3097,7 +3097,7 @@ nsGenericContainerElement::GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, nsresult nsGenericContainerElement::GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, nsIAtom*& aPrefix, - nsAWritableString& aResult) const + nsAString& aResult) const { NS_ASSERTION(nsnull != aName, "must have attribute name"); if (nsnull == aName) { diff --git a/mozilla/content/base/src/nsGenericElement.h b/mozilla/content/base/src/nsGenericElement.h index 893f5909128..bd65b4ef6e6 100644 --- a/mozilla/content/base/src/nsGenericElement.h +++ b/mozilla/content/base/src/nsGenericElement.h @@ -211,19 +211,19 @@ public: // PRBool aNotify); // NS_IMETHOD AppendChildTo(nsIContent* aKid, PRBool aNotify); // NS_IMETHOD RemoveChildAt(PRInt32 aIndex, PRBool aNotify); - // NS_IMETHOD NormalizeAttrString(const nsAReadableString& aStr, + // NS_IMETHOD NormalizeAttrString(const nsAString& aStr, // nsINodeInfo*& aNodeInfo); // NS_IMETHOD SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, - // const nsAReadableString& aValue, + // const nsAString& aValue, // PRBool aNotify); // NS_IMETHOD SetAttr(nsINodeInfo* aNodeInfo, - // const nsAReadableString& aValue, + // const nsAString& aValue, // PRBool aNotify); // NS_IMETHOD GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, - // nsAWritableString& aResult) const; + // nsAString& aResult) const; // NS_IMETHOD GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, // nsIAtom*& aPrefix, - // nsAWritableString& aResult) const; + // nsAString& aResult) const; // NS_IMETHOD UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute, // PRBool aNotify); // NS_IMETHOD GetAttrNameAt(PRInt32 aIndex, @@ -278,63 +278,63 @@ public: NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const; NS_IMETHOD AttributeToString(nsIAtom* aAttribute, const nsHTMLValue& aValue, - nsAWritableString& aResult) const; + nsAString& aResult) const; NS_IMETHOD StringToAttribute(nsIAtom* aAttribute, - const nsAReadableString& aValue, + const nsAString& aValue, nsHTMLValue& aResult); NS_IMETHOD GetBaseURL(nsIURI*& aBaseURL) const; - NS_IMETHOD GetBaseTarget(nsAWritableString& aBaseTarget) const; + NS_IMETHOD GetBaseTarget(nsAString& aBaseTarget) const; // nsIDOMNode method implementation - NS_IMETHOD GetNodeName(nsAWritableString& aNodeName); - NS_IMETHOD GetLocalName(nsAWritableString& aLocalName); - NS_IMETHOD GetNodeValue(nsAWritableString& aNodeValue); - NS_IMETHOD SetNodeValue(const nsAReadableString& aNodeValue); + NS_IMETHOD GetNodeName(nsAString& aNodeName); + NS_IMETHOD GetLocalName(nsAString& aLocalName); + NS_IMETHOD GetNodeValue(nsAString& aNodeValue); + NS_IMETHOD SetNodeValue(const nsAString& aNodeValue); NS_IMETHOD GetNodeType(PRUint16* aNodeType); NS_IMETHOD GetParentNode(nsIDOMNode** aParentNode); NS_IMETHOD GetAttributes(nsIDOMNamedNodeMap** aAttributes); NS_IMETHOD GetPreviousSibling(nsIDOMNode** aPreviousSibling); NS_IMETHOD GetNextSibling(nsIDOMNode** aNextSibling); NS_IMETHOD GetOwnerDocument(nsIDOMDocument** aOwnerDocument); - NS_IMETHOD GetNamespaceURI(nsAWritableString& aNamespaceURI); - NS_IMETHOD GetPrefix(nsAWritableString& aPrefix); - NS_IMETHOD SetPrefix(const nsAReadableString& aPrefix); + NS_IMETHOD GetNamespaceURI(nsAString& aNamespaceURI); + NS_IMETHOD GetPrefix(nsAString& aPrefix); + NS_IMETHOD SetPrefix(const nsAString& aPrefix); NS_IMETHOD Normalize(); - NS_IMETHOD IsSupported(const nsAReadableString& aFeature, - const nsAReadableString& aVersion, PRBool* aReturn); + NS_IMETHOD IsSupported(const nsAString& aFeature, + const nsAString& aVersion, PRBool* aReturn); NS_IMETHOD HasAttributes(PRBool* aHasAttributes); // nsIDOMElement method implementation - NS_IMETHOD GetTagName(nsAWritableString& aTagName); - NS_IMETHOD GetAttribute(const nsAReadableString& aName, - nsAWritableString& aReturn); - NS_IMETHOD SetAttribute(const nsAReadableString& aName, - const nsAReadableString& aValue); - NS_IMETHOD RemoveAttribute(const nsAReadableString& aName); - NS_IMETHOD GetAttributeNode(const nsAReadableString& aName, + NS_IMETHOD GetTagName(nsAString& aTagName); + NS_IMETHOD GetAttribute(const nsAString& aName, + nsAString& aReturn); + NS_IMETHOD SetAttribute(const nsAString& aName, + const nsAString& aValue); + NS_IMETHOD RemoveAttribute(const nsAString& aName); + NS_IMETHOD GetAttributeNode(const nsAString& aName, nsIDOMAttr** aReturn); NS_IMETHOD SetAttributeNode(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn); NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* aOldAttr, nsIDOMAttr** aReturn); - NS_IMETHOD GetElementsByTagName(const nsAReadableString& aTagname, + NS_IMETHOD GetElementsByTagName(const nsAString& aTagname, nsIDOMNodeList** aReturn); - NS_IMETHOD GetAttributeNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aLocalName, - nsAWritableString& aReturn); - NS_IMETHOD SetAttributeNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aQualifiedName, - const nsAReadableString& aValue); - NS_IMETHOD RemoveAttributeNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aLocalName); - NS_IMETHOD GetAttributeNodeNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aLocalName, + NS_IMETHOD GetAttributeNS(const nsAString& aNamespaceURI, + const nsAString& aLocalName, + nsAString& aReturn); + NS_IMETHOD SetAttributeNS(const nsAString& aNamespaceURI, + const nsAString& aQualifiedName, + const nsAString& aValue); + NS_IMETHOD RemoveAttributeNS(const nsAString& aNamespaceURI, + const nsAString& aLocalName); + NS_IMETHOD GetAttributeNodeNS(const nsAString& aNamespaceURI, + const nsAString& aLocalName, nsIDOMAttr** aReturn); NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn); - NS_IMETHOD GetElementsByTagNameNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aLocalName, + NS_IMETHOD GetElementsByTagNameNS(const nsAString& aNamespaceURI, + const nsAString& aLocalName, nsIDOMNodeList** aReturn); - NS_IMETHOD HasAttribute(const nsAReadableString& aName, PRBool* aReturn); - NS_IMETHOD HasAttributeNS(const nsAReadableString& aNamespaceURI, - const nsAReadableString& aLocalName, + NS_IMETHOD HasAttribute(const nsAString& aName, PRBool* aReturn); + NS_IMETHOD HasAttributeNS(const nsAString& aNamespaceURI, + const nsAString& aLocalName, PRBool* aReturn); // Generic DOMNode implementations @@ -349,7 +349,7 @@ public: nsresult RenderFrame(nsIPresContext*); nsresult AddScriptEventListener(nsIAtom* aAttribute, - const nsAReadableString& aValue); + const nsAString& aValue); nsresult TriggerLink(nsIPresContext* aPresContext, nsLinkVerb aVerb, @@ -364,8 +364,8 @@ public: static void SetDocumentInChildrenOf(nsIContent* aContent, nsIDocument* aDocument, PRBool aCompileEventHandlers); - static nsresult InternalIsSupported(const nsAReadableString& aFeature, - const nsAReadableString& aVersion, + static nsresult InternalIsSupported(const nsAString& aFeature, + const nsAString& aVersion, PRBool* aReturn); static PRBool HasMutationListeners(nsIContent* aContent, @@ -397,13 +397,13 @@ public: PRBool aDeep); // nsIDOMElement methods - NS_METHOD GetAttribute(const nsAReadableString& aName, - nsAWritableString& aReturn) + NS_METHOD GetAttribute(const nsAString& aName, + nsAString& aReturn) { return nsGenericElement::GetAttribute(aName, aReturn); } - NS_METHOD SetAttribute(const nsAReadableString& aName, - const nsAReadableString& aValue) + NS_METHOD SetAttribute(const nsAString& aName, + const nsAString& aValue) { return nsGenericElement::SetAttribute(aName, aValue); } @@ -434,18 +434,18 @@ public: } // Remainder of nsIContent - NS_IMETHOD NormalizeAttrString(const nsAReadableString& aStr, + NS_IMETHOD NormalizeAttrString(const nsAString& aStr, nsINodeInfo*& aNodeInfo); NS_IMETHOD SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, - const nsAReadableString& aValue, + const nsAString& aValue, PRBool aNotify); NS_IMETHOD SetAttr(nsINodeInfo* aNodeInfo, - const nsAReadableString& aValue, + const nsAString& aValue, PRBool aNotify); NS_IMETHOD GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, - nsAWritableString& aResult) const; + nsAString& aResult) const; NS_IMETHOD GetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, - nsIAtom*& aPrefix, nsAWritableString& aResult) const; + nsIAtom*& aPrefix, nsAString& aResult) const; NS_IMETHOD_(PRBool) HasAttr(PRInt32 aNameSpaceID, nsIAtom* aName) const; NS_IMETHOD UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute, PRBool aNotify); @@ -515,13 +515,13 @@ public: #define NS_FORWARD_NSIDOMNODE_NO_CLONENODE(_to) \ - NS_IMETHOD GetNodeName(nsAWritableString& aNodeName) { \ + NS_IMETHOD GetNodeName(nsAString& aNodeName) { \ return _to GetNodeName(aNodeName); \ } \ - NS_IMETHOD GetNodeValue(nsAWritableString& aNodeValue) { \ + NS_IMETHOD GetNodeValue(nsAString& aNodeValue) { \ return _to GetNodeValue(aNodeValue); \ } \ - NS_IMETHOD SetNodeValue(const nsAReadableString& aNodeValue) { \ + NS_IMETHOD SetNodeValue(const nsAString& aNodeValue) { \ return _to SetNodeValue(aNodeValue); \ } \ NS_IMETHOD GetNodeType(PRUint16* aNodeType) { \ @@ -551,16 +551,16 @@ public: NS_IMETHOD GetOwnerDocument(nsIDOMDocument** aOwnerDocument) { \ return _to GetOwnerDocument(aOwnerDocument); \ } \ - NS_IMETHOD GetNamespaceURI(nsAWritableString& aNamespaceURI) { \ + NS_IMETHOD GetNamespaceURI(nsAString& aNamespaceURI) { \ return _to GetNamespaceURI(aNamespaceURI); \ } \ - NS_IMETHOD GetPrefix(nsAWritableString& aPrefix) { \ + NS_IMETHOD GetPrefix(nsAString& aPrefix) { \ return _to GetPrefix(aPrefix); \ } \ - NS_IMETHOD SetPrefix(const nsAReadableString& aPrefix) { \ + NS_IMETHOD SetPrefix(const nsAString& aPrefix) { \ return _to SetPrefix(aPrefix); \ } \ - NS_IMETHOD GetLocalName(nsAWritableString& aLocalName) { \ + NS_IMETHOD GetLocalName(nsAString& aLocalName) { \ return _to GetLocalName(aLocalName); \ } \ NS_IMETHOD InsertBefore(nsIDOMNode* aNewChild, nsIDOMNode* aRefChild, \ @@ -583,8 +583,8 @@ public: NS_IMETHOD Normalize() { \ return _to Normalize(); \ } \ - NS_IMETHOD IsSupported(const nsAReadableString& aFeature, \ - const nsAReadableString& aVersion, PRBool* aReturn) {\ + NS_IMETHOD IsSupported(const nsAString& aFeature, \ + const nsAString& aVersion, PRBool* aReturn) { \ return _to IsSupported(aFeature, aVersion, aReturn); \ } \ NS_IMETHOD HasAttributes(PRBool* aReturn) { \ diff --git a/mozilla/content/base/src/nsHTMLContentSerializer.cpp b/mozilla/content/base/src/nsHTMLContentSerializer.cpp index ef5c2d07639..bafe84d92ad 100644 --- a/mozilla/content/base/src/nsHTMLContentSerializer.cpp +++ b/mozilla/content/base/src/nsHTMLContentSerializer.cpp @@ -160,7 +160,7 @@ NS_IMETHODIMP nsHTMLContentSerializer::AppendText(nsIDOMText* aText, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr) + nsAString& aStr) { NS_ENSURE_ARG(aText); @@ -202,7 +202,7 @@ nsHTMLContentSerializer::AppendText(nsIDOMText* aText, } PRBool -nsHTMLContentSerializer::IsJavaScript(nsIAtom* aAttrNameAtom, const nsAReadableString& aValueString) +nsHTMLContentSerializer::IsJavaScript(nsIAtom* aAttrNameAtom, const nsAString& aValueString) { if (aAttrNameAtom == nsHTMLAtoms::href || aAttrNameAtom == nsHTMLAtoms::src) { @@ -241,7 +241,7 @@ nsHTMLContentSerializer::IsJavaScript(nsIAtom* aAttrNameAtom, const nsAReadableS } nsresult -nsHTMLContentSerializer::EscapeURI(const nsAReadableString& aURI, nsAWritableString& aEscapedURI) +nsHTMLContentSerializer::EscapeURI(const nsAString& aURI, nsAString& aEscapedURI) { // URL escape %xx cannot be used in JS. // No escaping if the scheme is 'javascript'. @@ -311,7 +311,7 @@ nsHTMLContentSerializer::EscapeURI(const nsAReadableString& aURI, nsAWritableStr void nsHTMLContentSerializer::SerializeAttributes(nsIContent* aContent, nsIAtom* aTagName, - nsAWritableString& aStr) + nsAString& aStr) { nsresult rv; PRInt32 index, count; @@ -411,7 +411,7 @@ nsHTMLContentSerializer::SerializeAttributes(nsIContent* aContent, NS_IMETHODIMP nsHTMLContentSerializer::AppendElementStart(nsIDOMElement *aElement, - nsAWritableString& aStr) + nsAString& aStr) { NS_ENSURE_ARG(aElement); @@ -513,7 +513,7 @@ nsHTMLContentSerializer::AppendElementStart(nsIDOMElement *aElement, NS_IMETHODIMP nsHTMLContentSerializer::AppendElementEnd(nsIDOMElement *aElement, - nsAWritableString& aStr) + nsAString& aStr) { NS_ENSURE_ARG(aElement); @@ -582,7 +582,7 @@ nsHTMLContentSerializer::AppendElementEnd(nsIDOMElement *aElement, void nsHTMLContentSerializer::AppendToString(const PRUnichar* aStr, PRInt32 aLength, - nsAWritableString& aOutputStr) + nsAString& aOutputStr) { if (mBodyOnly && !mInBody) { return; @@ -597,7 +597,7 @@ nsHTMLContentSerializer::AppendToString(const PRUnichar* aStr, void nsHTMLContentSerializer::AppendToString(const PRUnichar aChar, - nsAWritableString& aOutputStr) + nsAString& aOutputStr) { if (mBodyOnly && !mInBody) { return; @@ -609,8 +609,8 @@ nsHTMLContentSerializer::AppendToString(const PRUnichar aChar, } void -nsHTMLContentSerializer::AppendToStringWrapped(const nsAReadableString& aStr, - nsAWritableString& aOutputStr, +nsHTMLContentSerializer::AppendToStringWrapped(const nsAString& aStr, + nsAString& aOutputStr, PRBool aTranslateEntities) { PRInt32 length = aStr.Length(); @@ -721,8 +721,8 @@ static const char* kAttrEntities[] = { }; void -nsHTMLContentSerializer::AppendToString(const nsAReadableString& aStr, - nsAWritableString& aOutputStr, +nsHTMLContentSerializer::AppendToString(const nsAString& aStr, + nsAString& aOutputStr, PRBool aTranslateEntities, PRBool aIncrColumn) { @@ -800,8 +800,8 @@ nsHTMLContentSerializer::AppendToString(const nsAReadableString& aStr, } void -nsHTMLContentSerializer::AppendToStringConvertLF(const nsAReadableString& aStr, - nsAWritableString& aOutputStr) +nsHTMLContentSerializer::AppendToStringConvertLF(const nsAString& aStr, + nsAString& aOutputStr) { // Convert line-endings to mLineBreak PRUint32 start = 0; @@ -984,7 +984,7 @@ nsHTMLContentSerializer::LineBreakAfterClose(nsIAtom* aName, void nsHTMLContentSerializer::StartIndentation(nsIAtom* aName, PRBool aHasDirtyAttr, - nsAWritableString& aStr) + nsAString& aStr) { if ((mDoFormat || aHasDirtyAttr) && !mPreLevel && !mColPos) { for (PRInt32 i = mIndent; --i >= 0; ) { @@ -1012,7 +1012,7 @@ nsHTMLContentSerializer::StartIndentation(nsIAtom* aName, void nsHTMLContentSerializer::EndIndentation(nsIAtom* aName, PRBool aHasDirtyAttr, - nsAWritableString& aStr) + nsAString& aStr) { if ((aName == nsHTMLAtoms::head) || (aName == nsHTMLAtoms::table) || @@ -1065,7 +1065,7 @@ nsHTMLContentSerializer::HasLongLines(const nsString& text, PRInt32& aLastNewlin void nsHTMLContentSerializer::SerializeLIValueAttribute(nsIDOMElement* aElement, - nsAWritableString& aStr) + nsAString& aStr) { // We are copying and we are at the "first" LI node of OL in selected range. // It may not be the first LI child of OL but it's first in the selected range. diff --git a/mozilla/content/base/src/nsHTMLContentSerializer.h b/mozilla/content/base/src/nsHTMLContentSerializer.h index 2a35b6ea265..7b04a909cfb 100644 --- a/mozilla/content/base/src/nsHTMLContentSerializer.h +++ b/mozilla/content/base/src/nsHTMLContentSerializer.h @@ -57,12 +57,12 @@ class nsHTMLContentSerializer : public nsXMLContentSerializer { NS_IMETHOD AppendText(nsIDOMText* aText, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr); + nsAString& aStr); NS_IMETHOD AppendElementStart(nsIDOMElement *aElement, - nsAWritableString& aStr); + nsAString& aStr); NS_IMETHOD AppendElementEnd(nsIDOMElement *aElement, - nsAWritableString& aStr); + nsAString& aStr); protected: PRBool HasDirtyAttr(nsIContent* aContent); PRBool LineBreakBeforeOpen(nsIAtom* aName, PRBool aHasDirtyAttr); @@ -72,34 +72,34 @@ class nsHTMLContentSerializer : public nsXMLContentSerializer { PRBool IsFirstChildOfOL(nsIDOMElement* aElement); void StartIndentation(nsIAtom* aName, PRBool aHasDirtyAttr, - nsAWritableString& aStr); + nsAString& aStr); void EndIndentation(nsIAtom* aName, PRBool aHasDirtyAttr, - nsAWritableString& aStr); + nsAString& aStr); nsresult GetEntityConverter(nsIEntityConverter** aConverter); nsresult GetParserService(nsIParserService** aParserService); void SerializeAttributes(nsIContent* aContent, nsIAtom* aTagName, - nsAWritableString& aStr); + nsAString& aStr); void SerializeLIValueAttribute(nsIDOMElement* aElement, - nsAWritableString& aStr); + nsAString& aStr); virtual void AppendToString(const PRUnichar* aStr, PRInt32 aLength, - nsAWritableString& aOutputStr); + nsAString& aOutputStr); virtual void AppendToString(const PRUnichar aChar, - nsAWritableString& aOutputStr); - virtual void AppendToString(const nsAReadableString& aStr, - nsAWritableString& aOutputStr, + nsAString& aOutputStr); + virtual void AppendToString(const nsAString& aStr, + nsAString& aOutputStr, PRBool aTranslateEntities = PR_FALSE, PRBool aIncrColumn = PR_TRUE); - virtual void AppendToStringConvertLF(const nsAReadableString& aStr, - nsAWritableString& aOutputStr); - virtual void AppendToStringWrapped(const nsAReadableString& aStr, - nsAWritableString& aOutputStr, + virtual void AppendToStringConvertLF(const nsAString& aStr, + nsAString& aOutputStr); + virtual void AppendToStringWrapped(const nsAString& aStr, + nsAString& aOutputStr, PRBool aTranslateEntities); PRBool HasLongLines(const nsString& text, PRInt32& aLastNewlineOffset); - nsresult EscapeURI(const nsAReadableString& aURI, nsAWritableString& aEscapedURI); - PRBool IsJavaScript(nsIAtom* aAttrNameAtom, const nsAReadableString& aAttrValueString); + nsresult EscapeURI(const nsAString& aURI, nsAString& aEscapedURI); + PRBool IsJavaScript(nsIAtom* aAttrNameAtom, const nsAString& aAttrValueString); nsCOMPtr mParserService; nsCOMPtr mEntityConverter; diff --git a/mozilla/content/base/src/nsNameSpaceManager.cpp b/mozilla/content/base/src/nsNameSpaceManager.cpp index 51b23a035ca..a5261b5b7af 100644 --- a/mozilla/content/base/src/nsNameSpaceManager.cpp +++ b/mozilla/content/base/src/nsNameSpaceManager.cpp @@ -144,7 +144,7 @@ void NS_NameSpaceManagerShutdown() #endif } -static PRInt32 FindNameSpaceID(const nsAReadableString& aURI) +static PRInt32 FindNameSpaceID(const nsAString& aURI) { NS_ASSERTION(nsnull != gURIToIDTable, "no URI table"); nsStringKey key(aURI); @@ -169,7 +169,7 @@ public: NameSpaceImpl(nsINameSpaceManager* aManager, NameSpaceImpl* aParent, nsIAtom* aPrefix, - const nsAReadableString& aURI); + const nsAString& aURI); NameSpaceImpl(nsINameSpaceManager* aManager, NameSpaceImpl* aParent, nsIAtom* aPrefix, @@ -181,7 +181,7 @@ public: NS_IMETHOD GetNameSpaceManager(nsINameSpaceManager*& aManager) const; NS_IMETHOD GetNameSpaceID(PRInt32& aID) const; - NS_IMETHOD GetNameSpaceURI(nsAWritableString& aURI) const; + NS_IMETHOD GetNameSpaceURI(nsAString& aURI) const; NS_IMETHOD GetNameSpacePrefix(nsIAtom*& aPrefix) const; NS_IMETHOD GetParentNameSpace(nsINameSpace*& aParent) const; @@ -190,7 +190,7 @@ public: NS_IMETHOD FindNameSpaceID(nsIAtom* aPrefix, PRInt32& aNameSpaceID) const; NS_IMETHOD FindNameSpacePrefix(PRInt32 aNameSpaceID, nsIAtom*& aPrefix) const; - NS_IMETHOD CreateChildNameSpace(nsIAtom* aPrefix, const nsAReadableString& aURI, + NS_IMETHOD CreateChildNameSpace(nsIAtom* aPrefix, const nsAString& aURI, nsINameSpace*& aChildNameSpace); NS_IMETHOD CreateChildNameSpace(nsIAtom* aPrefix, PRInt32 aNameSpaceID, nsINameSpace*& aChildNameSpace); @@ -210,7 +210,7 @@ public: NameSpaceImpl::NameSpaceImpl(nsINameSpaceManager* aManager, NameSpaceImpl* aParent, nsIAtom* aPrefix, - const nsAReadableString& aURI) + const nsAString& aURI) : mManager(aManager), mParent(aParent), mPrefix(aPrefix) @@ -265,7 +265,7 @@ NameSpaceImpl::GetNameSpaceID(PRInt32& aID) const } NS_IMETHODIMP -NameSpaceImpl::GetNameSpaceURI(nsAWritableString& aURI) const +NameSpaceImpl::GetNameSpaceURI(nsAString& aURI) const { NS_ASSERTION(nsnull != mManager, "null namespace manager"); return mManager->GetNameSpaceURI(mID, aURI); @@ -343,7 +343,7 @@ NameSpaceImpl::FindNameSpacePrefix(PRInt32 aNameSpaceID, nsIAtom*& aPrefix) cons } NS_IMETHODIMP -NameSpaceImpl::CreateChildNameSpace(nsIAtom* aPrefix, const nsAReadableString& aURI, +NameSpaceImpl::CreateChildNameSpace(nsIAtom* aPrefix, const nsAString& aURI, nsINameSpace*& aChildNameSpace) { NameSpaceImpl* child = new NameSpaceImpl(mManager, this, aPrefix, aURI); @@ -383,11 +383,11 @@ public: NS_IMETHOD CreateRootNameSpace(nsINameSpace*& aRootNameSpace); - NS_IMETHOD RegisterNameSpace(const nsAReadableString& aURI, + NS_IMETHOD RegisterNameSpace(const nsAString& aURI, PRInt32& aNameSpaceID); - NS_IMETHOD GetNameSpaceURI(PRInt32 aNameSpaceID, nsAWritableString& aURI); - NS_IMETHOD GetNameSpaceID(const nsAReadableString& aURI, + NS_IMETHOD GetNameSpaceURI(PRInt32 aNameSpaceID, nsAString& aURI); + NS_IMETHOD GetNameSpaceID(const nsAString& aURI, PRInt32& aNameSpaceID); NS_IMETHOD GetElementFactory(PRInt32 aNameSpaceID, nsIElementFactory **aElementFactory); @@ -440,7 +440,7 @@ NameSpaceManagerImpl::CreateRootNameSpace(nsINameSpace*& aRootNameSpace) } NS_IMETHODIMP -NameSpaceManagerImpl::RegisterNameSpace(const nsAReadableString& aURI, +NameSpaceManagerImpl::RegisterNameSpace(const nsAString& aURI, PRInt32& aNameSpaceID) { NS_ASSERTION(!gNameSpaceManagerWasShutDown, @@ -466,7 +466,7 @@ NameSpaceManagerImpl::RegisterNameSpace(const nsAReadableString& aURI, } NS_IMETHODIMP -NameSpaceManagerImpl::GetNameSpaceURI(PRInt32 aNameSpaceID, nsAWritableString& aURI) +NameSpaceManagerImpl::GetNameSpaceURI(PRInt32 aNameSpaceID, nsAString& aURI) { NS_ASSERTION(!gNameSpaceManagerWasShutDown, "Namespace manager used past content module shutdown!!!"); @@ -481,7 +481,7 @@ NameSpaceManagerImpl::GetNameSpaceURI(PRInt32 aNameSpaceID, nsAWritableString& a } NS_IMETHODIMP -NameSpaceManagerImpl::GetNameSpaceID(const nsAReadableString& aURI, PRInt32& aNameSpaceID) +NameSpaceManagerImpl::GetNameSpaceID(const nsAString& aURI, PRInt32& aNameSpaceID) { NS_ASSERTION(!gNameSpaceManagerWasShutDown, "Namespace manager used past content module shutdown!!!"); diff --git a/mozilla/content/base/src/nsPlainTextSerializer.cpp b/mozilla/content/base/src/nsPlainTextSerializer.cpp index ee33edb8c7f..0c589ca0fdb 100644 --- a/mozilla/content/base/src/nsPlainTextSerializer.cpp +++ b/mozilla/content/base/src/nsPlainTextSerializer.cpp @@ -219,7 +219,7 @@ nsPlainTextSerializer::Init(PRUint32 aFlags, PRUint32 aWrapColumn, } NS_IMETHODIMP -nsPlainTextSerializer::Initialize(nsAWritableString* aOutString, +nsPlainTextSerializer::Initialize(nsAString* aOutString, PRUint32 aFlags, PRUint32 aWrapCol) { nsresult rv = Init(aFlags, aWrapCol, nsnull, PR_FALSE); @@ -237,7 +237,7 @@ NS_IMETHODIMP nsPlainTextSerializer::AppendText(nsIDOMText* aText, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr) + nsAString& aStr) { if (mIgnoreAboveIndex != (PRUint32)kNotFound) { return NS_OK; @@ -319,7 +319,7 @@ nsPlainTextSerializer::AppendText(nsIDOMText* aText, NS_IMETHODIMP nsPlainTextSerializer::AppendElementStart(nsIDOMElement *aElement, - nsAWritableString& aStr) + nsAString& aStr) { NS_ENSURE_ARG(aElement); @@ -354,7 +354,7 @@ nsPlainTextSerializer::AppendElementStart(nsIDOMElement *aElement, NS_IMETHODIMP nsPlainTextSerializer::AppendElementEnd(nsIDOMElement *aElement, - nsAWritableString& aStr) + nsAString& aStr) { NS_ENSURE_ARG(aElement); @@ -385,7 +385,7 @@ nsPlainTextSerializer::AppendElementEnd(nsIDOMElement *aElement, } NS_IMETHODIMP -nsPlainTextSerializer::Flush(nsAWritableString& aStr) +nsPlainTextSerializer::Flush(nsAString& aStr) { mOutputString = &aStr; FlushLine(); @@ -406,7 +406,7 @@ NS_IMETHODIMP nsPlainTextSerializer::CloseContainer(const nsIParserNode& aNode) { PRInt32 type = aNode.GetNodeType(); - const nsAReadableString& namestr = aNode.GetText(); + const nsAString& namestr = aNode.GetText(); nsCOMPtr name = dont_AddRef(NS_NewAtom(namestr)); mParserNode = NS_CONST_CAST(nsIParserNode *, &aNode); @@ -421,7 +421,7 @@ nsPlainTextSerializer::AddLeaf(const nsIParserNode& aNode) } eHTMLTags type = (eHTMLTags)aNode.GetNodeType(); - const nsAReadableString& text = aNode.GetText(); + const nsAString& text = aNode.GetText(); mParserNode = NS_CONST_CAST(nsIParserNode *, &aNode); if ((type == eHTMLTag_text) || @@ -962,7 +962,7 @@ nsPlainTextSerializer::DoCloseContainer(PRInt32 aTag) nsresult nsPlainTextSerializer::DoAddLeaf(PRInt32 aTag, - const nsAReadableString& aText) + const nsAString& aText) { // If we don't want any output, just return if (!DoOutput()) { @@ -1486,7 +1486,7 @@ nsPlainTextSerializer::OutputQuotesAndIndent(PRBool stripTrailingSpaces /* = PR_ * line wrapping, indentation, whitespace compression and other things. */ void -nsPlainTextSerializer::Write(const nsAReadableString& aString) +nsPlainTextSerializer::Write(const nsAString& aString) { #ifdef DEBUG_wrapping printf("Write(%s): wrap col = %d\n", @@ -1525,7 +1525,7 @@ nsPlainTextSerializer::Write(const nsAReadableString& aString) OutputQuotesAndIndent(); } - // Find one of '\n' or '\r' using iterators since nsAReadableString + // Find one of '\n' or '\r' using iterators since nsAString // doesn't have the old FindCharInSet function. nsAString::const_iterator iter; aString.BeginReading(iter); nsAString::const_iterator done_searching; aString.EndReading(done_searching); @@ -1678,7 +1678,7 @@ nsPlainTextSerializer::GetAttributeValue(nsIAtom* aName, PRInt32 count = mParserNode->GetAttributeCount(); for (PRInt32 i=0;iGetKeyAt(i); + const nsAString& key = mParserNode->GetKeyAt(i); if (key.Equals(name)) { aValueRet = mParserNode->GetValueAt(i); aValueRet.StripChars("\""); diff --git a/mozilla/content/base/src/nsPlainTextSerializer.h b/mozilla/content/base/src/nsPlainTextSerializer.h index a7eca097014..1e44d642c75 100644 --- a/mozilla/content/base/src/nsPlainTextSerializer.h +++ b/mozilla/content/base/src/nsPlainTextSerializer.h @@ -67,23 +67,23 @@ public: nsIAtom* aCharSet, PRBool aIsCopying); NS_IMETHOD AppendText(nsIDOMText* aText, PRInt32 aStartOffset, - PRInt32 aEndOffset, nsAWritableString& aStr); + PRInt32 aEndOffset, nsAString& aStr); NS_IMETHOD AppendCDATASection(nsIDOMCDATASection* aCDATASection, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr) { return NS_OK; } + nsAString& aStr) { return NS_OK; } NS_IMETHOD AppendProcessingInstruction(nsIDOMProcessingInstruction* aPI, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr) { return NS_OK; } + nsAString& aStr) { return NS_OK; } NS_IMETHOD AppendComment(nsIDOMComment* aComment, PRInt32 aStartOffset, - PRInt32 aEndOffset, nsAWritableString& aStr) { return NS_OK; } + PRInt32 aEndOffset, nsAString& aStr) { return NS_OK; } NS_IMETHOD AppendDoctype(nsIDOMDocumentType *aDoctype, - nsAWritableString& aStr) { return NS_OK; } + nsAString& aStr) { return NS_OK; } NS_IMETHOD AppendElementStart(nsIDOMElement *aElement, - nsAWritableString& aStr); + nsAString& aStr); NS_IMETHOD AppendElementEnd(nsIDOMElement *aElement, - nsAWritableString& aStr); - NS_IMETHOD Flush(nsAWritableString& aStr); + nsAString& aStr); + NS_IMETHOD Flush(nsAString& aStr); // nsIContentSink NS_IMETHOD WillBuildModel(void) { return NS_OK; } @@ -98,7 +98,7 @@ public: NS_IMETHOD AddProcessingInstruction(const nsIParserNode& aNode) { return NS_OK; } NS_IMETHOD AddDocTypeDecl(const nsIParserNode& aNode, PRInt32 aMode=0) { return NS_OK; } NS_IMETHOD FlushPendingNotifications() { return NS_OK; } - NS_IMETHOD SetDocumentCharset(nsAWritableString& aCharset) { return NS_OK; } + NS_IMETHOD SetDocumentCharset(nsAString& aCharset) { return NS_OK; } NS_IMETHOD NotifyTagObservers(nsIParserNode* aNode) { return NS_OK; } // nsIHTMLContentSink @@ -125,7 +125,7 @@ public: NS_IMETHOD DidProcessAToken(void) { return NS_OK; } // nsIHTMLToTextSink - NS_IMETHOD Initialize(nsAWritableString* aOutString, + NS_IMETHOD Initialize(nsAString* aOutString, PRUint32 aFlags, PRUint32 aWrapCol); protected: @@ -136,7 +136,7 @@ protected: void FlushLine(); void OutputQuotesAndIndent(PRBool stripTrailingSpaces=PR_FALSE); void Output(nsString& aString); - void Write(const nsAReadableString& aString); + void Write(const nsAString& aString); PRBool IsBlockLevel(PRInt32 aId); PRBool IsContainer(PRInt32 aId); PRBool IsInPre(); @@ -145,7 +145,7 @@ protected: nsresult GetParserService(nsIParserService** aParserService); nsresult DoOpenContainer(PRInt32 aTag); nsresult DoCloseContainer(PRInt32 aTag); - nsresult DoAddLeaf(PRInt32 aTag, const nsAReadableString& aText); + nsresult DoAddLeaf(PRInt32 aTag, const nsAString& aText); // Inlined functions inline PRBool MayWrap() @@ -217,7 +217,7 @@ protected: nsCOMPtr mContent; nsIParserNode* mParserNode; - nsAWritableString* mOutputString; + nsAString* mOutputString; // The tag stack: the stack of tags we're operating on, so we can nest: nsHTMLTag *mTagStack; diff --git a/mozilla/content/base/src/nsRange.cpp b/mozilla/content/base/src/nsRange.cpp index 66442de07ec..2ec04493d88 100644 --- a/mozilla/content/base/src/nsRange.cpp +++ b/mozilla/content/base/src/nsRange.cpp @@ -2379,7 +2379,7 @@ nsresult nsRange::SurroundContents(nsIDOMNode* aN) return NS_OK; } -nsresult nsRange::ToString(nsAWritableString& aReturn) +nsresult nsRange::ToString(nsAString& aReturn) { if(IsDetached()) return NS_ERROR_DOM_INVALID_STATE_ERR; @@ -2687,7 +2687,7 @@ nsresult nsRange::TextOwnerChanged(nsIContent* aTextNode, PRInt32 aStartChanged, // nsIDOMNSRange interface NS_IMETHODIMP -nsRange::CreateContextualFragment(const nsAReadableString& aFragment, +nsRange::CreateContextualFragment(const nsAString& aFragment, nsIDOMDocumentFragment** aReturn) { nsresult result = NS_OK; diff --git a/mozilla/content/base/src/nsRange.h b/mozilla/content/base/src/nsRange.h index eb05b11fad0..207b960b621 100644 --- a/mozilla/content/base/src/nsRange.h +++ b/mozilla/content/base/src/nsRange.h @@ -132,10 +132,10 @@ public: NS_IMETHOD Detach(); - NS_IMETHOD ToString(nsAWritableString& aReturn); + NS_IMETHOD ToString(nsAString& aReturn); /*BEGIN nsIDOMNSRange interface implementations*/ - NS_IMETHOD CreateContextualFragment(const nsAReadableString& aFragment, + NS_IMETHOD CreateContextualFragment(const nsAString& aFragment, nsIDOMDocumentFragment** aReturn); NS_IMETHOD IsPointInRange(nsIDOMNode* aParent, PRInt32 aOffset, PRBool* aResult); diff --git a/mozilla/content/base/src/nsStyleLinkElement.cpp b/mozilla/content/base/src/nsStyleLinkElement.cpp index 8b256a28051..0053afaf6f7 100644 --- a/mozilla/content/base/src/nsStyleLinkElement.cpp +++ b/mozilla/content/base/src/nsStyleLinkElement.cpp @@ -102,7 +102,7 @@ nsStyleLinkElement::GetCharset(nsAString& aCharset) return NS_ERROR_NOT_IMPLEMENTED; } -void nsStyleLinkElement::ParseLinkTypes(const nsAReadableString& aTypes, +void nsStyleLinkElement::ParseLinkTypes(const nsAString& aTypes, nsStringArray& aResult) { nsReadingIterator current; diff --git a/mozilla/content/base/src/nsStyleLinkElement.h b/mozilla/content/base/src/nsStyleLinkElement.h index 7c4df41e333..ea9a58993fd 100644 --- a/mozilla/content/base/src/nsStyleLinkElement.h +++ b/mozilla/content/base/src/nsStyleLinkElement.h @@ -52,14 +52,14 @@ public: NS_IMETHOD SetEnableUpdates(PRBool aEnableUpdates); NS_IMETHOD GetCharset(nsAString& aCharset); - static void ParseLinkTypes(const nsAReadableString& aTypes, nsStringArray& aResult); + static void ParseLinkTypes(const nsAString& aTypes, nsStringArray& aResult); static void SplitMimeType(const nsString& aValue, nsString& aType, nsString& aParams); protected: - virtual void GetStyleSheetInfo(nsAWritableString& aUrl, - nsAWritableString& aTitle, - nsAWritableString& aType, - nsAWritableString& aMedia, + virtual void GetStyleSheetInfo(nsAString& aUrl, + nsAString& aTitle, + nsAString& aType, + nsAString& aMedia, PRBool* aIsAlternate) = 0; diff --git a/mozilla/content/base/src/nsTextNode.cpp b/mozilla/content/base/src/nsTextNode.cpp index 5a711e51096..cc5644fee69 100644 --- a/mozilla/content/base/src/nsTextNode.cpp +++ b/mozilla/content/base/src/nsTextNode.cpp @@ -114,7 +114,7 @@ nsTextNode::GetTag(nsIAtom*& aResult) const } NS_IMETHODIMP -nsTextNode::GetNodeName(nsAWritableString& aNodeName) +nsTextNode::GetNodeName(nsAString& aNodeName) { aNodeName.Assign(NS_LITERAL_STRING("#text")); return NS_OK; diff --git a/mozilla/content/base/src/nsXMLContentSerializer.cpp b/mozilla/content/base/src/nsXMLContentSerializer.cpp index 919d135d652..0f84d2b842b 100644 --- a/mozilla/content/base/src/nsXMLContentSerializer.cpp +++ b/mozilla/content/base/src/nsXMLContentSerializer.cpp @@ -93,7 +93,7 @@ nsresult nsXMLContentSerializer::AppendTextData(nsIDOMNode* aNode, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr, + nsAString& aStr, PRBool aTranslateEntities, PRBool aIncrColumn) { @@ -137,7 +137,7 @@ NS_IMETHODIMP nsXMLContentSerializer::AppendText(nsIDOMText* aText, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr) + nsAString& aStr) { NS_ENSURE_ARG(aText); @@ -148,7 +148,7 @@ NS_IMETHODIMP nsXMLContentSerializer::AppendCDATASection(nsIDOMCDATASection* aCDATASection, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr) + nsAString& aStr) { NS_ENSURE_ARG(aCDATASection); nsresult rv; @@ -165,7 +165,7 @@ NS_IMETHODIMP nsXMLContentSerializer::AppendProcessingInstruction(nsIDOMProcessingInstruction* aPI, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr) + nsAString& aStr) { NS_ENSURE_ARG(aPI); nsresult rv; @@ -192,7 +192,7 @@ NS_IMETHODIMP nsXMLContentSerializer::AppendComment(nsIDOMComment* aComment, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr) + nsAString& aStr) { NS_ENSURE_ARG(aComment); nsresult rv; @@ -220,7 +220,7 @@ nsXMLContentSerializer::AppendComment(nsIDOMComment* aComment, NS_IMETHODIMP nsXMLContentSerializer::AppendDoctype(nsIDOMDocumentType *aDoctype, - nsAWritableString& aStr) + nsAString& aStr) { NS_ENSURE_ARG(aDoctype); nsresult rv; @@ -289,8 +289,8 @@ nsXMLContentSerializer::AppendDoctype(nsIDOMDocumentType *aDoctype, #define kXMLNS NS_LITERAL_STRING("xmlns") nsresult -nsXMLContentSerializer::PushNameSpaceDecl(const nsAReadableString& aPrefix, - const nsAReadableString& aURI, +nsXMLContentSerializer::PushNameSpaceDecl(const nsAString& aPrefix, + const nsAString& aURI, nsIDOMElement* aOwner) { NameSpaceDecl* decl = new NameSpaceDecl(); @@ -326,8 +326,8 @@ nsXMLContentSerializer::PopNameSpaceDeclsFor(nsIDOMElement* aOwner) * moved/modified elements/attributes */ PRBool -nsXMLContentSerializer::ConfirmPrefix(nsAWritableString& aPrefix, - const nsAReadableString& aURI) +nsXMLContentSerializer::ConfirmPrefix(nsAString& aPrefix, + const nsAString& aURI) { if (aPrefix.Equals(kXMLNS)) { return PR_FALSE; @@ -382,10 +382,10 @@ nsXMLContentSerializer::ConfirmPrefix(nsAWritableString& aPrefix, } void -nsXMLContentSerializer::SerializeAttr(const nsAReadableString& aPrefix, - const nsAReadableString& aName, - const nsAReadableString& aValue, - nsAWritableString& aStr, +nsXMLContentSerializer::SerializeAttr(const nsAString& aPrefix, + const nsAString& aName, + const nsAString& aValue, + nsAString& aStr, PRBool aDoEscapeEntities) { AppendToString(PRUnichar(' '), aStr); @@ -406,7 +406,7 @@ nsXMLContentSerializer::SerializeAttr(const nsAReadableString& aPrefix, NS_IMETHODIMP nsXMLContentSerializer::AppendElementStart(nsIDOMElement *aElement, - nsAWritableString& aStr) + nsAString& aStr) { NS_ENSURE_ARG(aElement); @@ -539,7 +539,7 @@ nsXMLContentSerializer::AppendElementStart(nsIDOMElement *aElement, NS_IMETHODIMP nsXMLContentSerializer::AppendElementEnd(nsIDOMElement *aElement, - nsAWritableString& aStr) + nsAString& aStr) { NS_ENSURE_ARG(aElement); @@ -583,7 +583,7 @@ nsXMLContentSerializer::AppendElementEnd(nsIDOMElement *aElement, void nsXMLContentSerializer::AppendToString(const PRUnichar* aStr, PRInt32 aLength, - nsAWritableString& aOutputStr) + nsAString& aOutputStr) { PRInt32 length = (aLength == -1) ? nsCRT::strlen(aStr) : aLength; @@ -592,7 +592,7 @@ nsXMLContentSerializer::AppendToString(const PRUnichar* aStr, void nsXMLContentSerializer::AppendToString(const PRUnichar aChar, - nsAWritableString& aOutputStr) + nsAString& aOutputStr) { aOutputStr.Append(aChar); } @@ -619,8 +619,8 @@ static const char* kAttrEntities[] = { }; void -nsXMLContentSerializer::AppendToString(const nsAReadableString& aStr, - nsAWritableString& aOutputStr, +nsXMLContentSerializer::AppendToString(const nsAString& aStr, + nsAString& aOutputStr, PRBool aTranslateEntities, PRBool aIncrColumn) { diff --git a/mozilla/content/base/src/nsXMLContentSerializer.h b/mozilla/content/base/src/nsXMLContentSerializer.h index 656588455cb..f314ed2818c 100644 --- a/mozilla/content/base/src/nsXMLContentSerializer.h +++ b/mozilla/content/base/src/nsXMLContentSerializer.h @@ -57,57 +57,57 @@ class nsXMLContentSerializer : public nsIContentSerializer { nsIAtom* aCharSet, PRBool aIsCopying); NS_IMETHOD AppendText(nsIDOMText* aText, PRInt32 aStartOffset, - PRInt32 aEndOffset, nsAWritableString& aStr); + PRInt32 aEndOffset, nsAString& aStr); NS_IMETHOD AppendCDATASection(nsIDOMCDATASection* aCDATASection, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr); + nsAString& aStr); NS_IMETHOD AppendProcessingInstruction(nsIDOMProcessingInstruction* aPI, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr); + nsAString& aStr); NS_IMETHOD AppendComment(nsIDOMComment* aComment, PRInt32 aStartOffset, - PRInt32 aEndOffset, nsAWritableString& aStr); + PRInt32 aEndOffset, nsAString& aStr); NS_IMETHOD AppendDoctype(nsIDOMDocumentType *aDoctype, - nsAWritableString& aStr); + nsAString& aStr); NS_IMETHOD AppendElementStart(nsIDOMElement *aElement, - nsAWritableString& aStr); + nsAString& aStr); NS_IMETHOD AppendElementEnd(nsIDOMElement *aElement, - nsAWritableString& aStr); + nsAString& aStr); - NS_IMETHOD Flush(nsAWritableString& aStr) { return NS_OK; } + NS_IMETHOD Flush(nsAString& aStr) { return NS_OK; } protected: virtual void AppendToString(const PRUnichar* aStr, PRInt32 aLength, - nsAWritableString& aOutputStr); + nsAString& aOutputStr); virtual void AppendToString(const PRUnichar aChar, - nsAWritableString& aOutputStr); - virtual void AppendToString(const nsAReadableString& aStr, - nsAWritableString& aOutputStr, + nsAString& aOutputStr); + virtual void AppendToString(const nsAString& aStr, + nsAString& aOutputStr, PRBool aTranslateEntities = PR_FALSE, PRBool aIncrColumn = PR_TRUE); nsresult AppendTextData(nsIDOMNode* aNode, PRInt32 aStartOffset, PRInt32 aEndOffset, - nsAWritableString& aStr, + nsAString& aStr, PRBool aTranslateEntities, PRBool aIncrColumn); - virtual nsresult PushNameSpaceDecl(const nsAReadableString& aPrefix, - const nsAReadableString& aURI, + virtual nsresult PushNameSpaceDecl(const nsAString& aPrefix, + const nsAString& aURI, nsIDOMElement* aOwner); void PopNameSpaceDeclsFor(nsIDOMElement* aOwner); - PRBool ConfirmPrefix(nsAWritableString& aPrefix, - const nsAReadableString& aURI); - void SerializeAttr(const nsAReadableString& aPrefix, - const nsAReadableString& aName, - const nsAReadableString& aValue, - nsAWritableString& aStr, + PRBool ConfirmPrefix(nsAString& aPrefix, + const nsAString& aURI); + void SerializeAttr(const nsAString& aPrefix, + const nsAString& aName, + const nsAString& aValue, + nsAString& aStr, PRBool aDoEscapeEntities); PRInt32 mPrefixIndex;