From 84d041ab4e0bb6dc5f9cd3ebef6b67a6c25c4c71 Mon Sep 17 00:00:00 2001 From: "jst%netscape.com" Date: Fri, 11 Aug 2000 22:10:35 +0000 Subject: [PATCH] Backing out changes that should've been checked onto a branch. Sorry about that. --- dom/public/base/nsIDOMCRMFObject.h | 6 +- dom/public/base/nsIDOMCrypto.h | 36 +- dom/public/base/nsIDOMDOMException.h | 18 +- dom/public/base/nsIDOMHistory.h | 18 +- dom/public/base/nsIDOMLocation.h | 108 +- dom/public/base/nsIDOMMimeType.h | 18 +- dom/public/base/nsIDOMMimeTypeArray.h | 6 +- dom/public/base/nsIDOMNavigator.h | 72 +- dom/public/base/nsIDOMPkcs11.h | 12 +- dom/public/base/nsIDOMPlugin.h | 24 +- dom/public/base/nsIDOMPluginArray.h | 6 +- dom/public/base/nsIDOMViewCSS.h | 6 +- dom/public/base/nsIDOMWindow.h | 66 +- dom/public/base/nsIDOMWindowCollection.h | 6 +- dom/public/coreDom/nsIDOMAttr.h | 18 +- dom/public/coreDom/nsIDOMCharacterData.h | 36 +- dom/public/coreDom/nsIDOMDOMImplementation.h | 18 +- dom/public/coreDom/nsIDOMDocument.h | 72 +- dom/public/coreDom/nsIDOMDocumentCSS.h | 6 +- dom/public/coreDom/nsIDOMDocumentEvent.h | 6 +- dom/public/coreDom/nsIDOMDocumentType.h | 24 +- dom/public/coreDom/nsIDOMDocumentXBL.h | 12 +- dom/public/coreDom/nsIDOMElement.h | 78 +- dom/public/coreDom/nsIDOMEntity.h | 18 +- dom/public/coreDom/nsIDOMMediaList.h | 30 +- dom/public/coreDom/nsIDOMNSDocument.h | 18 +- dom/public/coreDom/nsIDOMNamedNodeMap.h | 24 +- dom/public/coreDom/nsIDOMNode.h | 48 +- dom/public/coreDom/nsIDOMNotation.h | 12 +- .../coreDom/nsIDOMProcessingInstruction.h | 18 +- dom/public/coreDom/nsIDOMStyleSheet.h | 18 +- dom/public/coreEvents/nsIDOMEvent.h | 12 +- dom/public/coreEvents/nsIDOMEventTarget.h | 12 +- dom/public/coreEvents/nsIDOMKeyEvent.h | 6 +- dom/public/coreEvents/nsIDOMMouseEvent.h | 6 +- dom/public/coreEvents/nsIDOMUIEvent.h | 6 +- dom/public/css/nsIDOMCSS2Properties.h | 1488 ++++++++--------- dom/public/css/nsIDOMCSSImportRule.h | 6 +- dom/public/css/nsIDOMCSSMediaRule.h | 6 +- dom/public/css/nsIDOMCSSPageRule.h | 12 +- dom/public/css/nsIDOMCSSPrimitiveValue.h | 12 +- dom/public/css/nsIDOMCSSRule.h | 12 +- dom/public/css/nsIDOMCSSStyleDeclaration.h | 48 +- dom/public/css/nsIDOMCSSStyleRule.h | 12 +- dom/public/css/nsIDOMCSSStyleSheet.h | 6 +- dom/public/css/nsIDOMCSSValue.h | 12 +- dom/public/css/nsIDOMCounter.h | 18 +- dom/public/html/nsIDOMHTMLAnchorElement.h | 132 +- dom/public/html/nsIDOMHTMLAppletElement.h | 132 +- dom/public/html/nsIDOMHTMLAreaElement.h | 72 +- dom/public/html/nsIDOMHTMLBRElement.h | 12 +- dom/public/html/nsIDOMHTMLBaseElement.h | 24 +- dom/public/html/nsIDOMHTMLBaseFontElement.h | 36 +- dom/public/html/nsIDOMHTMLBodyElement.h | 72 +- dom/public/html/nsIDOMHTMLButtonElement.h | 42 +- dom/public/html/nsIDOMHTMLCollection.h | 6 +- dom/public/html/nsIDOMHTMLDivElement.h | 12 +- dom/public/html/nsIDOMHTMLDocument.h | 66 +- dom/public/html/nsIDOMHTMLElement.h | 72 +- dom/public/html/nsIDOMHTMLEmbedElement.h | 72 +- dom/public/html/nsIDOMHTMLFontElement.h | 36 +- dom/public/html/nsIDOMHTMLFormElement.h | 72 +- dom/public/html/nsIDOMHTMLFrameElement.h | 84 +- dom/public/html/nsIDOMHTMLFrameSetElement.h | 24 +- dom/public/html/nsIDOMHTMLHRElement.h | 36 +- dom/public/html/nsIDOMHTMLHeadElement.h | 12 +- dom/public/html/nsIDOMHTMLHeadingElement.h | 12 +- dom/public/html/nsIDOMHTMLHtmlElement.h | 12 +- dom/public/html/nsIDOMHTMLIFrameElement.h | 120 +- dom/public/html/nsIDOMHTMLImageElement.h | 144 +- dom/public/html/nsIDOMHTMLInputElement.h | 132 +- dom/public/html/nsIDOMHTMLIsIndexElement.h | 12 +- dom/public/html/nsIDOMHTMLLIElement.h | 12 +- dom/public/html/nsIDOMHTMLLabelElement.h | 24 +- dom/public/html/nsIDOMHTMLLayerElement.h | 48 +- dom/public/html/nsIDOMHTMLLegendElement.h | 24 +- dom/public/html/nsIDOMHTMLLinkElement.h | 96 +- dom/public/html/nsIDOMHTMLMapElement.h | 12 +- dom/public/html/nsIDOMHTMLMetaElement.h | 48 +- dom/public/html/nsIDOMHTMLModElement.h | 24 +- dom/public/html/nsIDOMHTMLOListElement.h | 12 +- dom/public/html/nsIDOMHTMLObjectElement.h | 180 +- dom/public/html/nsIDOMHTMLOptGroupElement.h | 12 +- dom/public/html/nsIDOMHTMLOptionElement.h | 36 +- dom/public/html/nsIDOMHTMLParagraphElement.h | 12 +- dom/public/html/nsIDOMHTMLParamElement.h | 48 +- dom/public/html/nsIDOMHTMLQuoteElement.h | 12 +- dom/public/html/nsIDOMHTMLScriptElement.h | 72 +- dom/public/html/nsIDOMHTMLSelectElement.h | 30 +- dom/public/html/nsIDOMHTMLStyleElement.h | 24 +- .../html/nsIDOMHTMLTableCaptionElement.h | 12 +- dom/public/html/nsIDOMHTMLTableCellElement.h | 132 +- dom/public/html/nsIDOMHTMLTableColElement.h | 60 +- dom/public/html/nsIDOMHTMLTableElement.h | 108 +- dom/public/html/nsIDOMHTMLTableRowElement.h | 60 +- .../html/nsIDOMHTMLTableSectionElement.h | 48 +- dom/public/html/nsIDOMHTMLTextAreaElement.h | 54 +- dom/public/html/nsIDOMHTMLTitleElement.h | 12 +- dom/public/html/nsIDOMHTMLUListElement.h | 12 +- dom/public/html/nsIDOMImage.h | 12 +- dom/public/html/nsIDOMNSHTMLAnchorElement.h | 48 +- dom/public/html/nsIDOMNSHTMLAreaElement.h | 42 +- dom/public/html/nsIDOMNSHTMLDocument.h | 74 +- dom/public/html/nsIDOMNSHTMLFormElement.h | 6 +- .../html/nsIDOMNSHTMLOptionCollection.h | 6 +- dom/public/html/nsIDOMNSHTMLSelectElement.h | 6 +- dom/public/idl/coreDom/DOMImplementation.idl | 1 - dom/public/range/nsIDOMNSRange.h | 12 +- dom/public/range/nsIDOMRange.h | 6 +- dom/public/range/nsIDOMSelection.h | 6 +- dom/src/base/nsDOMException.cpp | 12 +- dom/src/base/nsDOMWindowList.cpp | 4 +- dom/src/base/nsDOMWindowList.h | 2 +- dom/src/base/nsFrameList.cpp | 2 +- dom/src/base/nsFrameList.h | 2 +- dom/src/base/nsGlobalWindow.cpp | 157 +- dom/src/base/nsGlobalWindow.h | 42 +- dom/src/base/nsHistory.cpp | 6 +- dom/src/base/nsHistory.h | 6 +- dom/src/base/nsJSUtils.cpp | 3 +- dom/src/base/nsJSUtils.h | 10 +- dom/src/base/nsLocation.cpp | 98 +- dom/src/base/nsMimeTypeArray.cpp | 8 +- dom/src/base/nsMimeTypeArray.h | 8 +- dom/src/base/nsPluginArray.cpp | 18 +- dom/src/base/nsPluginArray.h | 12 +- dom/tools/FileGen.cpp | 13 +- dom/tools/FileGen.h | 1 - dom/tools/XPCOMGen.cpp | 15 +- 129 files changed, 2915 insertions(+), 2925 deletions(-) diff --git a/dom/public/base/nsIDOMCRMFObject.h b/dom/public/base/nsIDOMCRMFObject.h index d40713d37ad..a97e039d7c3 100644 --- a/dom/public/base/nsIDOMCRMFObject.h +++ b/dom/public/base/nsIDOMCRMFObject.h @@ -37,17 +37,17 @@ class nsIDOMCRMFObject : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMCRMFOBJECT_IID; return iid; } - NS_IMETHOD GetRequest(nsAWritableString& aRequest)=0; + NS_IMETHOD GetRequest(nsString& aRequest)=0; }; #define NS_DECL_IDOMCRMFOBJECT \ - NS_IMETHOD GetRequest(nsAWritableString& aRequest); \ + NS_IMETHOD GetRequest(nsString& aRequest); \ #define NS_FORWARD_IDOMCRMFOBJECT(_to) \ - NS_IMETHOD GetRequest(nsAWritableString& aRequest) { return _to GetRequest(aRequest); } \ + NS_IMETHOD GetRequest(nsString& aRequest) { return _to GetRequest(aRequest); } \ extern "C" NS_DOM nsresult NS_InitCRMFObjectClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/base/nsIDOMCrypto.h b/dom/public/base/nsIDOMCrypto.h index f49181d953e..8e06a31cdbd 100644 --- a/dom/public/base/nsIDOMCrypto.h +++ b/dom/public/base/nsIDOMCrypto.h @@ -39,19 +39,19 @@ class nsIDOMCrypto : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMCRYPTO_IID; return iid; } - NS_IMETHOD GetVersion(nsAWritableString& aVersion)=0; + NS_IMETHOD GetVersion(nsString& aVersion)=0; NS_IMETHOD GenerateCRMFRequest(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMCRMFObject** aReturn)=0; - NS_IMETHOD ImportUserCertificates(const nsAReadableString& aNickname, const nsAReadableString& aCmmfResponse, PRBool aDoForcedBackup, nsAWritableString& aReturn)=0; + NS_IMETHOD ImportUserCertificates(const nsString& aNickname, const nsString& aCmmfResponse, PRBool aDoForcedBackup, nsString& aReturn)=0; - NS_IMETHOD PopChallengeResponse(const nsAReadableString& aChallenge, nsAWritableString& aReturn)=0; + NS_IMETHOD PopChallengeResponse(const nsString& aChallenge, nsString& aReturn)=0; - NS_IMETHOD Random(PRInt32 aNumBytes, nsAWritableString& aReturn)=0; + NS_IMETHOD Random(PRInt32 aNumBytes, nsString& aReturn)=0; - NS_IMETHOD SignText(JSContext* cx, jsval* argv, PRUint32 argc, nsAWritableString& aReturn)=0; + NS_IMETHOD SignText(JSContext* cx, jsval* argv, PRUint32 argc, nsString& aReturn)=0; - NS_IMETHOD Alert(const nsAReadableString& aMessage)=0; + NS_IMETHOD Alert(const nsString& aMessage)=0; NS_IMETHOD Logout()=0; @@ -60,26 +60,26 @@ public: #define NS_DECL_IDOMCRYPTO \ - NS_IMETHOD GetVersion(nsAWritableString& aVersion); \ + NS_IMETHOD GetVersion(nsString& aVersion); \ NS_IMETHOD GenerateCRMFRequest(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMCRMFObject** aReturn); \ - NS_IMETHOD ImportUserCertificates(const nsAReadableString& aNickname, const nsAReadableString& aCmmfResponse, PRBool aDoForcedBackup, nsAWritableString& aReturn); \ - NS_IMETHOD PopChallengeResponse(const nsAReadableString& aChallenge, nsAWritableString& aReturn); \ - NS_IMETHOD Random(PRInt32 aNumBytes, nsAWritableString& aReturn); \ - NS_IMETHOD SignText(JSContext* cx, jsval* argv, PRUint32 argc, nsAWritableString& aReturn); \ - NS_IMETHOD Alert(const nsAReadableString& aMessage); \ + NS_IMETHOD ImportUserCertificates(const nsString& aNickname, const nsString& aCmmfResponse, PRBool aDoForcedBackup, nsString& aReturn); \ + NS_IMETHOD PopChallengeResponse(const nsString& aChallenge, nsString& aReturn); \ + NS_IMETHOD Random(PRInt32 aNumBytes, nsString& aReturn); \ + NS_IMETHOD SignText(JSContext* cx, jsval* argv, PRUint32 argc, nsString& aReturn); \ + NS_IMETHOD Alert(const nsString& aMessage); \ NS_IMETHOD Logout(); \ NS_IMETHOD DisableRightClick(); \ #define NS_FORWARD_IDOMCRYPTO(_to) \ - NS_IMETHOD GetVersion(nsAWritableString& aVersion) { return _to GetVersion(aVersion); } \ + NS_IMETHOD GetVersion(nsString& aVersion) { return _to GetVersion(aVersion); } \ NS_IMETHOD GenerateCRMFRequest(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMCRMFObject** aReturn) { return _to GenerateCRMFRequest(cx, argv, argc, aReturn); } \ - NS_IMETHOD ImportUserCertificates(const nsAReadableString& aNickname, const nsAReadableString& aCmmfResponse, PRBool aDoForcedBackup, nsAWritableString& aReturn) { return _to ImportUserCertificates(aNickname, aCmmfResponse, aDoForcedBackup, aReturn); } \ - NS_IMETHOD PopChallengeResponse(const nsAReadableString& aChallenge, nsAWritableString& aReturn) { return _to PopChallengeResponse(aChallenge, aReturn); } \ - NS_IMETHOD Random(PRInt32 aNumBytes, nsAWritableString& aReturn) { return _to Random(aNumBytes, aReturn); } \ - NS_IMETHOD SignText(JSContext* cx, jsval* argv, PRUint32 argc, nsAWritableString& aReturn) { return _to SignText(cx, argv, argc, aReturn); } \ - NS_IMETHOD Alert(const nsAReadableString& aMessage) { return _to Alert(aMessage); } \ + NS_IMETHOD ImportUserCertificates(const nsString& aNickname, const nsString& aCmmfResponse, PRBool aDoForcedBackup, nsString& aReturn) { return _to ImportUserCertificates(aNickname, aCmmfResponse, aDoForcedBackup, aReturn); } \ + NS_IMETHOD PopChallengeResponse(const nsString& aChallenge, nsString& aReturn) { return _to PopChallengeResponse(aChallenge, aReturn); } \ + NS_IMETHOD Random(PRInt32 aNumBytes, nsString& aReturn) { return _to Random(aNumBytes, aReturn); } \ + NS_IMETHOD SignText(JSContext* cx, jsval* argv, PRUint32 argc, nsString& aReturn) { return _to SignText(cx, argv, argc, aReturn); } \ + NS_IMETHOD Alert(const nsString& aMessage) { return _to Alert(aMessage); } \ NS_IMETHOD Logout() { return _to Logout(); } \ NS_IMETHOD DisableRightClick() { return _to DisableRightClick(); } \ diff --git a/dom/public/base/nsIDOMDOMException.h b/dom/public/base/nsIDOMDOMException.h index 6f2dd27e5f6..2fb3f0d1262 100644 --- a/dom/public/base/nsIDOMDOMException.h +++ b/dom/public/base/nsIDOMDOMException.h @@ -58,29 +58,29 @@ public: NS_IMETHOD GetResult(PRUint32* aResult)=0; - NS_IMETHOD GetMessage(nsAWritableString& aMessage)=0; + NS_IMETHOD GetMessage(nsString& aMessage)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; - NS_IMETHOD ToString(nsAWritableString& aReturn)=0; + NS_IMETHOD ToString(nsString& aReturn)=0; }; #define NS_DECL_IDOMDOMEXCEPTION \ NS_IMETHOD GetCode(PRUint32* aCode); \ NS_IMETHOD GetResult(PRUint32* aResult); \ - NS_IMETHOD GetMessage(nsAWritableString& aMessage); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD ToString(nsAWritableString& aReturn); \ + NS_IMETHOD GetMessage(nsString& aMessage); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD ToString(nsString& aReturn); \ #define NS_FORWARD_IDOMDOMEXCEPTION(_to) \ NS_IMETHOD GetCode(PRUint32* aCode) { return _to GetCode(aCode); } \ NS_IMETHOD GetResult(PRUint32* aResult) { return _to GetResult(aResult); } \ - NS_IMETHOD GetMessage(nsAWritableString& aMessage) { return _to GetMessage(aMessage); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD ToString(nsAWritableString& aReturn) { return _to ToString(aReturn); } \ + NS_IMETHOD GetMessage(nsString& aMessage) { return _to GetMessage(aMessage); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD ToString(nsString& aReturn) { return _to ToString(aReturn); } \ extern "C" NS_DOM nsresult NS_InitDOMExceptionClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/base/nsIDOMHistory.h b/dom/public/base/nsIDOMHistory.h index c3f28deff66..c021cad8989 100644 --- a/dom/public/base/nsIDOMHistory.h +++ b/dom/public/base/nsIDOMHistory.h @@ -40,11 +40,11 @@ public: NS_IMETHOD GetLength(PRInt32* aLength)=0; - NS_IMETHOD GetCurrent(nsAWritableString& aCurrent)=0; + NS_IMETHOD GetCurrent(nsString& aCurrent)=0; - NS_IMETHOD GetPrevious(nsAWritableString& aPrevious)=0; + NS_IMETHOD GetPrevious(nsString& aPrevious)=0; - NS_IMETHOD GetNext(nsAWritableString& aNext)=0; + NS_IMETHOD GetNext(nsString& aNext)=0; NS_IMETHOD Back()=0; @@ -56,9 +56,9 @@ public: #define NS_DECL_IDOMHISTORY \ NS_IMETHOD GetLength(PRInt32* aLength); \ - NS_IMETHOD GetCurrent(nsAWritableString& aCurrent); \ - NS_IMETHOD GetPrevious(nsAWritableString& aPrevious); \ - NS_IMETHOD GetNext(nsAWritableString& aNext); \ + NS_IMETHOD GetCurrent(nsString& aCurrent); \ + NS_IMETHOD GetPrevious(nsString& aPrevious); \ + NS_IMETHOD GetNext(nsString& aNext); \ NS_IMETHOD Back(); \ NS_IMETHOD Forward(); \ NS_IMETHOD Go(JSContext* cx, jsval* argv, PRUint32 argc); \ @@ -67,9 +67,9 @@ public: #define NS_FORWARD_IDOMHISTORY(_to) \ NS_IMETHOD GetLength(PRInt32* aLength) { return _to GetLength(aLength); } \ - NS_IMETHOD GetCurrent(nsAWritableString& aCurrent) { return _to GetCurrent(aCurrent); } \ - NS_IMETHOD GetPrevious(nsAWritableString& aPrevious) { return _to GetPrevious(aPrevious); } \ - NS_IMETHOD GetNext(nsAWritableString& aNext) { return _to GetNext(aNext); } \ + NS_IMETHOD GetCurrent(nsString& aCurrent) { return _to GetCurrent(aCurrent); } \ + NS_IMETHOD GetPrevious(nsString& aPrevious) { return _to GetPrevious(aPrevious); } \ + NS_IMETHOD GetNext(nsString& aNext) { return _to GetNext(aNext); } \ NS_IMETHOD Back() { return _to Back(); } \ NS_IMETHOD Forward() { return _to Forward(); } \ NS_IMETHOD Go(JSContext* cx, jsval* argv, PRUint32 argc) { return _to Go(cx, argv, argc); } \ diff --git a/dom/public/base/nsIDOMLocation.h b/dom/public/base/nsIDOMLocation.h index 26e0d74be05..f702d8b9180 100644 --- a/dom/public/base/nsIDOMLocation.h +++ b/dom/public/base/nsIDOMLocation.h @@ -37,81 +37,81 @@ class nsIDOMLocation : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMLOCATION_IID; return iid; } - NS_IMETHOD GetHash(nsAWritableString& aHash)=0; - NS_IMETHOD SetHash(const nsAReadableString& aHash)=0; + NS_IMETHOD GetHash(nsString& aHash)=0; + NS_IMETHOD SetHash(const nsString& aHash)=0; - NS_IMETHOD GetHost(nsAWritableString& aHost)=0; - NS_IMETHOD SetHost(const nsAReadableString& aHost)=0; + NS_IMETHOD GetHost(nsString& aHost)=0; + NS_IMETHOD SetHost(const nsString& aHost)=0; - NS_IMETHOD GetHostname(nsAWritableString& aHostname)=0; - NS_IMETHOD SetHostname(const nsAReadableString& aHostname)=0; + NS_IMETHOD GetHostname(nsString& aHostname)=0; + NS_IMETHOD SetHostname(const nsString& aHostname)=0; - NS_IMETHOD GetHref(nsAWritableString& aHref)=0; - NS_IMETHOD SetHref(const nsAReadableString& aHref)=0; + NS_IMETHOD GetHref(nsString& aHref)=0; + NS_IMETHOD SetHref(const nsString& aHref)=0; - NS_IMETHOD GetPathname(nsAWritableString& aPathname)=0; - NS_IMETHOD SetPathname(const nsAReadableString& aPathname)=0; + NS_IMETHOD GetPathname(nsString& aPathname)=0; + NS_IMETHOD SetPathname(const nsString& aPathname)=0; - NS_IMETHOD GetPort(nsAWritableString& aPort)=0; - NS_IMETHOD SetPort(const nsAReadableString& aPort)=0; + NS_IMETHOD GetPort(nsString& aPort)=0; + NS_IMETHOD SetPort(const nsString& aPort)=0; - NS_IMETHOD GetProtocol(nsAWritableString& aProtocol)=0; - NS_IMETHOD SetProtocol(const nsAReadableString& aProtocol)=0; + NS_IMETHOD GetProtocol(nsString& aProtocol)=0; + NS_IMETHOD SetProtocol(const nsString& aProtocol)=0; - NS_IMETHOD GetSearch(nsAWritableString& aSearch)=0; - NS_IMETHOD SetSearch(const nsAReadableString& aSearch)=0; + NS_IMETHOD GetSearch(nsString& aSearch)=0; + NS_IMETHOD SetSearch(const nsString& aSearch)=0; NS_IMETHOD Reload(PRBool aForceget)=0; - NS_IMETHOD Replace(const nsAReadableString& aUrl)=0; + NS_IMETHOD Replace(const nsString& aUrl)=0; - NS_IMETHOD ToString(nsAWritableString& aReturn)=0; + NS_IMETHOD ToString(nsString& aReturn)=0; }; #define NS_DECL_IDOMLOCATION \ - NS_IMETHOD GetHash(nsAWritableString& aHash); \ - NS_IMETHOD SetHash(const nsAReadableString& aHash); \ - NS_IMETHOD GetHost(nsAWritableString& aHost); \ - NS_IMETHOD SetHost(const nsAReadableString& aHost); \ - NS_IMETHOD GetHostname(nsAWritableString& aHostname); \ - NS_IMETHOD SetHostname(const nsAReadableString& aHostname); \ - NS_IMETHOD GetHref(nsAWritableString& aHref); \ - NS_IMETHOD SetHref(const nsAReadableString& aHref); \ - NS_IMETHOD GetPathname(nsAWritableString& aPathname); \ - NS_IMETHOD SetPathname(const nsAReadableString& aPathname); \ - NS_IMETHOD GetPort(nsAWritableString& aPort); \ - NS_IMETHOD SetPort(const nsAReadableString& aPort); \ - NS_IMETHOD GetProtocol(nsAWritableString& aProtocol); \ - NS_IMETHOD SetProtocol(const nsAReadableString& aProtocol); \ - NS_IMETHOD GetSearch(nsAWritableString& aSearch); \ - NS_IMETHOD SetSearch(const nsAReadableString& aSearch); \ + NS_IMETHOD GetHash(nsString& aHash); \ + NS_IMETHOD SetHash(const nsString& aHash); \ + NS_IMETHOD GetHost(nsString& aHost); \ + NS_IMETHOD SetHost(const nsString& aHost); \ + NS_IMETHOD GetHostname(nsString& aHostname); \ + NS_IMETHOD SetHostname(const nsString& aHostname); \ + NS_IMETHOD GetHref(nsString& aHref); \ + NS_IMETHOD SetHref(const nsString& aHref); \ + NS_IMETHOD GetPathname(nsString& aPathname); \ + NS_IMETHOD SetPathname(const nsString& aPathname); \ + NS_IMETHOD GetPort(nsString& aPort); \ + NS_IMETHOD SetPort(const nsString& aPort); \ + NS_IMETHOD GetProtocol(nsString& aProtocol); \ + NS_IMETHOD SetProtocol(const nsString& aProtocol); \ + NS_IMETHOD GetSearch(nsString& aSearch); \ + NS_IMETHOD SetSearch(const nsString& aSearch); \ NS_IMETHOD Reload(PRBool aForceget); \ - NS_IMETHOD Replace(const nsAReadableString& aUrl); \ - NS_IMETHOD ToString(nsAWritableString& aReturn); \ + NS_IMETHOD Replace(const nsString& aUrl); \ + NS_IMETHOD ToString(nsString& aReturn); \ #define NS_FORWARD_IDOMLOCATION(_to) \ - NS_IMETHOD GetHash(nsAWritableString& aHash) { return _to GetHash(aHash); } \ - NS_IMETHOD SetHash(const nsAReadableString& aHash) { return _to SetHash(aHash); } \ - NS_IMETHOD GetHost(nsAWritableString& aHost) { return _to GetHost(aHost); } \ - NS_IMETHOD SetHost(const nsAReadableString& aHost) { return _to SetHost(aHost); } \ - NS_IMETHOD GetHostname(nsAWritableString& aHostname) { return _to GetHostname(aHostname); } \ - NS_IMETHOD SetHostname(const nsAReadableString& aHostname) { return _to SetHostname(aHostname); } \ - NS_IMETHOD GetHref(nsAWritableString& aHref) { return _to GetHref(aHref); } \ - NS_IMETHOD SetHref(const nsAReadableString& aHref) { return _to SetHref(aHref); } \ - NS_IMETHOD GetPathname(nsAWritableString& aPathname) { return _to GetPathname(aPathname); } \ - NS_IMETHOD SetPathname(const nsAReadableString& aPathname) { return _to SetPathname(aPathname); } \ - NS_IMETHOD GetPort(nsAWritableString& aPort) { return _to GetPort(aPort); } \ - NS_IMETHOD SetPort(const nsAReadableString& aPort) { return _to SetPort(aPort); } \ - NS_IMETHOD GetProtocol(nsAWritableString& aProtocol) { return _to GetProtocol(aProtocol); } \ - NS_IMETHOD SetProtocol(const nsAReadableString& aProtocol) { return _to SetProtocol(aProtocol); } \ - NS_IMETHOD GetSearch(nsAWritableString& aSearch) { return _to GetSearch(aSearch); } \ - NS_IMETHOD SetSearch(const nsAReadableString& aSearch) { return _to SetSearch(aSearch); } \ + NS_IMETHOD GetHash(nsString& aHash) { return _to GetHash(aHash); } \ + NS_IMETHOD SetHash(const nsString& aHash) { return _to SetHash(aHash); } \ + NS_IMETHOD GetHost(nsString& aHost) { return _to GetHost(aHost); } \ + NS_IMETHOD SetHost(const nsString& aHost) { return _to SetHost(aHost); } \ + NS_IMETHOD GetHostname(nsString& aHostname) { return _to GetHostname(aHostname); } \ + NS_IMETHOD SetHostname(const nsString& aHostname) { return _to SetHostname(aHostname); } \ + NS_IMETHOD GetHref(nsString& aHref) { return _to GetHref(aHref); } \ + NS_IMETHOD SetHref(const nsString& aHref) { return _to SetHref(aHref); } \ + NS_IMETHOD GetPathname(nsString& aPathname) { return _to GetPathname(aPathname); } \ + NS_IMETHOD SetPathname(const nsString& aPathname) { return _to SetPathname(aPathname); } \ + NS_IMETHOD GetPort(nsString& aPort) { return _to GetPort(aPort); } \ + NS_IMETHOD SetPort(const nsString& aPort) { return _to SetPort(aPort); } \ + NS_IMETHOD GetProtocol(nsString& aProtocol) { return _to GetProtocol(aProtocol); } \ + NS_IMETHOD SetProtocol(const nsString& aProtocol) { return _to SetProtocol(aProtocol); } \ + NS_IMETHOD GetSearch(nsString& aSearch) { return _to GetSearch(aSearch); } \ + NS_IMETHOD SetSearch(const nsString& aSearch) { return _to SetSearch(aSearch); } \ NS_IMETHOD Reload(PRBool aForceget) { return _to Reload(aForceget); } \ - NS_IMETHOD Replace(const nsAReadableString& aUrl) { return _to Replace(aUrl); } \ - NS_IMETHOD ToString(nsAWritableString& aReturn) { return _to ToString(aReturn); } \ + NS_IMETHOD Replace(const nsString& aUrl) { return _to Replace(aUrl); } \ + NS_IMETHOD ToString(nsString& aReturn) { return _to ToString(aReturn); } \ extern "C" NS_DOM nsresult NS_InitLocationClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/base/nsIDOMMimeType.h b/dom/public/base/nsIDOMMimeType.h index 3a04c2fa1f6..f13c8f2a922 100644 --- a/dom/public/base/nsIDOMMimeType.h +++ b/dom/public/base/nsIDOMMimeType.h @@ -37,29 +37,29 @@ class nsIDOMMimeType : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMMIMETYPE_IID; return iid; } - NS_IMETHOD GetDescription(nsAWritableString& aDescription)=0; + NS_IMETHOD GetDescription(nsString& aDescription)=0; NS_IMETHOD GetEnabledPlugin(nsIDOMPlugin** aEnabledPlugin)=0; - NS_IMETHOD GetSuffixes(nsAWritableString& aSuffixes)=0; + NS_IMETHOD GetSuffixes(nsString& aSuffixes)=0; - NS_IMETHOD GetType(nsAWritableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; }; #define NS_DECL_IDOMMIMETYPE \ - NS_IMETHOD GetDescription(nsAWritableString& aDescription); \ + NS_IMETHOD GetDescription(nsString& aDescription); \ NS_IMETHOD GetEnabledPlugin(nsIDOMPlugin** aEnabledPlugin); \ - NS_IMETHOD GetSuffixes(nsAWritableString& aSuffixes); \ - NS_IMETHOD GetType(nsAWritableString& aType); \ + NS_IMETHOD GetSuffixes(nsString& aSuffixes); \ + NS_IMETHOD GetType(nsString& aType); \ #define NS_FORWARD_IDOMMIMETYPE(_to) \ - NS_IMETHOD GetDescription(nsAWritableString& aDescription) { return _to GetDescription(aDescription); } \ + NS_IMETHOD GetDescription(nsString& aDescription) { return _to GetDescription(aDescription); } \ NS_IMETHOD GetEnabledPlugin(nsIDOMPlugin** aEnabledPlugin) { return _to GetEnabledPlugin(aEnabledPlugin); } \ - NS_IMETHOD GetSuffixes(nsAWritableString& aSuffixes) { return _to GetSuffixes(aSuffixes); } \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ + NS_IMETHOD GetSuffixes(nsString& aSuffixes) { return _to GetSuffixes(aSuffixes); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ extern "C" NS_DOM nsresult NS_InitMimeTypeClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/base/nsIDOMMimeTypeArray.h b/dom/public/base/nsIDOMMimeTypeArray.h index d75e15acec4..3db24d02dd9 100644 --- a/dom/public/base/nsIDOMMimeTypeArray.h +++ b/dom/public/base/nsIDOMMimeTypeArray.h @@ -41,21 +41,21 @@ public: NS_IMETHOD Item(PRUint32 aIndex, nsIDOMMimeType** aReturn)=0; - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMMimeType** aReturn)=0; + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMMimeType** aReturn)=0; }; #define NS_DECL_IDOMMIMETYPEARRAY \ NS_IMETHOD GetLength(PRUint32* aLength); \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMMimeType** aReturn); \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMMimeType** aReturn); \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMMimeType** aReturn); \ #define NS_FORWARD_IDOMMIMETYPEARRAY(_to) \ NS_IMETHOD GetLength(PRUint32* aLength) { return _to GetLength(aLength); } \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMMimeType** aReturn) { return _to Item(aIndex, aReturn); } \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMMimeType** aReturn) { return _to NamedItem(aName, aReturn); } \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMMimeType** aReturn) { return _to NamedItem(aName, aReturn); } \ extern "C" NS_DOM nsresult NS_InitMimeTypeArrayClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/base/nsIDOMNavigator.h b/dom/public/base/nsIDOMNavigator.h index 4137f69874a..795b976acc5 100644 --- a/dom/public/base/nsIDOMNavigator.h +++ b/dom/public/base/nsIDOMNavigator.h @@ -40,33 +40,33 @@ class nsIDOMNavigator : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMNAVIGATOR_IID; return iid; } - NS_IMETHOD GetAppCodeName(nsAWritableString& aAppCodeName)=0; + NS_IMETHOD GetAppCodeName(nsString& aAppCodeName)=0; - NS_IMETHOD GetAppName(nsAWritableString& aAppName)=0; + NS_IMETHOD GetAppName(nsString& aAppName)=0; - NS_IMETHOD GetAppVersion(nsAWritableString& aAppVersion)=0; + NS_IMETHOD GetAppVersion(nsString& aAppVersion)=0; - NS_IMETHOD GetLanguage(nsAWritableString& aLanguage)=0; + NS_IMETHOD GetLanguage(nsString& aLanguage)=0; NS_IMETHOD GetMimeTypes(nsIDOMMimeTypeArray** aMimeTypes)=0; - NS_IMETHOD GetPlatform(nsAWritableString& aPlatform)=0; + NS_IMETHOD GetPlatform(nsString& aPlatform)=0; - NS_IMETHOD GetOscpu(nsAWritableString& aOscpu)=0; + NS_IMETHOD GetOscpu(nsString& aOscpu)=0; - NS_IMETHOD GetVendor(nsAWritableString& aVendor)=0; + NS_IMETHOD GetVendor(nsString& aVendor)=0; - NS_IMETHOD GetVendorSub(nsAWritableString& aVendorSub)=0; + NS_IMETHOD GetVendorSub(nsString& aVendorSub)=0; - NS_IMETHOD GetProduct(nsAWritableString& aProduct)=0; + NS_IMETHOD GetProduct(nsString& aProduct)=0; - NS_IMETHOD GetProductSub(nsAWritableString& aProductSub)=0; + NS_IMETHOD GetProductSub(nsString& aProductSub)=0; NS_IMETHOD GetPlugins(nsIDOMPluginArray** aPlugins)=0; - NS_IMETHOD GetSecurityPolicy(nsAWritableString& aSecurityPolicy)=0; + NS_IMETHOD GetSecurityPolicy(nsString& aSecurityPolicy)=0; - NS_IMETHOD GetUserAgent(nsAWritableString& aUserAgent)=0; + NS_IMETHOD GetUserAgent(nsString& aUserAgent)=0; NS_IMETHOD GetCookieEnabled(PRBool* aCookieEnabled)=0; @@ -79,20 +79,20 @@ public: #define NS_DECL_IDOMNAVIGATOR \ - NS_IMETHOD GetAppCodeName(nsAWritableString& aAppCodeName); \ - NS_IMETHOD GetAppName(nsAWritableString& aAppName); \ - NS_IMETHOD GetAppVersion(nsAWritableString& aAppVersion); \ - NS_IMETHOD GetLanguage(nsAWritableString& aLanguage); \ + NS_IMETHOD GetAppCodeName(nsString& aAppCodeName); \ + NS_IMETHOD GetAppName(nsString& aAppName); \ + NS_IMETHOD GetAppVersion(nsString& aAppVersion); \ + NS_IMETHOD GetLanguage(nsString& aLanguage); \ NS_IMETHOD GetMimeTypes(nsIDOMMimeTypeArray** aMimeTypes); \ - NS_IMETHOD GetPlatform(nsAWritableString& aPlatform); \ - NS_IMETHOD GetOscpu(nsAWritableString& aOscpu); \ - NS_IMETHOD GetVendor(nsAWritableString& aVendor); \ - NS_IMETHOD GetVendorSub(nsAWritableString& aVendorSub); \ - NS_IMETHOD GetProduct(nsAWritableString& aProduct); \ - NS_IMETHOD GetProductSub(nsAWritableString& aProductSub); \ + NS_IMETHOD GetPlatform(nsString& aPlatform); \ + NS_IMETHOD GetOscpu(nsString& aOscpu); \ + NS_IMETHOD GetVendor(nsString& aVendor); \ + NS_IMETHOD GetVendorSub(nsString& aVendorSub); \ + NS_IMETHOD GetProduct(nsString& aProduct); \ + NS_IMETHOD GetProductSub(nsString& aProductSub); \ NS_IMETHOD GetPlugins(nsIDOMPluginArray** aPlugins); \ - NS_IMETHOD GetSecurityPolicy(nsAWritableString& aSecurityPolicy); \ - NS_IMETHOD GetUserAgent(nsAWritableString& aUserAgent); \ + NS_IMETHOD GetSecurityPolicy(nsString& aSecurityPolicy); \ + NS_IMETHOD GetUserAgent(nsString& aUserAgent); \ NS_IMETHOD GetCookieEnabled(PRBool* aCookieEnabled); \ NS_IMETHOD JavaEnabled(PRBool* aReturn); \ NS_IMETHOD TaintEnabled(PRBool* aReturn); \ @@ -101,20 +101,20 @@ public: #define NS_FORWARD_IDOMNAVIGATOR(_to) \ - NS_IMETHOD GetAppCodeName(nsAWritableString& aAppCodeName) { return _to GetAppCodeName(aAppCodeName); } \ - NS_IMETHOD GetAppName(nsAWritableString& aAppName) { return _to GetAppName(aAppName); } \ - NS_IMETHOD GetAppVersion(nsAWritableString& aAppVersion) { return _to GetAppVersion(aAppVersion); } \ - NS_IMETHOD GetLanguage(nsAWritableString& aLanguage) { return _to GetLanguage(aLanguage); } \ + NS_IMETHOD GetAppCodeName(nsString& aAppCodeName) { return _to GetAppCodeName(aAppCodeName); } \ + NS_IMETHOD GetAppName(nsString& aAppName) { return _to GetAppName(aAppName); } \ + NS_IMETHOD GetAppVersion(nsString& aAppVersion) { return _to GetAppVersion(aAppVersion); } \ + NS_IMETHOD GetLanguage(nsString& aLanguage) { return _to GetLanguage(aLanguage); } \ NS_IMETHOD GetMimeTypes(nsIDOMMimeTypeArray** aMimeTypes) { return _to GetMimeTypes(aMimeTypes); } \ - NS_IMETHOD GetPlatform(nsAWritableString& aPlatform) { return _to GetPlatform(aPlatform); } \ - NS_IMETHOD GetOscpu(nsAWritableString& aOscpu) { return _to GetOscpu(aOscpu); } \ - NS_IMETHOD GetVendor(nsAWritableString& aVendor) { return _to GetVendor(aVendor); } \ - NS_IMETHOD GetVendorSub(nsAWritableString& aVendorSub) { return _to GetVendorSub(aVendorSub); } \ - NS_IMETHOD GetProduct(nsAWritableString& aProduct) { return _to GetProduct(aProduct); } \ - NS_IMETHOD GetProductSub(nsAWritableString& aProductSub) { return _to GetProductSub(aProductSub); } \ + NS_IMETHOD GetPlatform(nsString& aPlatform) { return _to GetPlatform(aPlatform); } \ + NS_IMETHOD GetOscpu(nsString& aOscpu) { return _to GetOscpu(aOscpu); } \ + NS_IMETHOD GetVendor(nsString& aVendor) { return _to GetVendor(aVendor); } \ + NS_IMETHOD GetVendorSub(nsString& aVendorSub) { return _to GetVendorSub(aVendorSub); } \ + NS_IMETHOD GetProduct(nsString& aProduct) { return _to GetProduct(aProduct); } \ + NS_IMETHOD GetProductSub(nsString& aProductSub) { return _to GetProductSub(aProductSub); } \ NS_IMETHOD GetPlugins(nsIDOMPluginArray** aPlugins) { return _to GetPlugins(aPlugins); } \ - NS_IMETHOD GetSecurityPolicy(nsAWritableString& aSecurityPolicy) { return _to GetSecurityPolicy(aSecurityPolicy); } \ - NS_IMETHOD GetUserAgent(nsAWritableString& aUserAgent) { return _to GetUserAgent(aUserAgent); } \ + NS_IMETHOD GetSecurityPolicy(nsString& aSecurityPolicy) { return _to GetSecurityPolicy(aSecurityPolicy); } \ + NS_IMETHOD GetUserAgent(nsString& aUserAgent) { return _to GetUserAgent(aUserAgent); } \ NS_IMETHOD GetCookieEnabled(PRBool* aCookieEnabled) { return _to GetCookieEnabled(aCookieEnabled); } \ NS_IMETHOD JavaEnabled(PRBool* aReturn) { return _to JavaEnabled(aReturn); } \ NS_IMETHOD TaintEnabled(PRBool* aReturn) { return _to TaintEnabled(aReturn); } \ diff --git a/dom/public/base/nsIDOMPkcs11.h b/dom/public/base/nsIDOMPkcs11.h index 2074ba076de..223b2c3705e 100644 --- a/dom/public/base/nsIDOMPkcs11.h +++ b/dom/public/base/nsIDOMPkcs11.h @@ -37,21 +37,21 @@ class nsIDOMPkcs11 : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMPKCS11_IID; return iid; } - NS_IMETHOD Deletemodule(const nsAReadableString& aModuleName, PRInt32* aReturn)=0; + NS_IMETHOD Deletemodule(const nsString& aModuleName, PRInt32* aReturn)=0; - NS_IMETHOD Addmodule(const nsAReadableString& aModuleName, const nsAReadableString& aLibraryFullPath, PRInt32 aCryptoMechanismFlags, PRInt32 aCipherFlags, PRInt32* aReturn)=0; + NS_IMETHOD Addmodule(const nsString& aModuleName, const nsString& aLibraryFullPath, PRInt32 aCryptoMechanismFlags, PRInt32 aCipherFlags, PRInt32* aReturn)=0; }; #define NS_DECL_IDOMPKCS11 \ - NS_IMETHOD Deletemodule(const nsAReadableString& aModuleName, PRInt32* aReturn); \ - NS_IMETHOD Addmodule(const nsAReadableString& aModuleName, const nsAReadableString& aLibraryFullPath, PRInt32 aCryptoMechanismFlags, PRInt32 aCipherFlags, PRInt32* aReturn); \ + NS_IMETHOD Deletemodule(const nsString& aModuleName, PRInt32* aReturn); \ + NS_IMETHOD Addmodule(const nsString& aModuleName, const nsString& aLibraryFullPath, PRInt32 aCryptoMechanismFlags, PRInt32 aCipherFlags, PRInt32* aReturn); \ #define NS_FORWARD_IDOMPKCS11(_to) \ - NS_IMETHOD Deletemodule(const nsAReadableString& aModuleName, PRInt32* aReturn) { return _to Deletemodule(aModuleName, aReturn); } \ - NS_IMETHOD Addmodule(const nsAReadableString& aModuleName, const nsAReadableString& aLibraryFullPath, PRInt32 aCryptoMechanismFlags, PRInt32 aCipherFlags, PRInt32* aReturn) { return _to Addmodule(aModuleName, aLibraryFullPath, aCryptoMechanismFlags, aCipherFlags, aReturn); } \ + NS_IMETHOD Deletemodule(const nsString& aModuleName, PRInt32* aReturn) { return _to Deletemodule(aModuleName, aReturn); } \ + NS_IMETHOD Addmodule(const nsString& aModuleName, const nsString& aLibraryFullPath, PRInt32 aCryptoMechanismFlags, PRInt32 aCipherFlags, PRInt32* aReturn) { return _to Addmodule(aModuleName, aLibraryFullPath, aCryptoMechanismFlags, aCipherFlags, aReturn); } \ extern "C" NS_DOM nsresult NS_InitPkcs11Class(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/base/nsIDOMPlugin.h b/dom/public/base/nsIDOMPlugin.h index f8cea791af9..f2e0ad6a236 100644 --- a/dom/public/base/nsIDOMPlugin.h +++ b/dom/public/base/nsIDOMPlugin.h @@ -37,37 +37,37 @@ class nsIDOMPlugin : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMPLUGIN_IID; return iid; } - NS_IMETHOD GetDescription(nsAWritableString& aDescription)=0; + NS_IMETHOD GetDescription(nsString& aDescription)=0; - NS_IMETHOD GetFilename(nsAWritableString& aFilename)=0; + NS_IMETHOD GetFilename(nsString& aFilename)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; NS_IMETHOD GetLength(PRUint32* aLength)=0; NS_IMETHOD Item(PRUint32 aIndex, nsIDOMMimeType** aReturn)=0; - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMMimeType** aReturn)=0; + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMMimeType** aReturn)=0; }; #define NS_DECL_IDOMPLUGIN \ - NS_IMETHOD GetDescription(nsAWritableString& aDescription); \ - NS_IMETHOD GetFilename(nsAWritableString& aFilename); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ + NS_IMETHOD GetDescription(nsString& aDescription); \ + NS_IMETHOD GetFilename(nsString& aFilename); \ + NS_IMETHOD GetName(nsString& aName); \ NS_IMETHOD GetLength(PRUint32* aLength); \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMMimeType** aReturn); \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMMimeType** aReturn); \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMMimeType** aReturn); \ #define NS_FORWARD_IDOMPLUGIN(_to) \ - NS_IMETHOD GetDescription(nsAWritableString& aDescription) { return _to GetDescription(aDescription); } \ - NS_IMETHOD GetFilename(nsAWritableString& aFilename) { return _to GetFilename(aFilename); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ + NS_IMETHOD GetDescription(nsString& aDescription) { return _to GetDescription(aDescription); } \ + NS_IMETHOD GetFilename(nsString& aFilename) { return _to GetFilename(aFilename); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ NS_IMETHOD GetLength(PRUint32* aLength) { return _to GetLength(aLength); } \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMMimeType** aReturn) { return _to Item(aIndex, aReturn); } \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMMimeType** aReturn) { return _to NamedItem(aName, aReturn); } \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMMimeType** aReturn) { return _to NamedItem(aName, aReturn); } \ extern "C" NS_DOM nsresult NS_InitPluginClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/base/nsIDOMPluginArray.h b/dom/public/base/nsIDOMPluginArray.h index 1b73b519018..7506e682453 100644 --- a/dom/public/base/nsIDOMPluginArray.h +++ b/dom/public/base/nsIDOMPluginArray.h @@ -41,7 +41,7 @@ public: NS_IMETHOD Item(PRUint32 aIndex, nsIDOMPlugin** aReturn)=0; - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMPlugin** aReturn)=0; + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMPlugin** aReturn)=0; NS_IMETHOD Refresh(PRBool aReloadDocuments)=0; }; @@ -50,7 +50,7 @@ public: #define NS_DECL_IDOMPLUGINARRAY \ NS_IMETHOD GetLength(PRUint32* aLength); \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMPlugin** aReturn); \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMPlugin** aReturn); \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMPlugin** aReturn); \ NS_IMETHOD Refresh(PRBool aReloadDocuments); \ @@ -58,7 +58,7 @@ public: #define NS_FORWARD_IDOMPLUGINARRAY(_to) \ NS_IMETHOD GetLength(PRUint32* aLength) { return _to GetLength(aLength); } \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMPlugin** aReturn) { return _to Item(aIndex, aReturn); } \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMPlugin** aReturn) { return _to NamedItem(aName, aReturn); } \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMPlugin** aReturn) { return _to NamedItem(aName, aReturn); } \ NS_IMETHOD Refresh(PRBool aReloadDocuments) { return _to Refresh(aReloadDocuments); } \ diff --git a/dom/public/base/nsIDOMViewCSS.h b/dom/public/base/nsIDOMViewCSS.h index b43bffdce6d..058617563ab 100644 --- a/dom/public/base/nsIDOMViewCSS.h +++ b/dom/public/base/nsIDOMViewCSS.h @@ -40,17 +40,17 @@ class nsIDOMViewCSS : public nsIDOMAbstractView { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMVIEWCSS_IID; return iid; } - NS_IMETHOD GetComputedStyle(nsIDOMElement* aElt, const nsAReadableString& aPseudoElt, nsIDOMCSSStyleDeclaration** aReturn)=0; + NS_IMETHOD GetComputedStyle(nsIDOMElement* aElt, const nsString& aPseudoElt, nsIDOMCSSStyleDeclaration** aReturn)=0; }; #define NS_DECL_IDOMVIEWCSS \ - NS_IMETHOD GetComputedStyle(nsIDOMElement* aElt, const nsAReadableString& aPseudoElt, nsIDOMCSSStyleDeclaration** aReturn); \ + NS_IMETHOD GetComputedStyle(nsIDOMElement* aElt, const nsString& aPseudoElt, nsIDOMCSSStyleDeclaration** aReturn); \ #define NS_FORWARD_IDOMVIEWCSS(_to) \ - NS_IMETHOD GetComputedStyle(nsIDOMElement* aElt, const nsAReadableString& aPseudoElt, nsIDOMCSSStyleDeclaration** aReturn) { return _to GetComputedStyle(aElt, aPseudoElt, aReturn); } \ + NS_IMETHOD GetComputedStyle(nsIDOMElement* aElt, const nsString& aPseudoElt, nsIDOMCSSStyleDeclaration** aReturn) { return _to GetComputedStyle(aElt, aPseudoElt, aReturn); } \ #endif // nsIDOMViewCSS_h__ diff --git a/dom/public/base/nsIDOMWindow.h b/dom/public/base/nsIDOMWindow.h index d97fc1304de..9fc3df239ca 100644 --- a/dom/public/base/nsIDOMWindow.h +++ b/dom/public/base/nsIDOMWindow.h @@ -101,14 +101,14 @@ public: NS_IMETHOD GetOpener(nsIDOMWindow** aOpener)=0; NS_IMETHOD SetOpener(nsIDOMWindow* aOpener)=0; - NS_IMETHOD GetStatus(nsAWritableString& aStatus)=0; - NS_IMETHOD SetStatus(const nsAReadableString& aStatus)=0; + NS_IMETHOD GetStatus(nsString& aStatus)=0; + NS_IMETHOD SetStatus(const nsString& aStatus)=0; - NS_IMETHOD GetDefaultStatus(nsAWritableString& aDefaultStatus)=0; - NS_IMETHOD SetDefaultStatus(const nsAReadableString& aDefaultStatus)=0; + NS_IMETHOD GetDefaultStatus(nsString& aDefaultStatus)=0; + NS_IMETHOD SetDefaultStatus(const nsString& aDefaultStatus)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; NS_IMETHOD GetInnerWidth(PRInt32* aInnerWidth)=0; NS_IMETHOD SetInnerWidth(PRInt32 aInnerWidth)=0; @@ -140,7 +140,7 @@ public: NS_IMETHOD GetLength(PRUint32* aLength)=0; - NS_IMETHOD Dump(const nsAReadableString& aStr)=0; + NS_IMETHOD Dump(const nsString& aStr)=0; NS_IMETHOD Alert(JSContext* cx, jsval* argv, PRUint32 argc)=0; @@ -198,7 +198,7 @@ public: NS_IMETHOD DisableExternalCapture()=0; - NS_IMETHOD SetCursor(const nsAReadableString& aCursor)=0; + NS_IMETHOD SetCursor(const nsString& aCursor)=0; NS_IMETHOD Open(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMWindow** aReturn)=0; @@ -208,11 +208,11 @@ public: NS_IMETHOD Close(JSContext* cx, jsval* argv, PRUint32 argc)=0; - NS_IMETHOD UpdateCommands(const nsAReadableString& aAction)=0; + NS_IMETHOD UpdateCommands(const nsString& aAction)=0; - NS_IMETHOD Escape(const nsAReadableString& aStr, nsAWritableString& aReturn)=0; + NS_IMETHOD Escape(const nsString& aStr, nsString& aReturn)=0; - NS_IMETHOD Unescape(const nsAReadableString& aStr, nsAWritableString& aReturn)=0; + NS_IMETHOD Unescape(const nsString& aStr, nsString& aReturn)=0; NS_IMETHOD GetSelection(nsIDOMSelection** aReturn)=0; }; @@ -244,12 +244,12 @@ public: NS_IMETHOD GetControllers(nsIControllers** aControllers); \ NS_IMETHOD GetOpener(nsIDOMWindow** aOpener); \ NS_IMETHOD SetOpener(nsIDOMWindow* aOpener); \ - NS_IMETHOD GetStatus(nsAWritableString& aStatus); \ - NS_IMETHOD SetStatus(const nsAReadableString& aStatus); \ - NS_IMETHOD GetDefaultStatus(nsAWritableString& aDefaultStatus); \ - NS_IMETHOD SetDefaultStatus(const nsAReadableString& aDefaultStatus); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ + NS_IMETHOD GetStatus(nsString& aStatus); \ + NS_IMETHOD SetStatus(const nsString& aStatus); \ + NS_IMETHOD GetDefaultStatus(nsString& aDefaultStatus); \ + NS_IMETHOD SetDefaultStatus(const nsString& aDefaultStatus); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ NS_IMETHOD GetInnerWidth(PRInt32* aInnerWidth); \ NS_IMETHOD SetInnerWidth(PRInt32 aInnerWidth); \ NS_IMETHOD GetInnerHeight(PRInt32* aInnerHeight); \ @@ -269,7 +269,7 @@ public: NS_IMETHOD GetScrollX(PRInt32* aScrollX); \ NS_IMETHOD GetScrollY(PRInt32* aScrollY); \ NS_IMETHOD GetLength(PRUint32* aLength); \ - NS_IMETHOD Dump(const nsAReadableString& aStr); \ + NS_IMETHOD Dump(const nsString& aStr); \ NS_IMETHOD Alert(JSContext* cx, jsval* argv, PRUint32 argc); \ NS_IMETHOD Confirm(JSContext* cx, jsval* argv, PRUint32 argc, PRBool* aReturn); \ NS_IMETHOD Prompt(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn); \ @@ -298,14 +298,14 @@ public: NS_IMETHOD RouteEvent(nsIDOMEvent* aEvt); \ NS_IMETHOD EnableExternalCapture(); \ NS_IMETHOD DisableExternalCapture(); \ - NS_IMETHOD SetCursor(const nsAReadableString& aCursor); \ + NS_IMETHOD SetCursor(const nsString& aCursor); \ NS_IMETHOD Open(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMWindow** aReturn); \ NS_IMETHOD OpenDialog(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMWindow** aReturn); \ NS_IMETHOD Close(); \ NS_IMETHOD Close(JSContext* cx, jsval* argv, PRUint32 argc); \ - NS_IMETHOD UpdateCommands(const nsAReadableString& aAction); \ - NS_IMETHOD Escape(const nsAReadableString& aStr, nsAWritableString& aReturn); \ - NS_IMETHOD Unescape(const nsAReadableString& aStr, nsAWritableString& aReturn); \ + NS_IMETHOD UpdateCommands(const nsString& aAction); \ + NS_IMETHOD Escape(const nsString& aStr, nsString& aReturn); \ + NS_IMETHOD Unescape(const nsString& aStr, nsString& aReturn); \ NS_IMETHOD GetSelection(nsIDOMSelection** aReturn); \ @@ -336,12 +336,12 @@ public: NS_IMETHOD GetControllers(nsIControllers** aControllers) { return _to GetControllers(aControllers); } \ NS_IMETHOD GetOpener(nsIDOMWindow** aOpener) { return _to GetOpener(aOpener); } \ NS_IMETHOD SetOpener(nsIDOMWindow* aOpener) { return _to SetOpener(aOpener); } \ - NS_IMETHOD GetStatus(nsAWritableString& aStatus) { return _to GetStatus(aStatus); } \ - NS_IMETHOD SetStatus(const nsAReadableString& aStatus) { return _to SetStatus(aStatus); } \ - NS_IMETHOD GetDefaultStatus(nsAWritableString& aDefaultStatus) { return _to GetDefaultStatus(aDefaultStatus); } \ - NS_IMETHOD SetDefaultStatus(const nsAReadableString& aDefaultStatus) { return _to SetDefaultStatus(aDefaultStatus); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetStatus(nsString& aStatus) { return _to GetStatus(aStatus); } \ + NS_IMETHOD SetStatus(const nsString& aStatus) { return _to SetStatus(aStatus); } \ + NS_IMETHOD GetDefaultStatus(nsString& aDefaultStatus) { return _to GetDefaultStatus(aDefaultStatus); } \ + NS_IMETHOD SetDefaultStatus(const nsString& aDefaultStatus) { return _to SetDefaultStatus(aDefaultStatus); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ NS_IMETHOD GetInnerWidth(PRInt32* aInnerWidth) { return _to GetInnerWidth(aInnerWidth); } \ NS_IMETHOD SetInnerWidth(PRInt32 aInnerWidth) { return _to SetInnerWidth(aInnerWidth); } \ NS_IMETHOD GetInnerHeight(PRInt32* aInnerHeight) { return _to GetInnerHeight(aInnerHeight); } \ @@ -361,7 +361,7 @@ public: NS_IMETHOD GetScrollX(PRInt32* aScrollX) { return _to GetScrollX(aScrollX); } \ NS_IMETHOD GetScrollY(PRInt32* aScrollY) { return _to GetScrollY(aScrollY); } \ NS_IMETHOD GetLength(PRUint32* aLength) { return _to GetLength(aLength); } \ - NS_IMETHOD Dump(const nsAReadableString& aStr) { return _to Dump(aStr); } \ + NS_IMETHOD Dump(const nsString& aStr) { return _to Dump(aStr); } \ NS_IMETHOD Alert(JSContext* cx, jsval* argv, PRUint32 argc) { return _to Alert(cx, argv, argc); } \ NS_IMETHOD Confirm(JSContext* cx, jsval* argv, PRUint32 argc, PRBool* aReturn) { return _to Confirm(cx, argv, argc, aReturn); } \ NS_IMETHOD Prompt(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn) { return _to Prompt(cx, argv, argc, aReturn); } \ @@ -390,14 +390,14 @@ public: NS_IMETHOD RouteEvent(nsIDOMEvent* aEvt) { return _to RouteEvent(aEvt); } \ NS_IMETHOD EnableExternalCapture() { return _to EnableExternalCapture(); } \ NS_IMETHOD DisableExternalCapture() { return _to DisableExternalCapture(); } \ - NS_IMETHOD SetCursor(const nsAReadableString& aCursor) { return _to SetCursor(aCursor); } \ + NS_IMETHOD SetCursor(const nsString& aCursor) { return _to SetCursor(aCursor); } \ NS_IMETHOD Open(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMWindow** aReturn) { return _to Open(cx, argv, argc, aReturn); } \ NS_IMETHOD OpenDialog(JSContext* cx, jsval* argv, PRUint32 argc, nsIDOMWindow** aReturn) { return _to OpenDialog(cx, argv, argc, aReturn); } \ NS_IMETHOD Close() { return _to Close(); } \ NS_IMETHOD Close(JSContext* cx, jsval* argv, PRUint32 argc) { return _to Close(cx, argv, argc); } \ - NS_IMETHOD UpdateCommands(const nsAReadableString& aAction) { return _to UpdateCommands(aAction); } \ - NS_IMETHOD Escape(const nsAReadableString& aStr, nsAWritableString& aReturn) { return _to Escape(aStr, aReturn); } \ - NS_IMETHOD Unescape(const nsAReadableString& aStr, nsAWritableString& aReturn) { return _to Unescape(aStr, aReturn); } \ + NS_IMETHOD UpdateCommands(const nsString& aAction) { return _to UpdateCommands(aAction); } \ + NS_IMETHOD Escape(const nsString& aStr, nsString& aReturn) { return _to Escape(aStr, aReturn); } \ + NS_IMETHOD Unescape(const nsString& aStr, nsString& aReturn) { return _to Unescape(aStr, aReturn); } \ NS_IMETHOD GetSelection(nsIDOMSelection** aReturn) { return _to GetSelection(aReturn); } \ diff --git a/dom/public/base/nsIDOMWindowCollection.h b/dom/public/base/nsIDOMWindowCollection.h index 5fc06033fa8..16a77c2f17b 100644 --- a/dom/public/base/nsIDOMWindowCollection.h +++ b/dom/public/base/nsIDOMWindowCollection.h @@ -42,21 +42,21 @@ public: NS_IMETHOD Item(PRUint32 aIndex, nsIDOMWindow** aReturn)=0; - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMWindow** aReturn)=0; + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMWindow** aReturn)=0; }; #define NS_DECL_IDOMWINDOWCOLLECTION \ NS_IMETHOD GetLength(PRUint32* aLength); \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMWindow** aReturn); \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMWindow** aReturn); \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMWindow** aReturn); \ #define NS_FORWARD_IDOMWINDOWCOLLECTION(_to) \ NS_IMETHOD GetLength(PRUint32* aLength) { return _to GetLength(aLength); } \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMWindow** aReturn) { return _to Item(aIndex, aReturn); } \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMWindow** aReturn) { return _to NamedItem(aName, aReturn); } \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMWindow** aReturn) { return _to NamedItem(aName, aReturn); } \ extern "C" NS_DOM nsresult NS_InitWindowCollectionClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreDom/nsIDOMAttr.h b/dom/public/coreDom/nsIDOMAttr.h index 166283aa45f..4b567981a1b 100644 --- a/dom/public/coreDom/nsIDOMAttr.h +++ b/dom/public/coreDom/nsIDOMAttr.h @@ -39,31 +39,31 @@ class nsIDOMAttr : public nsIDOMNode { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMATTR_IID; return iid; } - NS_IMETHOD GetName(nsAWritableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; NS_IMETHOD GetSpecified(PRBool* aSpecified)=0; - NS_IMETHOD GetValue(nsAWritableString& aValue)=0; - NS_IMETHOD SetValue(const nsAReadableString& aValue)=0; + NS_IMETHOD GetValue(nsString& aValue)=0; + NS_IMETHOD SetValue(const nsString& aValue)=0; NS_IMETHOD GetOwnerElement(nsIDOMElement** aOwnerElement)=0; }; #define NS_DECL_IDOMATTR \ - NS_IMETHOD GetName(nsAWritableString& aName); \ + NS_IMETHOD GetName(nsString& aName); \ NS_IMETHOD GetSpecified(PRBool* aSpecified); \ - NS_IMETHOD GetValue(nsAWritableString& aValue); \ - NS_IMETHOD SetValue(const nsAReadableString& aValue); \ + NS_IMETHOD GetValue(nsString& aValue); \ + NS_IMETHOD SetValue(const nsString& aValue); \ NS_IMETHOD GetOwnerElement(nsIDOMElement** aOwnerElement); \ #define NS_FORWARD_IDOMATTR(_to) \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ NS_IMETHOD GetSpecified(PRBool* aSpecified) { return _to GetSpecified(aSpecified); } \ - NS_IMETHOD GetValue(nsAWritableString& aValue) { return _to GetValue(aValue); } \ - NS_IMETHOD SetValue(const nsAReadableString& aValue) { return _to SetValue(aValue); } \ + NS_IMETHOD GetValue(nsString& aValue) { return _to GetValue(aValue); } \ + NS_IMETHOD SetValue(const nsString& aValue) { return _to SetValue(aValue); } \ NS_IMETHOD GetOwnerElement(nsIDOMElement** aOwnerElement) { return _to GetOwnerElement(aOwnerElement); } \ diff --git a/dom/public/coreDom/nsIDOMCharacterData.h b/dom/public/coreDom/nsIDOMCharacterData.h index 74548ec7152..52db7ae01da 100644 --- a/dom/public/coreDom/nsIDOMCharacterData.h +++ b/dom/public/coreDom/nsIDOMCharacterData.h @@ -38,44 +38,44 @@ class nsIDOMCharacterData : public nsIDOMNode { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMCHARACTERDATA_IID; return iid; } - NS_IMETHOD GetData(nsAWritableString& aData)=0; - NS_IMETHOD SetData(const nsAReadableString& aData)=0; + NS_IMETHOD GetData(nsString& aData)=0; + NS_IMETHOD SetData(const nsString& aData)=0; NS_IMETHOD GetLength(PRUint32* aLength)=0; - NS_IMETHOD SubstringData(PRUint32 aOffset, PRUint32 aCount, nsAWritableString& aReturn)=0; + NS_IMETHOD SubstringData(PRUint32 aOffset, PRUint32 aCount, nsString& aReturn)=0; - NS_IMETHOD AppendData(const nsAReadableString& aArg)=0; + NS_IMETHOD AppendData(const nsString& aArg)=0; - NS_IMETHOD InsertData(PRUint32 aOffset, const nsAReadableString& aArg)=0; + NS_IMETHOD InsertData(PRUint32 aOffset, const nsString& aArg)=0; NS_IMETHOD DeleteData(PRUint32 aOffset, PRUint32 aCount)=0; - NS_IMETHOD ReplaceData(PRUint32 aOffset, PRUint32 aCount, const nsAReadableString& aArg)=0; + NS_IMETHOD ReplaceData(PRUint32 aOffset, PRUint32 aCount, const nsString& aArg)=0; }; #define NS_DECL_IDOMCHARACTERDATA \ - NS_IMETHOD GetData(nsAWritableString& aData); \ - NS_IMETHOD SetData(const nsAReadableString& aData); \ + NS_IMETHOD GetData(nsString& aData); \ + NS_IMETHOD SetData(const nsString& aData); \ NS_IMETHOD GetLength(PRUint32* aLength); \ - NS_IMETHOD SubstringData(PRUint32 aOffset, PRUint32 aCount, nsAWritableString& aReturn); \ - NS_IMETHOD AppendData(const nsAReadableString& aArg); \ - NS_IMETHOD InsertData(PRUint32 aOffset, const nsAReadableString& aArg); \ + NS_IMETHOD SubstringData(PRUint32 aOffset, PRUint32 aCount, nsString& aReturn); \ + NS_IMETHOD AppendData(const nsString& aArg); \ + NS_IMETHOD InsertData(PRUint32 aOffset, const nsString& aArg); \ NS_IMETHOD DeleteData(PRUint32 aOffset, PRUint32 aCount); \ - NS_IMETHOD ReplaceData(PRUint32 aOffset, PRUint32 aCount, const nsAReadableString& aArg); \ + NS_IMETHOD ReplaceData(PRUint32 aOffset, PRUint32 aCount, const nsString& aArg); \ #define NS_FORWARD_IDOMCHARACTERDATA(_to) \ - NS_IMETHOD GetData(nsAWritableString& aData) { return _to GetData(aData); } \ - NS_IMETHOD SetData(const nsAReadableString& aData) { return _to SetData(aData); } \ + NS_IMETHOD GetData(nsString& aData) { return _to GetData(aData); } \ + NS_IMETHOD SetData(const nsString& aData) { return _to SetData(aData); } \ NS_IMETHOD GetLength(PRUint32* aLength) { return _to GetLength(aLength); } \ - NS_IMETHOD SubstringData(PRUint32 aOffset, PRUint32 aCount, nsAWritableString& aReturn) { return _to SubstringData(aOffset, aCount, aReturn); } \ - NS_IMETHOD AppendData(const nsAReadableString& aArg) { return _to AppendData(aArg); } \ - NS_IMETHOD InsertData(PRUint32 aOffset, const nsAReadableString& aArg) { return _to InsertData(aOffset, aArg); } \ + NS_IMETHOD SubstringData(PRUint32 aOffset, PRUint32 aCount, nsString& aReturn) { return _to SubstringData(aOffset, aCount, aReturn); } \ + NS_IMETHOD AppendData(const nsString& aArg) { return _to AppendData(aArg); } \ + NS_IMETHOD InsertData(PRUint32 aOffset, const nsString& aArg) { return _to InsertData(aOffset, aArg); } \ NS_IMETHOD DeleteData(PRUint32 aOffset, PRUint32 aCount) { return _to DeleteData(aOffset, aCount); } \ - NS_IMETHOD ReplaceData(PRUint32 aOffset, PRUint32 aCount, const nsAReadableString& aArg) { return _to ReplaceData(aOffset, aCount, aArg); } \ + NS_IMETHOD ReplaceData(PRUint32 aOffset, PRUint32 aCount, const nsString& aArg) { return _to ReplaceData(aOffset, aCount, aArg); } \ extern "C" NS_DOM nsresult NS_InitCharacterDataClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreDom/nsIDOMDOMImplementation.h b/dom/public/coreDom/nsIDOMDOMImplementation.h index 311ee2b81a0..18fcdd82917 100644 --- a/dom/public/coreDom/nsIDOMDOMImplementation.h +++ b/dom/public/coreDom/nsIDOMDOMImplementation.h @@ -39,25 +39,25 @@ class nsIDOMDOMImplementation : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOMIMPLEMENTATION_IID; return iid; } - NS_IMETHOD HasFeature(const nsAReadableString& aFeature, const nsAReadableString& aVersion, PRBool* aReturn)=0; + NS_IMETHOD HasFeature(const nsString& aFeature, const nsString& aVersion, PRBool* aReturn)=0; - NS_IMETHOD CreateDocumentType(const nsAReadableString& aQualifiedName, const nsAReadableString& aPublicId, const nsAReadableString& aSystemId, nsIDOMDocumentType** aReturn)=0; + NS_IMETHOD CreateDocumentType(const nsString& aQualifiedName, const nsString& aPublicId, const nsString& aSystemId, nsIDOMDocumentType** aReturn)=0; - NS_IMETHOD CreateDocument(const nsAReadableString& aNamespaceURI, const nsAReadableString& aQualifiedName, nsIDOMDocumentType* aDoctype, nsIDOMDocument** aReturn)=0; + NS_IMETHOD CreateDocument(const nsString& aNamespaceURI, const nsString& aQualifiedName, nsIDOMDocumentType* aDoctype, nsIDOMDocument** aReturn)=0; }; #define NS_DECL_IDOMDOMIMPLEMENTATION \ - NS_IMETHOD HasFeature(const nsAReadableString& aFeature, const nsAReadableString& aVersion, PRBool* aReturn); \ - NS_IMETHOD CreateDocumentType(const nsAReadableString& aQualifiedName, const nsAReadableString& aPublicId, const nsAReadableString& aSystemId, nsIDOMDocumentType** aReturn); \ - NS_IMETHOD CreateDocument(const nsAReadableString& aNamespaceURI, const nsAReadableString& aQualifiedName, nsIDOMDocumentType* aDoctype, nsIDOMDocument** aReturn); \ + NS_IMETHOD HasFeature(const nsString& aFeature, const nsString& aVersion, PRBool* aReturn); \ + NS_IMETHOD CreateDocumentType(const nsString& aQualifiedName, const nsString& aPublicId, const nsString& aSystemId, nsIDOMDocumentType** aReturn); \ + NS_IMETHOD CreateDocument(const nsString& aNamespaceURI, const nsString& aQualifiedName, nsIDOMDocumentType* aDoctype, nsIDOMDocument** aReturn); \ #define NS_FORWARD_IDOMDOMIMPLEMENTATION(_to) \ - NS_IMETHOD HasFeature(const nsAReadableString& aFeature, const nsAReadableString& aVersion, PRBool* aReturn) { return _to HasFeature(aFeature, aVersion, aReturn); } \ - NS_IMETHOD CreateDocumentType(const nsAReadableString& aQualifiedName, const nsAReadableString& aPublicId, const nsAReadableString& aSystemId, nsIDOMDocumentType** aReturn) { return _to CreateDocumentType(aQualifiedName, aPublicId, aSystemId, aReturn); } \ - NS_IMETHOD CreateDocument(const nsAReadableString& aNamespaceURI, const nsAReadableString& aQualifiedName, nsIDOMDocumentType* aDoctype, nsIDOMDocument** aReturn) { return _to CreateDocument(aNamespaceURI, aQualifiedName, aDoctype, aReturn); } \ + NS_IMETHOD HasFeature(const nsString& aFeature, const nsString& aVersion, PRBool* aReturn) { return _to HasFeature(aFeature, aVersion, aReturn); } \ + NS_IMETHOD CreateDocumentType(const nsString& aQualifiedName, const nsString& aPublicId, const nsString& aSystemId, nsIDOMDocumentType** aReturn) { return _to CreateDocumentType(aQualifiedName, aPublicId, aSystemId, aReturn); } \ + NS_IMETHOD CreateDocument(const nsString& aNamespaceURI, const nsString& aQualifiedName, nsIDOMDocumentType* aDoctype, nsIDOMDocument** aReturn) { return _to CreateDocument(aNamespaceURI, aQualifiedName, aDoctype, aReturn); } \ extern "C" NS_DOM nsresult NS_InitDOMImplementationClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreDom/nsIDOMDocument.h b/dom/public/coreDom/nsIDOMDocument.h index 89ae52af3f1..2dc48627e3a 100644 --- a/dom/public/coreDom/nsIDOMDocument.h +++ b/dom/public/coreDom/nsIDOMDocument.h @@ -56,33 +56,33 @@ public: NS_IMETHOD GetDocumentElement(nsIDOMElement** aDocumentElement)=0; - NS_IMETHOD CreateElement(const nsAReadableString& aTagName, nsIDOMElement** aReturn)=0; + NS_IMETHOD CreateElement(const nsString& aTagName, nsIDOMElement** aReturn)=0; NS_IMETHOD CreateDocumentFragment(nsIDOMDocumentFragment** aReturn)=0; - NS_IMETHOD CreateTextNode(const nsAReadableString& aData, nsIDOMText** aReturn)=0; + NS_IMETHOD CreateTextNode(const nsString& aData, nsIDOMText** aReturn)=0; - NS_IMETHOD CreateComment(const nsAReadableString& aData, nsIDOMComment** aReturn)=0; + NS_IMETHOD CreateComment(const nsString& aData, nsIDOMComment** aReturn)=0; - NS_IMETHOD CreateCDATASection(const nsAReadableString& aData, nsIDOMCDATASection** aReturn)=0; + NS_IMETHOD CreateCDATASection(const nsString& aData, nsIDOMCDATASection** aReturn)=0; - NS_IMETHOD CreateProcessingInstruction(const nsAReadableString& aTarget, const nsAReadableString& aData, nsIDOMProcessingInstruction** aReturn)=0; + NS_IMETHOD CreateProcessingInstruction(const nsString& aTarget, const nsString& aData, nsIDOMProcessingInstruction** aReturn)=0; - NS_IMETHOD CreateAttribute(const nsAReadableString& aName, nsIDOMAttr** aReturn)=0; + NS_IMETHOD CreateAttribute(const nsString& aName, nsIDOMAttr** aReturn)=0; - NS_IMETHOD CreateEntityReference(const nsAReadableString& aName, nsIDOMEntityReference** aReturn)=0; + NS_IMETHOD CreateEntityReference(const nsString& aName, nsIDOMEntityReference** aReturn)=0; - NS_IMETHOD GetElementsByTagName(const nsAReadableString& aTagname, nsIDOMNodeList** aReturn)=0; + NS_IMETHOD GetElementsByTagName(const nsString& aTagname, nsIDOMNodeList** aReturn)=0; NS_IMETHOD ImportNode(nsIDOMNode* aImportedNode, PRBool aDeep, nsIDOMNode** aReturn)=0; - NS_IMETHOD CreateElementNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aQualifiedName, nsIDOMElement** aReturn)=0; + NS_IMETHOD CreateElementNS(const nsString& aNamespaceURI, const nsString& aQualifiedName, nsIDOMElement** aReturn)=0; - NS_IMETHOD CreateAttributeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aQualifiedName, nsIDOMAttr** aReturn)=0; + NS_IMETHOD CreateAttributeNS(const nsString& aNamespaceURI, const nsString& aQualifiedName, nsIDOMAttr** aReturn)=0; - NS_IMETHOD GetElementsByTagNameNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMNodeList** aReturn)=0; + NS_IMETHOD GetElementsByTagNameNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMNodeList** aReturn)=0; - NS_IMETHOD GetElementById(const nsAReadableString& aElementId, nsIDOMElement** aReturn)=0; + NS_IMETHOD GetElementById(const nsString& aElementId, nsIDOMElement** aReturn)=0; }; @@ -90,20 +90,20 @@ public: NS_IMETHOD GetDoctype(nsIDOMDocumentType** aDoctype); \ NS_IMETHOD GetImplementation(nsIDOMDOMImplementation** aImplementation); \ NS_IMETHOD GetDocumentElement(nsIDOMElement** aDocumentElement); \ - NS_IMETHOD CreateElement(const nsAReadableString& aTagName, nsIDOMElement** aReturn); \ + NS_IMETHOD CreateElement(const nsString& aTagName, nsIDOMElement** aReturn); \ NS_IMETHOD CreateDocumentFragment(nsIDOMDocumentFragment** aReturn); \ - NS_IMETHOD CreateTextNode(const nsAReadableString& aData, nsIDOMText** aReturn); \ - NS_IMETHOD CreateComment(const nsAReadableString& aData, nsIDOMComment** aReturn); \ - NS_IMETHOD CreateCDATASection(const nsAReadableString& aData, nsIDOMCDATASection** aReturn); \ - NS_IMETHOD CreateProcessingInstruction(const nsAReadableString& aTarget, const nsAReadableString& aData, nsIDOMProcessingInstruction** aReturn); \ - NS_IMETHOD CreateAttribute(const nsAReadableString& aName, nsIDOMAttr** aReturn); \ - NS_IMETHOD CreateEntityReference(const nsAReadableString& aName, nsIDOMEntityReference** aReturn); \ - NS_IMETHOD GetElementsByTagName(const nsAReadableString& aTagname, nsIDOMNodeList** aReturn); \ + NS_IMETHOD CreateTextNode(const nsString& aData, nsIDOMText** aReturn); \ + NS_IMETHOD CreateComment(const nsString& aData, nsIDOMComment** aReturn); \ + NS_IMETHOD CreateCDATASection(const nsString& aData, nsIDOMCDATASection** aReturn); \ + NS_IMETHOD CreateProcessingInstruction(const nsString& aTarget, const nsString& aData, nsIDOMProcessingInstruction** aReturn); \ + NS_IMETHOD CreateAttribute(const nsString& aName, nsIDOMAttr** aReturn); \ + NS_IMETHOD CreateEntityReference(const nsString& aName, nsIDOMEntityReference** aReturn); \ + NS_IMETHOD GetElementsByTagName(const nsString& aTagname, nsIDOMNodeList** aReturn); \ NS_IMETHOD ImportNode(nsIDOMNode* aImportedNode, PRBool aDeep, nsIDOMNode** aReturn); \ - NS_IMETHOD CreateElementNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aQualifiedName, nsIDOMElement** aReturn); \ - NS_IMETHOD CreateAttributeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aQualifiedName, nsIDOMAttr** aReturn); \ - NS_IMETHOD GetElementsByTagNameNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMNodeList** aReturn); \ - NS_IMETHOD GetElementById(const nsAReadableString& aElementId, nsIDOMElement** aReturn); \ + NS_IMETHOD CreateElementNS(const nsString& aNamespaceURI, const nsString& aQualifiedName, nsIDOMElement** aReturn); \ + NS_IMETHOD CreateAttributeNS(const nsString& aNamespaceURI, const nsString& aQualifiedName, nsIDOMAttr** aReturn); \ + NS_IMETHOD GetElementsByTagNameNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMNodeList** aReturn); \ + NS_IMETHOD GetElementById(const nsString& aElementId, nsIDOMElement** aReturn); \ @@ -111,20 +111,20 @@ public: NS_IMETHOD GetDoctype(nsIDOMDocumentType** aDoctype) { return _to GetDoctype(aDoctype); } \ NS_IMETHOD GetImplementation(nsIDOMDOMImplementation** aImplementation) { return _to GetImplementation(aImplementation); } \ NS_IMETHOD GetDocumentElement(nsIDOMElement** aDocumentElement) { return _to GetDocumentElement(aDocumentElement); } \ - NS_IMETHOD CreateElement(const nsAReadableString& aTagName, nsIDOMElement** aReturn) { return _to CreateElement(aTagName, aReturn); } \ + NS_IMETHOD CreateElement(const nsString& aTagName, nsIDOMElement** aReturn) { return _to CreateElement(aTagName, aReturn); } \ NS_IMETHOD CreateDocumentFragment(nsIDOMDocumentFragment** aReturn) { return _to CreateDocumentFragment(aReturn); } \ - NS_IMETHOD CreateTextNode(const nsAReadableString& aData, nsIDOMText** aReturn) { return _to CreateTextNode(aData, aReturn); } \ - NS_IMETHOD CreateComment(const nsAReadableString& aData, nsIDOMComment** aReturn) { return _to CreateComment(aData, aReturn); } \ - NS_IMETHOD CreateCDATASection(const nsAReadableString& aData, nsIDOMCDATASection** aReturn) { return _to CreateCDATASection(aData, aReturn); } \ - NS_IMETHOD CreateProcessingInstruction(const nsAReadableString& aTarget, const nsAReadableString& aData, nsIDOMProcessingInstruction** aReturn) { return _to CreateProcessingInstruction(aTarget, aData, aReturn); } \ - NS_IMETHOD CreateAttribute(const nsAReadableString& aName, nsIDOMAttr** aReturn) { return _to CreateAttribute(aName, aReturn); } \ - NS_IMETHOD CreateEntityReference(const nsAReadableString& aName, nsIDOMEntityReference** aReturn) { return _to CreateEntityReference(aName, aReturn); } \ - NS_IMETHOD GetElementsByTagName(const nsAReadableString& aTagname, nsIDOMNodeList** aReturn) { return _to GetElementsByTagName(aTagname, aReturn); } \ + NS_IMETHOD CreateTextNode(const nsString& aData, nsIDOMText** aReturn) { return _to CreateTextNode(aData, aReturn); } \ + NS_IMETHOD CreateComment(const nsString& aData, nsIDOMComment** aReturn) { return _to CreateComment(aData, aReturn); } \ + NS_IMETHOD CreateCDATASection(const nsString& aData, nsIDOMCDATASection** aReturn) { return _to CreateCDATASection(aData, aReturn); } \ + NS_IMETHOD CreateProcessingInstruction(const nsString& aTarget, const nsString& aData, nsIDOMProcessingInstruction** aReturn) { return _to CreateProcessingInstruction(aTarget, aData, aReturn); } \ + NS_IMETHOD CreateAttribute(const nsString& aName, nsIDOMAttr** aReturn) { return _to CreateAttribute(aName, aReturn); } \ + NS_IMETHOD CreateEntityReference(const nsString& aName, nsIDOMEntityReference** aReturn) { return _to CreateEntityReference(aName, aReturn); } \ + NS_IMETHOD GetElementsByTagName(const nsString& aTagname, nsIDOMNodeList** aReturn) { return _to GetElementsByTagName(aTagname, aReturn); } \ NS_IMETHOD ImportNode(nsIDOMNode* aImportedNode, PRBool aDeep, nsIDOMNode** aReturn) { return _to ImportNode(aImportedNode, aDeep, aReturn); } \ - NS_IMETHOD CreateElementNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aQualifiedName, nsIDOMElement** aReturn) { return _to CreateElementNS(aNamespaceURI, aQualifiedName, aReturn); } \ - NS_IMETHOD CreateAttributeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aQualifiedName, nsIDOMAttr** aReturn) { return _to CreateAttributeNS(aNamespaceURI, aQualifiedName, aReturn); } \ - NS_IMETHOD GetElementsByTagNameNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMNodeList** aReturn) { return _to GetElementsByTagNameNS(aNamespaceURI, aLocalName, aReturn); } \ - NS_IMETHOD GetElementById(const nsAReadableString& aElementId, nsIDOMElement** aReturn) { return _to GetElementById(aElementId, aReturn); } \ + NS_IMETHOD CreateElementNS(const nsString& aNamespaceURI, const nsString& aQualifiedName, nsIDOMElement** aReturn) { return _to CreateElementNS(aNamespaceURI, aQualifiedName, aReturn); } \ + NS_IMETHOD CreateAttributeNS(const nsString& aNamespaceURI, const nsString& aQualifiedName, nsIDOMAttr** aReturn) { return _to CreateAttributeNS(aNamespaceURI, aQualifiedName, aReturn); } \ + NS_IMETHOD GetElementsByTagNameNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMNodeList** aReturn) { return _to GetElementsByTagNameNS(aNamespaceURI, aLocalName, aReturn); } \ + NS_IMETHOD GetElementById(const nsString& aElementId, nsIDOMElement** aReturn) { return _to GetElementById(aElementId, aReturn); } \ extern "C" NS_DOM nsresult NS_InitDocumentClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreDom/nsIDOMDocumentCSS.h b/dom/public/coreDom/nsIDOMDocumentCSS.h index a7c0280398a..642fe3c844e 100644 --- a/dom/public/coreDom/nsIDOMDocumentCSS.h +++ b/dom/public/coreDom/nsIDOMDocumentCSS.h @@ -40,17 +40,17 @@ class nsIDOMDocumentCSS : public nsIDOMDocumentStyle { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENTCSS_IID; return iid; } - NS_IMETHOD GetOverrideStyle(nsIDOMElement* aElt, const nsAReadableString& aPseudoElt, nsIDOMCSSStyleDeclaration** aReturn)=0; + NS_IMETHOD GetOverrideStyle(nsIDOMElement* aElt, const nsString& aPseudoElt, nsIDOMCSSStyleDeclaration** aReturn)=0; }; #define NS_DECL_IDOMDOCUMENTCSS \ - NS_IMETHOD GetOverrideStyle(nsIDOMElement* aElt, const nsAReadableString& aPseudoElt, nsIDOMCSSStyleDeclaration** aReturn); \ + NS_IMETHOD GetOverrideStyle(nsIDOMElement* aElt, const nsString& aPseudoElt, nsIDOMCSSStyleDeclaration** aReturn); \ #define NS_FORWARD_IDOMDOCUMENTCSS(_to) \ - NS_IMETHOD GetOverrideStyle(nsIDOMElement* aElt, const nsAReadableString& aPseudoElt, nsIDOMCSSStyleDeclaration** aReturn) { return _to GetOverrideStyle(aElt, aPseudoElt, aReturn); } \ + NS_IMETHOD GetOverrideStyle(nsIDOMElement* aElt, const nsString& aPseudoElt, nsIDOMCSSStyleDeclaration** aReturn) { return _to GetOverrideStyle(aElt, aPseudoElt, aReturn); } \ #endif // nsIDOMDocumentCSS_h__ diff --git a/dom/public/coreDom/nsIDOMDocumentEvent.h b/dom/public/coreDom/nsIDOMDocumentEvent.h index c5182c6f28a..53c40d17ca4 100644 --- a/dom/public/coreDom/nsIDOMDocumentEvent.h +++ b/dom/public/coreDom/nsIDOMDocumentEvent.h @@ -38,17 +38,17 @@ class nsIDOMDocumentEvent : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENTEVENT_IID; return iid; } - NS_IMETHOD CreateEvent(const nsAReadableString& aEventType, nsIDOMEvent** aReturn)=0; + NS_IMETHOD CreateEvent(const nsString& aEventType, nsIDOMEvent** aReturn)=0; }; #define NS_DECL_IDOMDOCUMENTEVENT \ - NS_IMETHOD CreateEvent(const nsAReadableString& aEventType, nsIDOMEvent** aReturn); \ + NS_IMETHOD CreateEvent(const nsString& aEventType, nsIDOMEvent** aReturn); \ #define NS_FORWARD_IDOMDOCUMENTEVENT(_to) \ - NS_IMETHOD CreateEvent(const nsAReadableString& aEventType, nsIDOMEvent** aReturn) { return _to CreateEvent(aEventType, aReturn); } \ + NS_IMETHOD CreateEvent(const nsString& aEventType, nsIDOMEvent** aReturn) { return _to CreateEvent(aEventType, aReturn); } \ #endif // nsIDOMDocumentEvent_h__ diff --git a/dom/public/coreDom/nsIDOMDocumentType.h b/dom/public/coreDom/nsIDOMDocumentType.h index d3040e55dd5..4383de7dafd 100644 --- a/dom/public/coreDom/nsIDOMDocumentType.h +++ b/dom/public/coreDom/nsIDOMDocumentType.h @@ -39,37 +39,37 @@ class nsIDOMDocumentType : public nsIDOMNode { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMDOCUMENTTYPE_IID; return iid; } - NS_IMETHOD GetName(nsAWritableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; NS_IMETHOD GetEntities(nsIDOMNamedNodeMap** aEntities)=0; NS_IMETHOD GetNotations(nsIDOMNamedNodeMap** aNotations)=0; - NS_IMETHOD GetPublicId(nsAWritableString& aPublicId)=0; + NS_IMETHOD GetPublicId(nsString& aPublicId)=0; - NS_IMETHOD GetSystemId(nsAWritableString& aSystemId)=0; + NS_IMETHOD GetSystemId(nsString& aSystemId)=0; - NS_IMETHOD GetInternalSubset(nsAWritableString& aInternalSubset)=0; + NS_IMETHOD GetInternalSubset(nsString& aInternalSubset)=0; }; #define NS_DECL_IDOMDOCUMENTTYPE \ - NS_IMETHOD GetName(nsAWritableString& aName); \ + NS_IMETHOD GetName(nsString& aName); \ NS_IMETHOD GetEntities(nsIDOMNamedNodeMap** aEntities); \ NS_IMETHOD GetNotations(nsIDOMNamedNodeMap** aNotations); \ - NS_IMETHOD GetPublicId(nsAWritableString& aPublicId); \ - NS_IMETHOD GetSystemId(nsAWritableString& aSystemId); \ - NS_IMETHOD GetInternalSubset(nsAWritableString& aInternalSubset); \ + NS_IMETHOD GetPublicId(nsString& aPublicId); \ + NS_IMETHOD GetSystemId(nsString& aSystemId); \ + NS_IMETHOD GetInternalSubset(nsString& aInternalSubset); \ #define NS_FORWARD_IDOMDOCUMENTTYPE(_to) \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ NS_IMETHOD GetEntities(nsIDOMNamedNodeMap** aEntities) { return _to GetEntities(aEntities); } \ NS_IMETHOD GetNotations(nsIDOMNamedNodeMap** aNotations) { return _to GetNotations(aNotations); } \ - NS_IMETHOD GetPublicId(nsAWritableString& aPublicId) { return _to GetPublicId(aPublicId); } \ - NS_IMETHOD GetSystemId(nsAWritableString& aSystemId) { return _to GetSystemId(aSystemId); } \ - NS_IMETHOD GetInternalSubset(nsAWritableString& aInternalSubset) { return _to GetInternalSubset(aInternalSubset); } \ + NS_IMETHOD GetPublicId(nsString& aPublicId) { return _to GetPublicId(aPublicId); } \ + NS_IMETHOD GetSystemId(nsString& aSystemId) { return _to GetSystemId(aSystemId); } \ + NS_IMETHOD GetInternalSubset(nsString& aInternalSubset) { return _to GetInternalSubset(aInternalSubset); } \ extern "C" NS_DOM nsresult NS_InitDocumentTypeClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreDom/nsIDOMDocumentXBL.h b/dom/public/coreDom/nsIDOMDocumentXBL.h index dd45cfa6b86..8f32df3f6fa 100644 --- a/dom/public/coreDom/nsIDOMDocumentXBL.h +++ b/dom/public/coreDom/nsIDOMDocumentXBL.h @@ -41,23 +41,23 @@ public: NS_IMETHOD GetAnonymousNodes(nsIDOMElement* aElt, nsIDOMNodeList** aReturn)=0; - NS_IMETHOD AddBinding(nsIDOMElement* aElt, const nsAReadableString& aBindingURL)=0; + NS_IMETHOD AddBinding(nsIDOMElement* aElt, const nsString& aBindingURL)=0; - NS_IMETHOD RemoveBinding(nsIDOMElement* aElt, const nsAReadableString& aBindingURL)=0; + NS_IMETHOD RemoveBinding(nsIDOMElement* aElt, const nsString& aBindingURL)=0; }; #define NS_DECL_IDOMDOCUMENTXBL \ NS_IMETHOD GetAnonymousNodes(nsIDOMElement* aElt, nsIDOMNodeList** aReturn); \ - NS_IMETHOD AddBinding(nsIDOMElement* aElt, const nsAReadableString& aBindingURL); \ - NS_IMETHOD RemoveBinding(nsIDOMElement* aElt, const nsAReadableString& aBindingURL); \ + NS_IMETHOD AddBinding(nsIDOMElement* aElt, const nsString& aBindingURL); \ + NS_IMETHOD RemoveBinding(nsIDOMElement* aElt, const nsString& aBindingURL); \ #define NS_FORWARD_IDOMDOCUMENTXBL(_to) \ NS_IMETHOD GetAnonymousNodes(nsIDOMElement* aElt, nsIDOMNodeList** aReturn) { return _to GetAnonymousNodes(aElt, aReturn); } \ - NS_IMETHOD AddBinding(nsIDOMElement* aElt, const nsAReadableString& aBindingURL) { return _to AddBinding(aElt, aBindingURL); } \ - NS_IMETHOD RemoveBinding(nsIDOMElement* aElt, const nsAReadableString& aBindingURL) { return _to RemoveBinding(aElt, aBindingURL); } \ + NS_IMETHOD AddBinding(nsIDOMElement* aElt, const nsString& aBindingURL) { return _to AddBinding(aElt, aBindingURL); } \ + NS_IMETHOD RemoveBinding(nsIDOMElement* aElt, const nsString& aBindingURL) { return _to RemoveBinding(aElt, aBindingURL); } \ #endif // nsIDOMDocumentXBL_h__ diff --git a/dom/public/coreDom/nsIDOMElement.h b/dom/public/coreDom/nsIDOMElement.h index fbd04eb5f1f..0f0604b38e4 100644 --- a/dom/public/coreDom/nsIDOMElement.h +++ b/dom/public/coreDom/nsIDOMElement.h @@ -40,77 +40,77 @@ class nsIDOMElement : public nsIDOMNode { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMELEMENT_IID; return iid; } - NS_IMETHOD GetTagName(nsAWritableString& aTagName)=0; + NS_IMETHOD GetTagName(nsString& aTagName)=0; - NS_IMETHOD GetAttribute(const nsAReadableString& aName, nsAWritableString& aReturn)=0; + NS_IMETHOD GetAttribute(const nsString& aName, nsString& aReturn)=0; - NS_IMETHOD SetAttribute(const nsAReadableString& aName, const nsAReadableString& aValue)=0; + NS_IMETHOD SetAttribute(const nsString& aName, const nsString& aValue)=0; - NS_IMETHOD RemoveAttribute(const nsAReadableString& aName)=0; + NS_IMETHOD RemoveAttribute(const nsString& aName)=0; - NS_IMETHOD GetAttributeNode(const nsAReadableString& aName, nsIDOMAttr** aReturn)=0; + NS_IMETHOD GetAttributeNode(const nsString& aName, nsIDOMAttr** aReturn)=0; NS_IMETHOD SetAttributeNode(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn)=0; NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* aOldAttr, nsIDOMAttr** aReturn)=0; - NS_IMETHOD GetElementsByTagName(const nsAReadableString& aName, nsIDOMNodeList** aReturn)=0; + NS_IMETHOD GetElementsByTagName(const nsString& aName, nsIDOMNodeList** aReturn)=0; - NS_IMETHOD GetAttributeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsAWritableString& aReturn)=0; + NS_IMETHOD GetAttributeNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsString& aReturn)=0; - NS_IMETHOD SetAttributeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aQualifiedName, const nsAReadableString& aValue)=0; + NS_IMETHOD SetAttributeNS(const nsString& aNamespaceURI, const nsString& aQualifiedName, const nsString& aValue)=0; - NS_IMETHOD RemoveAttributeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName)=0; + NS_IMETHOD RemoveAttributeNS(const nsString& aNamespaceURI, const nsString& aLocalName)=0; - NS_IMETHOD GetAttributeNodeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMAttr** aReturn)=0; + NS_IMETHOD GetAttributeNodeNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMAttr** aReturn)=0; NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn)=0; - NS_IMETHOD GetElementsByTagNameNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMNodeList** aReturn)=0; + NS_IMETHOD GetElementsByTagNameNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMNodeList** aReturn)=0; - NS_IMETHOD HasAttribute(const nsAReadableString& aName, PRBool* aReturn)=0; + NS_IMETHOD HasAttribute(const nsString& aName, PRBool* aReturn)=0; - NS_IMETHOD HasAttributeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, PRBool* aReturn)=0; + NS_IMETHOD HasAttributeNS(const nsString& aNamespaceURI, const nsString& aLocalName, PRBool* aReturn)=0; }; #define NS_DECL_IDOMELEMENT \ - 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, nsIDOMAttr** aReturn); \ + NS_IMETHOD GetTagName(nsString& aTagName); \ + NS_IMETHOD GetAttribute(const nsString& aName, nsString& aReturn); \ + NS_IMETHOD SetAttribute(const nsString& aName, const nsString& aValue); \ + NS_IMETHOD RemoveAttribute(const nsString& aName); \ + NS_IMETHOD GetAttributeNode(const nsString& aName, nsIDOMAttr** aReturn); \ NS_IMETHOD SetAttributeNode(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn); \ NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* aOldAttr, nsIDOMAttr** aReturn); \ - NS_IMETHOD GetElementsByTagName(const nsAReadableString& aName, 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, nsIDOMAttr** aReturn); \ + NS_IMETHOD GetElementsByTagName(const nsString& aName, nsIDOMNodeList** aReturn); \ + NS_IMETHOD GetAttributeNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsString& aReturn); \ + NS_IMETHOD SetAttributeNS(const nsString& aNamespaceURI, const nsString& aQualifiedName, const nsString& aValue); \ + NS_IMETHOD RemoveAttributeNS(const nsString& aNamespaceURI, const nsString& aLocalName); \ + NS_IMETHOD GetAttributeNodeNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMAttr** aReturn); \ NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn); \ - NS_IMETHOD GetElementsByTagNameNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMNodeList** aReturn); \ - NS_IMETHOD HasAttribute(const nsAReadableString& aName, PRBool* aReturn); \ - NS_IMETHOD HasAttributeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, PRBool* aReturn); \ + NS_IMETHOD GetElementsByTagNameNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMNodeList** aReturn); \ + NS_IMETHOD HasAttribute(const nsString& aName, PRBool* aReturn); \ + NS_IMETHOD HasAttributeNS(const nsString& aNamespaceURI, const nsString& aLocalName, PRBool* aReturn); \ #define NS_FORWARD_IDOMELEMENT(_to) \ - NS_IMETHOD GetTagName(nsAWritableString& aTagName) { return _to GetTagName(aTagName); } \ - NS_IMETHOD GetAttribute(const nsAReadableString& aName, nsAWritableString& aReturn) { return _to GetAttribute(aName, aReturn); } \ - NS_IMETHOD SetAttribute(const nsAReadableString& aName, const nsAReadableString& aValue) { return _to SetAttribute(aName, aValue); } \ - NS_IMETHOD RemoveAttribute(const nsAReadableString& aName) { return _to RemoveAttribute(aName); } \ - NS_IMETHOD GetAttributeNode(const nsAReadableString& aName, nsIDOMAttr** aReturn) { return _to GetAttributeNode(aName, aReturn); } \ + NS_IMETHOD GetTagName(nsString& aTagName) { return _to GetTagName(aTagName); } \ + NS_IMETHOD GetAttribute(const nsString& aName, nsString& aReturn) { return _to GetAttribute(aName, aReturn); } \ + NS_IMETHOD SetAttribute(const nsString& aName, const nsString& aValue) { return _to SetAttribute(aName, aValue); } \ + NS_IMETHOD RemoveAttribute(const nsString& aName) { return _to RemoveAttribute(aName); } \ + NS_IMETHOD GetAttributeNode(const nsString& aName, nsIDOMAttr** aReturn) { return _to GetAttributeNode(aName, aReturn); } \ NS_IMETHOD SetAttributeNode(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn) { return _to SetAttributeNode(aNewAttr, aReturn); } \ NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* aOldAttr, nsIDOMAttr** aReturn) { return _to RemoveAttributeNode(aOldAttr, aReturn); } \ - NS_IMETHOD GetElementsByTagName(const nsAReadableString& aName, nsIDOMNodeList** aReturn) { return _to GetElementsByTagName(aName, aReturn); } \ - NS_IMETHOD GetAttributeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsAWritableString& aReturn) { return _to GetAttributeNS(aNamespaceURI, aLocalName, aReturn); } \ - NS_IMETHOD SetAttributeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aQualifiedName, const nsAReadableString& aValue) { return _to SetAttributeNS(aNamespaceURI, aQualifiedName, aValue); } \ - NS_IMETHOD RemoveAttributeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName) { return _to RemoveAttributeNS(aNamespaceURI, aLocalName); } \ - NS_IMETHOD GetAttributeNodeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMAttr** aReturn) { return _to GetAttributeNodeNS(aNamespaceURI, aLocalName, aReturn); } \ + NS_IMETHOD GetElementsByTagName(const nsString& aName, nsIDOMNodeList** aReturn) { return _to GetElementsByTagName(aName, aReturn); } \ + NS_IMETHOD GetAttributeNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsString& aReturn) { return _to GetAttributeNS(aNamespaceURI, aLocalName, aReturn); } \ + NS_IMETHOD SetAttributeNS(const nsString& aNamespaceURI, const nsString& aQualifiedName, const nsString& aValue) { return _to SetAttributeNS(aNamespaceURI, aQualifiedName, aValue); } \ + NS_IMETHOD RemoveAttributeNS(const nsString& aNamespaceURI, const nsString& aLocalName) { return _to RemoveAttributeNS(aNamespaceURI, aLocalName); } \ + NS_IMETHOD GetAttributeNodeNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMAttr** aReturn) { return _to GetAttributeNodeNS(aNamespaceURI, aLocalName, aReturn); } \ NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* aNewAttr, nsIDOMAttr** aReturn) { return _to SetAttributeNodeNS(aNewAttr, aReturn); } \ - NS_IMETHOD GetElementsByTagNameNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMNodeList** aReturn) { return _to GetElementsByTagNameNS(aNamespaceURI, aLocalName, aReturn); } \ - NS_IMETHOD HasAttribute(const nsAReadableString& aName, PRBool* aReturn) { return _to HasAttribute(aName, aReturn); } \ - NS_IMETHOD HasAttributeNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, PRBool* aReturn) { return _to HasAttributeNS(aNamespaceURI, aLocalName, aReturn); } \ + NS_IMETHOD GetElementsByTagNameNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMNodeList** aReturn) { return _to GetElementsByTagNameNS(aNamespaceURI, aLocalName, aReturn); } \ + NS_IMETHOD HasAttribute(const nsString& aName, PRBool* aReturn) { return _to HasAttribute(aName, aReturn); } \ + NS_IMETHOD HasAttributeNS(const nsString& aNamespaceURI, const nsString& aLocalName, PRBool* aReturn) { return _to HasAttributeNS(aNamespaceURI, aLocalName, aReturn); } \ extern "C" NS_DOM nsresult NS_InitElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreDom/nsIDOMEntity.h b/dom/public/coreDom/nsIDOMEntity.h index ed41eafbb9e..a1baf82e208 100644 --- a/dom/public/coreDom/nsIDOMEntity.h +++ b/dom/public/coreDom/nsIDOMEntity.h @@ -38,25 +38,25 @@ class nsIDOMEntity : public nsIDOMNode { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMENTITY_IID; return iid; } - NS_IMETHOD GetPublicId(nsAWritableString& aPublicId)=0; + NS_IMETHOD GetPublicId(nsString& aPublicId)=0; - NS_IMETHOD GetSystemId(nsAWritableString& aSystemId)=0; + NS_IMETHOD GetSystemId(nsString& aSystemId)=0; - NS_IMETHOD GetNotationName(nsAWritableString& aNotationName)=0; + NS_IMETHOD GetNotationName(nsString& aNotationName)=0; }; #define NS_DECL_IDOMENTITY \ - NS_IMETHOD GetPublicId(nsAWritableString& aPublicId); \ - NS_IMETHOD GetSystemId(nsAWritableString& aSystemId); \ - NS_IMETHOD GetNotationName(nsAWritableString& aNotationName); \ + NS_IMETHOD GetPublicId(nsString& aPublicId); \ + NS_IMETHOD GetSystemId(nsString& aSystemId); \ + NS_IMETHOD GetNotationName(nsString& aNotationName); \ #define NS_FORWARD_IDOMENTITY(_to) \ - NS_IMETHOD GetPublicId(nsAWritableString& aPublicId) { return _to GetPublicId(aPublicId); } \ - NS_IMETHOD GetSystemId(nsAWritableString& aSystemId) { return _to GetSystemId(aSystemId); } \ - NS_IMETHOD GetNotationName(nsAWritableString& aNotationName) { return _to GetNotationName(aNotationName); } \ + NS_IMETHOD GetPublicId(nsString& aPublicId) { return _to GetPublicId(aPublicId); } \ + NS_IMETHOD GetSystemId(nsString& aSystemId) { return _to GetSystemId(aSystemId); } \ + NS_IMETHOD GetNotationName(nsString& aNotationName) { return _to GetNotationName(aNotationName); } \ extern "C" NS_DOM nsresult NS_InitEntityClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreDom/nsIDOMMediaList.h b/dom/public/coreDom/nsIDOMMediaList.h index 7fd2e71c850..07a98a5426f 100644 --- a/dom/public/coreDom/nsIDOMMediaList.h +++ b/dom/public/coreDom/nsIDOMMediaList.h @@ -37,36 +37,36 @@ class nsIDOMMediaList : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMMEDIALIST_IID; return iid; } - NS_IMETHOD GetMediaText(nsAWritableString& aMediaText)=0; - NS_IMETHOD SetMediaText(const nsAReadableString& aMediaText)=0; + NS_IMETHOD GetMediaText(nsString& aMediaText)=0; + NS_IMETHOD SetMediaText(const nsString& aMediaText)=0; NS_IMETHOD GetLength(PRUint32* aLength)=0; - NS_IMETHOD Item(PRUint32 aIndex, nsAWritableString& aReturn)=0; + NS_IMETHOD Item(PRUint32 aIndex, nsString& aReturn)=0; - NS_IMETHOD Delete(const nsAReadableString& aOldMedium)=0; + NS_IMETHOD Delete(const nsString& aOldMedium)=0; - NS_IMETHOD Append(const nsAReadableString& aNewMedium)=0; + NS_IMETHOD Append(const nsString& aNewMedium)=0; }; #define NS_DECL_IDOMMEDIALIST \ - NS_IMETHOD GetMediaText(nsAWritableString& aMediaText); \ - NS_IMETHOD SetMediaText(const nsAReadableString& aMediaText); \ + NS_IMETHOD GetMediaText(nsString& aMediaText); \ + NS_IMETHOD SetMediaText(const nsString& aMediaText); \ NS_IMETHOD GetLength(PRUint32* aLength); \ - NS_IMETHOD Item(PRUint32 aIndex, nsAWritableString& aReturn); \ - NS_IMETHOD Delete(const nsAReadableString& aOldMedium); \ - NS_IMETHOD Append(const nsAReadableString& aNewMedium); \ + NS_IMETHOD Item(PRUint32 aIndex, nsString& aReturn); \ + NS_IMETHOD Delete(const nsString& aOldMedium); \ + NS_IMETHOD Append(const nsString& aNewMedium); \ #define NS_FORWARD_IDOMMEDIALIST(_to) \ - NS_IMETHOD GetMediaText(nsAWritableString& aMediaText) { return _to GetMediaText(aMediaText); } \ - NS_IMETHOD SetMediaText(const nsAReadableString& aMediaText) { return _to SetMediaText(aMediaText); } \ + NS_IMETHOD GetMediaText(nsString& aMediaText) { return _to GetMediaText(aMediaText); } \ + NS_IMETHOD SetMediaText(const nsString& aMediaText) { return _to SetMediaText(aMediaText); } \ NS_IMETHOD GetLength(PRUint32* aLength) { return _to GetLength(aLength); } \ - NS_IMETHOD Item(PRUint32 aIndex, nsAWritableString& aReturn) { return _to Item(aIndex, aReturn); } \ - NS_IMETHOD Delete(const nsAReadableString& aOldMedium) { return _to Delete(aOldMedium); } \ - NS_IMETHOD Append(const nsAReadableString& aNewMedium) { return _to Append(aNewMedium); } \ + NS_IMETHOD Item(PRUint32 aIndex, nsString& aReturn) { return _to Item(aIndex, aReturn); } \ + NS_IMETHOD Delete(const nsString& aOldMedium) { return _to Delete(aOldMedium); } \ + NS_IMETHOD Append(const nsString& aNewMedium) { return _to Append(aNewMedium); } \ extern "C" NS_DOM nsresult NS_InitMediaListClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreDom/nsIDOMNSDocument.h b/dom/public/coreDom/nsIDOMNSDocument.h index c5418607740..9a4c7e84342 100644 --- a/dom/public/coreDom/nsIDOMNSDocument.h +++ b/dom/public/coreDom/nsIDOMNSDocument.h @@ -44,37 +44,37 @@ public: NS_IMETHOD GetHeight(PRInt32* aHeight)=0; - NS_IMETHOD GetCharacterSet(nsAWritableString& aCharacterSet)=0; + NS_IMETHOD GetCharacterSet(nsString& aCharacterSet)=0; NS_IMETHOD GetPlugins(nsIDOMPluginArray** aPlugins)=0; - NS_IMETHOD CreateElementWithNameSpace(const nsAReadableString& aTagName, const nsAReadableString& aNameSpace, nsIDOMElement** aReturn)=0; + NS_IMETHOD CreateElementWithNameSpace(const nsString& aTagName, const nsString& aNameSpace, nsIDOMElement** aReturn)=0; NS_IMETHOD CreateRange(nsIDOMRange** aReturn)=0; - NS_IMETHOD Load(const nsAReadableString& aUrl)=0; + NS_IMETHOD Load(const nsString& aUrl)=0; }; #define NS_DECL_IDOMNSDOCUMENT \ NS_IMETHOD GetWidth(PRInt32* aWidth); \ NS_IMETHOD GetHeight(PRInt32* aHeight); \ - NS_IMETHOD GetCharacterSet(nsAWritableString& aCharacterSet); \ + NS_IMETHOD GetCharacterSet(nsString& aCharacterSet); \ NS_IMETHOD GetPlugins(nsIDOMPluginArray** aPlugins); \ - NS_IMETHOD CreateElementWithNameSpace(const nsAReadableString& aTagName, const nsAReadableString& aNameSpace, nsIDOMElement** aReturn); \ + NS_IMETHOD CreateElementWithNameSpace(const nsString& aTagName, const nsString& aNameSpace, nsIDOMElement** aReturn); \ NS_IMETHOD CreateRange(nsIDOMRange** aReturn); \ - NS_IMETHOD Load(const nsAReadableString& aUrl); \ + NS_IMETHOD Load(const nsString& aUrl); \ #define NS_FORWARD_IDOMNSDOCUMENT(_to) \ NS_IMETHOD GetWidth(PRInt32* aWidth) { return _to GetWidth(aWidth); } \ NS_IMETHOD GetHeight(PRInt32* aHeight) { return _to GetHeight(aHeight); } \ - NS_IMETHOD GetCharacterSet(nsAWritableString& aCharacterSet) { return _to GetCharacterSet(aCharacterSet); } \ + NS_IMETHOD GetCharacterSet(nsString& aCharacterSet) { return _to GetCharacterSet(aCharacterSet); } \ NS_IMETHOD GetPlugins(nsIDOMPluginArray** aPlugins) { return _to GetPlugins(aPlugins); } \ - NS_IMETHOD CreateElementWithNameSpace(const nsAReadableString& aTagName, const nsAReadableString& aNameSpace, nsIDOMElement** aReturn) { return _to CreateElementWithNameSpace(aTagName, aNameSpace, aReturn); } \ + NS_IMETHOD CreateElementWithNameSpace(const nsString& aTagName, const nsString& aNameSpace, nsIDOMElement** aReturn) { return _to CreateElementWithNameSpace(aTagName, aNameSpace, aReturn); } \ NS_IMETHOD CreateRange(nsIDOMRange** aReturn) { return _to CreateRange(aReturn); } \ - NS_IMETHOD Load(const nsAReadableString& aUrl) { return _to Load(aUrl); } \ + NS_IMETHOD Load(const nsString& aUrl) { return _to Load(aUrl); } \ #endif // nsIDOMNSDocument_h__ diff --git a/dom/public/coreDom/nsIDOMNamedNodeMap.h b/dom/public/coreDom/nsIDOMNamedNodeMap.h index fc19874c44a..af46a71d412 100644 --- a/dom/public/coreDom/nsIDOMNamedNodeMap.h +++ b/dom/public/coreDom/nsIDOMNamedNodeMap.h @@ -40,43 +40,43 @@ public: NS_IMETHOD GetLength(PRUint32* aLength)=0; - NS_IMETHOD GetNamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn)=0; + NS_IMETHOD GetNamedItem(const nsString& aName, nsIDOMNode** aReturn)=0; NS_IMETHOD SetNamedItem(nsIDOMNode* aArg, nsIDOMNode** aReturn)=0; - NS_IMETHOD RemoveNamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn)=0; + NS_IMETHOD RemoveNamedItem(const nsString& aName, nsIDOMNode** aReturn)=0; NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn)=0; - NS_IMETHOD GetNamedItemNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMNode** aReturn)=0; + NS_IMETHOD GetNamedItemNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMNode** aReturn)=0; NS_IMETHOD SetNamedItemNS(nsIDOMNode* aArg, nsIDOMNode** aReturn)=0; - NS_IMETHOD RemoveNamedItemNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMNode** aReturn)=0; + NS_IMETHOD RemoveNamedItemNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMNode** aReturn)=0; }; #define NS_DECL_IDOMNAMEDNODEMAP \ NS_IMETHOD GetLength(PRUint32* aLength); \ - NS_IMETHOD GetNamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn); \ + NS_IMETHOD GetNamedItem(const nsString& aName, nsIDOMNode** aReturn); \ NS_IMETHOD SetNamedItem(nsIDOMNode* aArg, nsIDOMNode** aReturn); \ - NS_IMETHOD RemoveNamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn); \ + NS_IMETHOD RemoveNamedItem(const nsString& aName, nsIDOMNode** aReturn); \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn); \ - NS_IMETHOD GetNamedItemNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMNode** aReturn); \ + NS_IMETHOD GetNamedItemNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMNode** aReturn); \ NS_IMETHOD SetNamedItemNS(nsIDOMNode* aArg, nsIDOMNode** aReturn); \ - NS_IMETHOD RemoveNamedItemNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMNode** aReturn); \ + NS_IMETHOD RemoveNamedItemNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMNode** aReturn); \ #define NS_FORWARD_IDOMNAMEDNODEMAP(_to) \ NS_IMETHOD GetLength(PRUint32* aLength) { return _to GetLength(aLength); } \ - NS_IMETHOD GetNamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn) { return _to GetNamedItem(aName, aReturn); } \ + NS_IMETHOD GetNamedItem(const nsString& aName, nsIDOMNode** aReturn) { return _to GetNamedItem(aName, aReturn); } \ NS_IMETHOD SetNamedItem(nsIDOMNode* aArg, nsIDOMNode** aReturn) { return _to SetNamedItem(aArg, aReturn); } \ - NS_IMETHOD RemoveNamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn) { return _to RemoveNamedItem(aName, aReturn); } \ + NS_IMETHOD RemoveNamedItem(const nsString& aName, nsIDOMNode** aReturn) { return _to RemoveNamedItem(aName, aReturn); } \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn) { return _to Item(aIndex, aReturn); } \ - NS_IMETHOD GetNamedItemNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMNode** aReturn) { return _to GetNamedItemNS(aNamespaceURI, aLocalName, aReturn); } \ + NS_IMETHOD GetNamedItemNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMNode** aReturn) { return _to GetNamedItemNS(aNamespaceURI, aLocalName, aReturn); } \ NS_IMETHOD SetNamedItemNS(nsIDOMNode* aArg, nsIDOMNode** aReturn) { return _to SetNamedItemNS(aArg, aReturn); } \ - NS_IMETHOD RemoveNamedItemNS(const nsAReadableString& aNamespaceURI, const nsAReadableString& aLocalName, nsIDOMNode** aReturn) { return _to RemoveNamedItemNS(aNamespaceURI, aLocalName, aReturn); } \ + NS_IMETHOD RemoveNamedItemNS(const nsString& aNamespaceURI, const nsString& aLocalName, nsIDOMNode** aReturn) { return _to RemoveNamedItemNS(aNamespaceURI, aLocalName, aReturn); } \ extern "C" NS_DOM nsresult NS_InitNamedNodeMapClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreDom/nsIDOMNode.h b/dom/public/coreDom/nsIDOMNode.h index 6aa9a5f7292..ecd36d2a8a0 100644 --- a/dom/public/coreDom/nsIDOMNode.h +++ b/dom/public/coreDom/nsIDOMNode.h @@ -55,10 +55,10 @@ public: NOTATION_NODE = 12 }; - NS_IMETHOD GetNodeName(nsAWritableString& aNodeName)=0; + NS_IMETHOD GetNodeName(nsString& aNodeName)=0; - NS_IMETHOD GetNodeValue(nsAWritableString& aNodeValue)=0; - NS_IMETHOD SetNodeValue(const nsAReadableString& aNodeValue)=0; + NS_IMETHOD GetNodeValue(nsString& aNodeValue)=0; + NS_IMETHOD SetNodeValue(const nsString& aNodeValue)=0; NS_IMETHOD GetNodeType(PRUint16* aNodeType)=0; @@ -78,12 +78,12 @@ public: NS_IMETHOD GetOwnerDocument(nsIDOMDocument** aOwnerDocument)=0; - NS_IMETHOD GetNamespaceURI(nsAWritableString& aNamespaceURI)=0; + NS_IMETHOD GetNamespaceURI(nsString& aNamespaceURI)=0; - NS_IMETHOD GetPrefix(nsAWritableString& aPrefix)=0; - NS_IMETHOD SetPrefix(const nsAReadableString& aPrefix)=0; + NS_IMETHOD GetPrefix(nsString& aPrefix)=0; + NS_IMETHOD SetPrefix(const nsString& aPrefix)=0; - NS_IMETHOD GetLocalName(nsAWritableString& aLocalName)=0; + NS_IMETHOD GetLocalName(nsString& aLocalName)=0; NS_IMETHOD InsertBefore(nsIDOMNode* aNewChild, nsIDOMNode* aRefChild, nsIDOMNode** aReturn)=0; @@ -99,14 +99,14 @@ public: NS_IMETHOD Normalize()=0; - NS_IMETHOD Supports(const nsAReadableString& aFeature, const nsAReadableString& aVersion, PRBool* aReturn)=0; + NS_IMETHOD Supports(const nsString& aFeature, const nsString& aVersion, PRBool* aReturn)=0; }; #define NS_DECL_IDOMNODE \ - NS_IMETHOD GetNodeName(nsAWritableString& aNodeName); \ - NS_IMETHOD GetNodeValue(nsAWritableString& aNodeValue); \ - NS_IMETHOD SetNodeValue(const nsAReadableString& aNodeValue); \ + NS_IMETHOD GetNodeName(nsString& aNodeName); \ + NS_IMETHOD GetNodeValue(nsString& aNodeValue); \ + NS_IMETHOD SetNodeValue(const nsString& aNodeValue); \ NS_IMETHOD GetNodeType(PRUint16* aNodeType); \ NS_IMETHOD GetParentNode(nsIDOMNode** aParentNode); \ NS_IMETHOD GetChildNodes(nsIDOMNodeList** aChildNodes); \ @@ -116,10 +116,10 @@ public: NS_IMETHOD GetNextSibling(nsIDOMNode** aNextSibling); \ NS_IMETHOD GetAttributes(nsIDOMNamedNodeMap** aAttributes); \ NS_IMETHOD GetOwnerDocument(nsIDOMDocument** aOwnerDocument); \ - NS_IMETHOD GetNamespaceURI(nsAWritableString& aNamespaceURI); \ - NS_IMETHOD GetPrefix(nsAWritableString& aPrefix); \ - NS_IMETHOD SetPrefix(const nsAReadableString& aPrefix); \ - NS_IMETHOD GetLocalName(nsAWritableString& aLocalName); \ + NS_IMETHOD GetNamespaceURI(nsString& aNamespaceURI); \ + NS_IMETHOD GetPrefix(nsString& aPrefix); \ + NS_IMETHOD SetPrefix(const nsString& aPrefix); \ + NS_IMETHOD GetLocalName(nsString& aLocalName); \ NS_IMETHOD InsertBefore(nsIDOMNode* aNewChild, nsIDOMNode* aRefChild, nsIDOMNode** aReturn); \ NS_IMETHOD ReplaceChild(nsIDOMNode* aNewChild, nsIDOMNode* aOldChild, nsIDOMNode** aReturn); \ NS_IMETHOD RemoveChild(nsIDOMNode* aOldChild, nsIDOMNode** aReturn); \ @@ -127,14 +127,14 @@ public: NS_IMETHOD HasChildNodes(PRBool* aReturn); \ NS_IMETHOD CloneNode(PRBool aDeep, nsIDOMNode** aReturn); \ NS_IMETHOD Normalize(); \ - NS_IMETHOD Supports(const nsAReadableString& aFeature, const nsAReadableString& aVersion, PRBool* aReturn); \ + NS_IMETHOD Supports(const nsString& aFeature, const nsString& aVersion, PRBool* aReturn); \ #define NS_FORWARD_IDOMNODE(_to) \ - NS_IMETHOD GetNodeName(nsAWritableString& aNodeName) { return _to GetNodeName(aNodeName); } \ - NS_IMETHOD GetNodeValue(nsAWritableString& aNodeValue) { return _to GetNodeValue(aNodeValue); } \ - NS_IMETHOD SetNodeValue(const nsAReadableString& aNodeValue) { return _to SetNodeValue(aNodeValue); } \ + NS_IMETHOD GetNodeName(nsString& aNodeName) { return _to GetNodeName(aNodeName); } \ + NS_IMETHOD GetNodeValue(nsString& aNodeValue) { return _to GetNodeValue(aNodeValue); } \ + NS_IMETHOD SetNodeValue(const nsString& aNodeValue) { return _to SetNodeValue(aNodeValue); } \ NS_IMETHOD GetNodeType(PRUint16* aNodeType) { return _to GetNodeType(aNodeType); } \ NS_IMETHOD GetParentNode(nsIDOMNode** aParentNode) { return _to GetParentNode(aParentNode); } \ NS_IMETHOD GetChildNodes(nsIDOMNodeList** aChildNodes) { return _to GetChildNodes(aChildNodes); } \ @@ -144,10 +144,10 @@ public: NS_IMETHOD GetNextSibling(nsIDOMNode** aNextSibling) { return _to GetNextSibling(aNextSibling); } \ NS_IMETHOD GetAttributes(nsIDOMNamedNodeMap** aAttributes) { return _to GetAttributes(aAttributes); } \ NS_IMETHOD GetOwnerDocument(nsIDOMDocument** aOwnerDocument) { return _to GetOwnerDocument(aOwnerDocument); } \ - NS_IMETHOD GetNamespaceURI(nsAWritableString& aNamespaceURI) { return _to GetNamespaceURI(aNamespaceURI); } \ - NS_IMETHOD GetPrefix(nsAWritableString& aPrefix) { return _to GetPrefix(aPrefix); } \ - NS_IMETHOD SetPrefix(const nsAReadableString& aPrefix) { return _to SetPrefix(aPrefix); } \ - NS_IMETHOD GetLocalName(nsAWritableString& aLocalName) { return _to GetLocalName(aLocalName); } \ + NS_IMETHOD GetNamespaceURI(nsString& aNamespaceURI) { return _to GetNamespaceURI(aNamespaceURI); } \ + NS_IMETHOD GetPrefix(nsString& aPrefix) { return _to GetPrefix(aPrefix); } \ + NS_IMETHOD SetPrefix(const nsString& aPrefix) { return _to SetPrefix(aPrefix); } \ + NS_IMETHOD GetLocalName(nsString& aLocalName) { return _to GetLocalName(aLocalName); } \ NS_IMETHOD InsertBefore(nsIDOMNode* aNewChild, nsIDOMNode* aRefChild, nsIDOMNode** aReturn) { return _to InsertBefore(aNewChild, aRefChild, aReturn); } \ NS_IMETHOD ReplaceChild(nsIDOMNode* aNewChild, nsIDOMNode* aOldChild, nsIDOMNode** aReturn) { return _to ReplaceChild(aNewChild, aOldChild, aReturn); } \ NS_IMETHOD RemoveChild(nsIDOMNode* aOldChild, nsIDOMNode** aReturn) { return _to RemoveChild(aOldChild, aReturn); } \ @@ -155,7 +155,7 @@ public: NS_IMETHOD HasChildNodes(PRBool* aReturn) { return _to HasChildNodes(aReturn); } \ NS_IMETHOD CloneNode(PRBool aDeep, nsIDOMNode** aReturn) { return _to CloneNode(aDeep, aReturn); } \ NS_IMETHOD Normalize() { return _to Normalize(); } \ - NS_IMETHOD Supports(const nsAReadableString& aFeature, const nsAReadableString& aVersion, PRBool* aReturn) { return _to Supports(aFeature, aVersion, aReturn); } \ + NS_IMETHOD Supports(const nsString& aFeature, const nsString& aVersion, PRBool* aReturn) { return _to Supports(aFeature, aVersion, aReturn); } \ extern "C" NS_DOM nsresult NS_InitNodeClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreDom/nsIDOMNotation.h b/dom/public/coreDom/nsIDOMNotation.h index f86b14cd729..bbc19c0e6c3 100644 --- a/dom/public/coreDom/nsIDOMNotation.h +++ b/dom/public/coreDom/nsIDOMNotation.h @@ -38,21 +38,21 @@ class nsIDOMNotation : public nsIDOMNode { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMNOTATION_IID; return iid; } - NS_IMETHOD GetPublicId(nsAWritableString& aPublicId)=0; + NS_IMETHOD GetPublicId(nsString& aPublicId)=0; - NS_IMETHOD GetSystemId(nsAWritableString& aSystemId)=0; + NS_IMETHOD GetSystemId(nsString& aSystemId)=0; }; #define NS_DECL_IDOMNOTATION \ - NS_IMETHOD GetPublicId(nsAWritableString& aPublicId); \ - NS_IMETHOD GetSystemId(nsAWritableString& aSystemId); \ + NS_IMETHOD GetPublicId(nsString& aPublicId); \ + NS_IMETHOD GetSystemId(nsString& aSystemId); \ #define NS_FORWARD_IDOMNOTATION(_to) \ - NS_IMETHOD GetPublicId(nsAWritableString& aPublicId) { return _to GetPublicId(aPublicId); } \ - NS_IMETHOD GetSystemId(nsAWritableString& aSystemId) { return _to GetSystemId(aSystemId); } \ + NS_IMETHOD GetPublicId(nsString& aPublicId) { return _to GetPublicId(aPublicId); } \ + NS_IMETHOD GetSystemId(nsString& aSystemId) { return _to GetSystemId(aSystemId); } \ extern "C" NS_DOM nsresult NS_InitNotationClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreDom/nsIDOMProcessingInstruction.h b/dom/public/coreDom/nsIDOMProcessingInstruction.h index 97b36d734ce..e7be4076fdb 100644 --- a/dom/public/coreDom/nsIDOMProcessingInstruction.h +++ b/dom/public/coreDom/nsIDOMProcessingInstruction.h @@ -38,24 +38,24 @@ class nsIDOMProcessingInstruction : public nsIDOMNode { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMPROCESSINGINSTRUCTION_IID; return iid; } - NS_IMETHOD GetTarget(nsAWritableString& aTarget)=0; + NS_IMETHOD GetTarget(nsString& aTarget)=0; - NS_IMETHOD GetData(nsAWritableString& aData)=0; - NS_IMETHOD SetData(const nsAReadableString& aData)=0; + NS_IMETHOD GetData(nsString& aData)=0; + NS_IMETHOD SetData(const nsString& aData)=0; }; #define NS_DECL_IDOMPROCESSINGINSTRUCTION \ - NS_IMETHOD GetTarget(nsAWritableString& aTarget); \ - NS_IMETHOD GetData(nsAWritableString& aData); \ - NS_IMETHOD SetData(const nsAReadableString& aData); \ + NS_IMETHOD GetTarget(nsString& aTarget); \ + NS_IMETHOD GetData(nsString& aData); \ + NS_IMETHOD SetData(const nsString& aData); \ #define NS_FORWARD_IDOMPROCESSINGINSTRUCTION(_to) \ - NS_IMETHOD GetTarget(nsAWritableString& aTarget) { return _to GetTarget(aTarget); } \ - NS_IMETHOD GetData(nsAWritableString& aData) { return _to GetData(aData); } \ - NS_IMETHOD SetData(const nsAReadableString& aData) { return _to SetData(aData); } \ + NS_IMETHOD GetTarget(nsString& aTarget) { return _to GetTarget(aTarget); } \ + NS_IMETHOD GetData(nsString& aData) { return _to GetData(aData); } \ + NS_IMETHOD SetData(const nsString& aData) { return _to SetData(aData); } \ extern "C" NS_DOM nsresult NS_InitProcessingInstructionClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreDom/nsIDOMStyleSheet.h b/dom/public/coreDom/nsIDOMStyleSheet.h index 44b29b4eae6..d3163af64d2 100644 --- a/dom/public/coreDom/nsIDOMStyleSheet.h +++ b/dom/public/coreDom/nsIDOMStyleSheet.h @@ -40,7 +40,7 @@ class nsIDOMStyleSheet : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMSTYLESHEET_IID; return iid; } - NS_IMETHOD GetType(nsAWritableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; NS_IMETHOD GetDisabled(PRBool* aDisabled)=0; NS_IMETHOD SetDisabled(PRBool aDisabled)=0; @@ -49,34 +49,34 @@ public: NS_IMETHOD GetParentStyleSheet(nsIDOMStyleSheet** aParentStyleSheet)=0; - NS_IMETHOD GetHref(nsAWritableString& aHref)=0; + NS_IMETHOD GetHref(nsString& aHref)=0; - NS_IMETHOD GetTitle(nsAWritableString& aTitle)=0; + NS_IMETHOD GetTitle(nsString& aTitle)=0; NS_IMETHOD GetMedia(nsIDOMMediaList** aMedia)=0; }; #define NS_DECL_IDOMSTYLESHEET \ - NS_IMETHOD GetType(nsAWritableString& aType); \ + NS_IMETHOD GetType(nsString& aType); \ NS_IMETHOD GetDisabled(PRBool* aDisabled); \ NS_IMETHOD SetDisabled(PRBool aDisabled); \ NS_IMETHOD GetOwnerNode(nsIDOMNode** aOwnerNode); \ NS_IMETHOD GetParentStyleSheet(nsIDOMStyleSheet** aParentStyleSheet); \ - NS_IMETHOD GetHref(nsAWritableString& aHref); \ - NS_IMETHOD GetTitle(nsAWritableString& aTitle); \ + NS_IMETHOD GetHref(nsString& aHref); \ + NS_IMETHOD GetTitle(nsString& aTitle); \ NS_IMETHOD GetMedia(nsIDOMMediaList** aMedia); \ #define NS_FORWARD_IDOMSTYLESHEET(_to) \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ NS_IMETHOD GetDisabled(PRBool* aDisabled) { return _to GetDisabled(aDisabled); } \ NS_IMETHOD SetDisabled(PRBool aDisabled) { return _to SetDisabled(aDisabled); } \ NS_IMETHOD GetOwnerNode(nsIDOMNode** aOwnerNode) { return _to GetOwnerNode(aOwnerNode); } \ NS_IMETHOD GetParentStyleSheet(nsIDOMStyleSheet** aParentStyleSheet) { return _to GetParentStyleSheet(aParentStyleSheet); } \ - NS_IMETHOD GetHref(nsAWritableString& aHref) { return _to GetHref(aHref); } \ - NS_IMETHOD GetTitle(nsAWritableString& aTitle) { return _to GetTitle(aTitle); } \ + NS_IMETHOD GetHref(nsString& aHref) { return _to GetHref(aHref); } \ + NS_IMETHOD GetTitle(nsString& aTitle) { return _to GetTitle(aTitle); } \ NS_IMETHOD GetMedia(nsIDOMMediaList** aMedia) { return _to GetMedia(aMedia); } \ diff --git a/dom/public/coreEvents/nsIDOMEvent.h b/dom/public/coreEvents/nsIDOMEvent.h index cd40046fa62..aa2f12882cb 100644 --- a/dom/public/coreEvents/nsIDOMEvent.h +++ b/dom/public/coreEvents/nsIDOMEvent.h @@ -78,7 +78,7 @@ public: META_MASK = 8 }; - NS_IMETHOD GetType(nsAWritableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; NS_IMETHOD GetTarget(nsIDOMEventTarget** aTarget)=0; @@ -100,12 +100,12 @@ public: NS_IMETHOD PreventDefault()=0; - NS_IMETHOD InitEvent(const nsAReadableString& aEventTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg)=0; + NS_IMETHOD InitEvent(const nsString& aEventTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg)=0; }; #define NS_DECL_IDOMEVENT \ - NS_IMETHOD GetType(nsAWritableString& aType); \ + NS_IMETHOD GetType(nsString& aType); \ NS_IMETHOD GetTarget(nsIDOMEventTarget** aTarget); \ NS_IMETHOD GetCurrentTarget(nsIDOMEventTarget** aCurrentTarget); \ NS_IMETHOD GetEventPhase(PRUint16* aEventPhase); \ @@ -116,12 +116,12 @@ public: NS_IMETHOD PreventBubble(); \ NS_IMETHOD PreventCapture(); \ NS_IMETHOD PreventDefault(); \ - NS_IMETHOD InitEvent(const nsAReadableString& aEventTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg); \ + NS_IMETHOD InitEvent(const nsString& aEventTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg); \ #define NS_FORWARD_IDOMEVENT(_to) \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ NS_IMETHOD GetTarget(nsIDOMEventTarget** aTarget) { return _to GetTarget(aTarget); } \ NS_IMETHOD GetCurrentTarget(nsIDOMEventTarget** aCurrentTarget) { return _to GetCurrentTarget(aCurrentTarget); } \ NS_IMETHOD GetEventPhase(PRUint16* aEventPhase) { return _to GetEventPhase(aEventPhase); } \ @@ -132,7 +132,7 @@ public: NS_IMETHOD PreventBubble() { return _to PreventBubble(); } \ NS_IMETHOD PreventCapture() { return _to PreventCapture(); } \ NS_IMETHOD PreventDefault() { return _to PreventDefault(); } \ - NS_IMETHOD InitEvent(const nsAReadableString& aEventTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg) { return _to InitEvent(aEventTypeArg, aCanBubbleArg, aCancelableArg); } \ + NS_IMETHOD InitEvent(const nsString& aEventTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg) { return _to InitEvent(aEventTypeArg, aCanBubbleArg, aCancelableArg); } \ extern "C" NS_DOM nsresult NS_InitEventClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreEvents/nsIDOMEventTarget.h b/dom/public/coreEvents/nsIDOMEventTarget.h index 8a8a478d64a..f0b3fb3f167 100644 --- a/dom/public/coreEvents/nsIDOMEventTarget.h +++ b/dom/public/coreEvents/nsIDOMEventTarget.h @@ -39,24 +39,24 @@ class nsIDOMEventTarget : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMEVENTTARGET_IID; return iid; } - NS_IMETHOD AddEventListener(const nsAReadableString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture)=0; + NS_IMETHOD AddEventListener(const nsString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture)=0; - NS_IMETHOD RemoveEventListener(const nsAReadableString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture)=0; + NS_IMETHOD RemoveEventListener(const nsString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture)=0; NS_IMETHOD DispatchEvent(nsIDOMEvent* aEvt)=0; }; #define NS_DECL_IDOMEVENTTARGET \ - NS_IMETHOD AddEventListener(const nsAReadableString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture); \ - NS_IMETHOD RemoveEventListener(const nsAReadableString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture); \ + NS_IMETHOD AddEventListener(const nsString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture); \ + NS_IMETHOD RemoveEventListener(const nsString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture); \ NS_IMETHOD DispatchEvent(nsIDOMEvent* aEvt); \ #define NS_FORWARD_IDOMEVENTTARGET(_to) \ - NS_IMETHOD AddEventListener(const nsAReadableString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture) { return _to AddEventListener(aType, aListener, aUseCapture); } \ - NS_IMETHOD RemoveEventListener(const nsAReadableString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture) { return _to RemoveEventListener(aType, aListener, aUseCapture); } \ + NS_IMETHOD AddEventListener(const nsString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture) { return _to AddEventListener(aType, aListener, aUseCapture); } \ + NS_IMETHOD RemoveEventListener(const nsString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture) { return _to RemoveEventListener(aType, aListener, aUseCapture); } \ NS_IMETHOD DispatchEvent(nsIDOMEvent* aEvt) { return _to DispatchEvent(aEvt); } \ diff --git a/dom/public/coreEvents/nsIDOMKeyEvent.h b/dom/public/coreEvents/nsIDOMKeyEvent.h index e5b3e770158..d282623f201 100644 --- a/dom/public/coreEvents/nsIDOMKeyEvent.h +++ b/dom/public/coreEvents/nsIDOMKeyEvent.h @@ -165,7 +165,7 @@ public: NS_IMETHOD GetMetaKey(PRBool* aMetaKey)=0; - NS_IMETHOD InitKeyEvent(const nsAReadableString& aTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg, PRBool aCtrlKeyArg, PRBool aAltKeyArg, PRBool aShiftKeyArg, PRBool aMetaKeyArg, PRUint32 aKeyCodeArg, PRUint32 aCharCodeArg, nsIDOMAbstractView* aViewArg)=0; + NS_IMETHOD InitKeyEvent(const nsString& aTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg, PRBool aCtrlKeyArg, PRBool aAltKeyArg, PRBool aShiftKeyArg, PRBool aMetaKeyArg, PRUint32 aKeyCodeArg, PRUint32 aCharCodeArg, nsIDOMAbstractView* aViewArg)=0; }; @@ -176,7 +176,7 @@ public: NS_IMETHOD GetCtrlKey(PRBool* aCtrlKey); \ NS_IMETHOD GetShiftKey(PRBool* aShiftKey); \ NS_IMETHOD GetMetaKey(PRBool* aMetaKey); \ - NS_IMETHOD InitKeyEvent(const nsAReadableString& aTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg, PRBool aCtrlKeyArg, PRBool aAltKeyArg, PRBool aShiftKeyArg, PRBool aMetaKeyArg, PRUint32 aKeyCodeArg, PRUint32 aCharCodeArg, nsIDOMAbstractView* aViewArg); \ + NS_IMETHOD InitKeyEvent(const nsString& aTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg, PRBool aCtrlKeyArg, PRBool aAltKeyArg, PRBool aShiftKeyArg, PRBool aMetaKeyArg, PRUint32 aKeyCodeArg, PRUint32 aCharCodeArg, nsIDOMAbstractView* aViewArg); \ @@ -187,7 +187,7 @@ public: NS_IMETHOD GetCtrlKey(PRBool* aCtrlKey) { return _to GetCtrlKey(aCtrlKey); } \ NS_IMETHOD GetShiftKey(PRBool* aShiftKey) { return _to GetShiftKey(aShiftKey); } \ NS_IMETHOD GetMetaKey(PRBool* aMetaKey) { return _to GetMetaKey(aMetaKey); } \ - NS_IMETHOD InitKeyEvent(const nsAReadableString& aTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg, PRBool aCtrlKeyArg, PRBool aAltKeyArg, PRBool aShiftKeyArg, PRBool aMetaKeyArg, PRUint32 aKeyCodeArg, PRUint32 aCharCodeArg, nsIDOMAbstractView* aViewArg) { return _to InitKeyEvent(aTypeArg, aCanBubbleArg, aCancelableArg, aCtrlKeyArg, aAltKeyArg, aShiftKeyArg, aMetaKeyArg, aKeyCodeArg, aCharCodeArg, aViewArg); } \ + NS_IMETHOD InitKeyEvent(const nsString& aTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg, PRBool aCtrlKeyArg, PRBool aAltKeyArg, PRBool aShiftKeyArg, PRBool aMetaKeyArg, PRUint32 aKeyCodeArg, PRUint32 aCharCodeArg, nsIDOMAbstractView* aViewArg) { return _to InitKeyEvent(aTypeArg, aCanBubbleArg, aCancelableArg, aCtrlKeyArg, aAltKeyArg, aShiftKeyArg, aMetaKeyArg, aKeyCodeArg, aCharCodeArg, aViewArg); } \ extern "C" NS_DOM nsresult NS_InitKeyEventClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/coreEvents/nsIDOMMouseEvent.h b/dom/public/coreEvents/nsIDOMMouseEvent.h index 1084038b509..5b6d8056155 100644 --- a/dom/public/coreEvents/nsIDOMMouseEvent.h +++ b/dom/public/coreEvents/nsIDOMMouseEvent.h @@ -59,7 +59,7 @@ public: NS_IMETHOD GetRelatedTarget(nsIDOMEventTarget** aRelatedTarget)=0; - NS_IMETHOD InitMouseEvent(const nsAReadableString& aTypeArg, PRBool aCtrlKeyArg, PRBool aAltKeyArg, PRBool aShiftKeyArg, PRBool aMetaKeyArg, PRInt32 aScreenXArg, PRInt32 aScreenYArg, PRInt32 aClientXArg, PRInt32 aClientYArg, PRUint16 aButtonArg, PRUint16 aDetailArg)=0; + NS_IMETHOD InitMouseEvent(const nsString& aTypeArg, PRBool aCtrlKeyArg, PRBool aAltKeyArg, PRBool aShiftKeyArg, PRBool aMetaKeyArg, PRInt32 aScreenXArg, PRInt32 aScreenYArg, PRInt32 aClientXArg, PRInt32 aClientYArg, PRUint16 aButtonArg, PRUint16 aDetailArg)=0; }; @@ -74,7 +74,7 @@ public: NS_IMETHOD GetMetaKey(PRBool* aMetaKey); \ NS_IMETHOD GetButton(PRUint16* aButton); \ NS_IMETHOD GetRelatedTarget(nsIDOMEventTarget** aRelatedTarget); \ - NS_IMETHOD InitMouseEvent(const nsAReadableString& aTypeArg, PRBool aCtrlKeyArg, PRBool aAltKeyArg, PRBool aShiftKeyArg, PRBool aMetaKeyArg, PRInt32 aScreenXArg, PRInt32 aScreenYArg, PRInt32 aClientXArg, PRInt32 aClientYArg, PRUint16 aButtonArg, PRUint16 aDetailArg); \ + NS_IMETHOD InitMouseEvent(const nsString& aTypeArg, PRBool aCtrlKeyArg, PRBool aAltKeyArg, PRBool aShiftKeyArg, PRBool aMetaKeyArg, PRInt32 aScreenXArg, PRInt32 aScreenYArg, PRInt32 aClientXArg, PRInt32 aClientYArg, PRUint16 aButtonArg, PRUint16 aDetailArg); \ @@ -89,7 +89,7 @@ public: NS_IMETHOD GetMetaKey(PRBool* aMetaKey) { return _to GetMetaKey(aMetaKey); } \ NS_IMETHOD GetButton(PRUint16* aButton) { return _to GetButton(aButton); } \ NS_IMETHOD GetRelatedTarget(nsIDOMEventTarget** aRelatedTarget) { return _to GetRelatedTarget(aRelatedTarget); } \ - NS_IMETHOD InitMouseEvent(const nsAReadableString& aTypeArg, PRBool aCtrlKeyArg, PRBool aAltKeyArg, PRBool aShiftKeyArg, PRBool aMetaKeyArg, PRInt32 aScreenXArg, PRInt32 aScreenYArg, PRInt32 aClientXArg, PRInt32 aClientYArg, PRUint16 aButtonArg, PRUint16 aDetailArg) { return _to InitMouseEvent(aTypeArg, aCtrlKeyArg, aAltKeyArg, aShiftKeyArg, aMetaKeyArg, aScreenXArg, aScreenYArg, aClientXArg, aClientYArg, aButtonArg, aDetailArg); } \ + NS_IMETHOD InitMouseEvent(const nsString& aTypeArg, PRBool aCtrlKeyArg, PRBool aAltKeyArg, PRBool aShiftKeyArg, PRBool aMetaKeyArg, PRInt32 aScreenXArg, PRInt32 aScreenYArg, PRInt32 aClientXArg, PRInt32 aClientYArg, PRUint16 aButtonArg, PRUint16 aDetailArg) { return _to InitMouseEvent(aTypeArg, aCtrlKeyArg, aAltKeyArg, aShiftKeyArg, aMetaKeyArg, aScreenXArg, aScreenYArg, aClientXArg, aClientYArg, aButtonArg, aDetailArg); } \ #endif // nsIDOMMouseEvent_h__ diff --git a/dom/public/coreEvents/nsIDOMUIEvent.h b/dom/public/coreEvents/nsIDOMUIEvent.h index ecfa07deb15..1cf42ed1e1c 100644 --- a/dom/public/coreEvents/nsIDOMUIEvent.h +++ b/dom/public/coreEvents/nsIDOMUIEvent.h @@ -43,21 +43,21 @@ public: NS_IMETHOD GetDetail(PRInt32* aDetail)=0; - NS_IMETHOD InitUIEvent(const nsAReadableString& aTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg, nsIDOMAbstractView* aViewArg, PRInt32 aDetailArg)=0; + NS_IMETHOD InitUIEvent(const nsString& aTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg, nsIDOMAbstractView* aViewArg, PRInt32 aDetailArg)=0; }; #define NS_DECL_IDOMUIEVENT \ NS_IMETHOD GetView(nsIDOMAbstractView** aView); \ NS_IMETHOD GetDetail(PRInt32* aDetail); \ - NS_IMETHOD InitUIEvent(const nsAReadableString& aTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg, nsIDOMAbstractView* aViewArg, PRInt32 aDetailArg); \ + NS_IMETHOD InitUIEvent(const nsString& aTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg, nsIDOMAbstractView* aViewArg, PRInt32 aDetailArg); \ #define NS_FORWARD_IDOMUIEVENT(_to) \ NS_IMETHOD GetView(nsIDOMAbstractView** aView) { return _to GetView(aView); } \ NS_IMETHOD GetDetail(PRInt32* aDetail) { return _to GetDetail(aDetail); } \ - NS_IMETHOD InitUIEvent(const nsAReadableString& aTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg, nsIDOMAbstractView* aViewArg, PRInt32 aDetailArg) { return _to InitUIEvent(aTypeArg, aCanBubbleArg, aCancelableArg, aViewArg, aDetailArg); } \ + NS_IMETHOD InitUIEvent(const nsString& aTypeArg, PRBool aCanBubbleArg, PRBool aCancelableArg, nsIDOMAbstractView* aViewArg, PRInt32 aDetailArg) { return _to InitUIEvent(aTypeArg, aCanBubbleArg, aCancelableArg, aViewArg, aDetailArg); } \ extern "C" NS_DOM nsresult NS_InitUIEventClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/css/nsIDOMCSS2Properties.h b/dom/public/css/nsIDOMCSS2Properties.h index 699021668f7..e490750d5a8 100644 --- a/dom/public/css/nsIDOMCSS2Properties.h +++ b/dom/public/css/nsIDOMCSS2Properties.h @@ -38,881 +38,881 @@ class nsIDOMCSS2Properties : public nsIDOMCSSStyleDeclaration { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSS2PROPERTIES_IID; return iid; } - NS_IMETHOD GetAzimuth(nsAWritableString& aAzimuth)=0; - NS_IMETHOD SetAzimuth(const nsAReadableString& aAzimuth)=0; + NS_IMETHOD GetAzimuth(nsString& aAzimuth)=0; + NS_IMETHOD SetAzimuth(const nsString& aAzimuth)=0; - NS_IMETHOD GetBackground(nsAWritableString& aBackground)=0; - NS_IMETHOD SetBackground(const nsAReadableString& aBackground)=0; + NS_IMETHOD GetBackground(nsString& aBackground)=0; + NS_IMETHOD SetBackground(const nsString& aBackground)=0; - NS_IMETHOD GetBackgroundAttachment(nsAWritableString& aBackgroundAttachment)=0; - NS_IMETHOD SetBackgroundAttachment(const nsAReadableString& aBackgroundAttachment)=0; + NS_IMETHOD GetBackgroundAttachment(nsString& aBackgroundAttachment)=0; + NS_IMETHOD SetBackgroundAttachment(const nsString& aBackgroundAttachment)=0; - NS_IMETHOD GetBackgroundColor(nsAWritableString& aBackgroundColor)=0; - NS_IMETHOD SetBackgroundColor(const nsAReadableString& aBackgroundColor)=0; + NS_IMETHOD GetBackgroundColor(nsString& aBackgroundColor)=0; + NS_IMETHOD SetBackgroundColor(const nsString& aBackgroundColor)=0; - NS_IMETHOD GetBackgroundImage(nsAWritableString& aBackgroundImage)=0; - NS_IMETHOD SetBackgroundImage(const nsAReadableString& aBackgroundImage)=0; + NS_IMETHOD GetBackgroundImage(nsString& aBackgroundImage)=0; + NS_IMETHOD SetBackgroundImage(const nsString& aBackgroundImage)=0; - NS_IMETHOD GetBackgroundPosition(nsAWritableString& aBackgroundPosition)=0; - NS_IMETHOD SetBackgroundPosition(const nsAReadableString& aBackgroundPosition)=0; + NS_IMETHOD GetBackgroundPosition(nsString& aBackgroundPosition)=0; + NS_IMETHOD SetBackgroundPosition(const nsString& aBackgroundPosition)=0; - NS_IMETHOD GetBackgroundRepeat(nsAWritableString& aBackgroundRepeat)=0; - NS_IMETHOD SetBackgroundRepeat(const nsAReadableString& aBackgroundRepeat)=0; + NS_IMETHOD GetBackgroundRepeat(nsString& aBackgroundRepeat)=0; + NS_IMETHOD SetBackgroundRepeat(const nsString& aBackgroundRepeat)=0; - NS_IMETHOD GetBorder(nsAWritableString& aBorder)=0; - NS_IMETHOD SetBorder(const nsAReadableString& aBorder)=0; + NS_IMETHOD GetBorder(nsString& aBorder)=0; + NS_IMETHOD SetBorder(const nsString& aBorder)=0; - NS_IMETHOD GetBorderCollapse(nsAWritableString& aBorderCollapse)=0; - NS_IMETHOD SetBorderCollapse(const nsAReadableString& aBorderCollapse)=0; + NS_IMETHOD GetBorderCollapse(nsString& aBorderCollapse)=0; + NS_IMETHOD SetBorderCollapse(const nsString& aBorderCollapse)=0; - NS_IMETHOD GetBorderColor(nsAWritableString& aBorderColor)=0; - NS_IMETHOD SetBorderColor(const nsAReadableString& aBorderColor)=0; + NS_IMETHOD GetBorderColor(nsString& aBorderColor)=0; + NS_IMETHOD SetBorderColor(const nsString& aBorderColor)=0; - NS_IMETHOD GetBorderSpacing(nsAWritableString& aBorderSpacing)=0; - NS_IMETHOD SetBorderSpacing(const nsAReadableString& aBorderSpacing)=0; + NS_IMETHOD GetBorderSpacing(nsString& aBorderSpacing)=0; + NS_IMETHOD SetBorderSpacing(const nsString& aBorderSpacing)=0; - NS_IMETHOD GetBorderStyle(nsAWritableString& aBorderStyle)=0; - NS_IMETHOD SetBorderStyle(const nsAReadableString& aBorderStyle)=0; + NS_IMETHOD GetBorderStyle(nsString& aBorderStyle)=0; + NS_IMETHOD SetBorderStyle(const nsString& aBorderStyle)=0; - NS_IMETHOD GetBorderTop(nsAWritableString& aBorderTop)=0; - NS_IMETHOD SetBorderTop(const nsAReadableString& aBorderTop)=0; + NS_IMETHOD GetBorderTop(nsString& aBorderTop)=0; + NS_IMETHOD SetBorderTop(const nsString& aBorderTop)=0; - NS_IMETHOD GetBorderRight(nsAWritableString& aBorderRight)=0; - NS_IMETHOD SetBorderRight(const nsAReadableString& aBorderRight)=0; + NS_IMETHOD GetBorderRight(nsString& aBorderRight)=0; + NS_IMETHOD SetBorderRight(const nsString& aBorderRight)=0; - NS_IMETHOD GetBorderBottom(nsAWritableString& aBorderBottom)=0; - NS_IMETHOD SetBorderBottom(const nsAReadableString& aBorderBottom)=0; + NS_IMETHOD GetBorderBottom(nsString& aBorderBottom)=0; + NS_IMETHOD SetBorderBottom(const nsString& aBorderBottom)=0; - NS_IMETHOD GetBorderLeft(nsAWritableString& aBorderLeft)=0; - NS_IMETHOD SetBorderLeft(const nsAReadableString& aBorderLeft)=0; + NS_IMETHOD GetBorderLeft(nsString& aBorderLeft)=0; + NS_IMETHOD SetBorderLeft(const nsString& aBorderLeft)=0; - NS_IMETHOD GetBorderTopColor(nsAWritableString& aBorderTopColor)=0; - NS_IMETHOD SetBorderTopColor(const nsAReadableString& aBorderTopColor)=0; + NS_IMETHOD GetBorderTopColor(nsString& aBorderTopColor)=0; + NS_IMETHOD SetBorderTopColor(const nsString& aBorderTopColor)=0; - NS_IMETHOD GetBorderRightColor(nsAWritableString& aBorderRightColor)=0; - NS_IMETHOD SetBorderRightColor(const nsAReadableString& aBorderRightColor)=0; + NS_IMETHOD GetBorderRightColor(nsString& aBorderRightColor)=0; + NS_IMETHOD SetBorderRightColor(const nsString& aBorderRightColor)=0; - NS_IMETHOD GetBorderBottomColor(nsAWritableString& aBorderBottomColor)=0; - NS_IMETHOD SetBorderBottomColor(const nsAReadableString& aBorderBottomColor)=0; + NS_IMETHOD GetBorderBottomColor(nsString& aBorderBottomColor)=0; + NS_IMETHOD SetBorderBottomColor(const nsString& aBorderBottomColor)=0; - NS_IMETHOD GetBorderLeftColor(nsAWritableString& aBorderLeftColor)=0; - NS_IMETHOD SetBorderLeftColor(const nsAReadableString& aBorderLeftColor)=0; + NS_IMETHOD GetBorderLeftColor(nsString& aBorderLeftColor)=0; + NS_IMETHOD SetBorderLeftColor(const nsString& aBorderLeftColor)=0; - NS_IMETHOD GetBorderTopStyle(nsAWritableString& aBorderTopStyle)=0; - NS_IMETHOD SetBorderTopStyle(const nsAReadableString& aBorderTopStyle)=0; + NS_IMETHOD GetBorderTopStyle(nsString& aBorderTopStyle)=0; + NS_IMETHOD SetBorderTopStyle(const nsString& aBorderTopStyle)=0; - NS_IMETHOD GetBorderRightStyle(nsAWritableString& aBorderRightStyle)=0; - NS_IMETHOD SetBorderRightStyle(const nsAReadableString& aBorderRightStyle)=0; + NS_IMETHOD GetBorderRightStyle(nsString& aBorderRightStyle)=0; + NS_IMETHOD SetBorderRightStyle(const nsString& aBorderRightStyle)=0; - NS_IMETHOD GetBorderBottomStyle(nsAWritableString& aBorderBottomStyle)=0; - NS_IMETHOD SetBorderBottomStyle(const nsAReadableString& aBorderBottomStyle)=0; + NS_IMETHOD GetBorderBottomStyle(nsString& aBorderBottomStyle)=0; + NS_IMETHOD SetBorderBottomStyle(const nsString& aBorderBottomStyle)=0; - NS_IMETHOD GetBorderLeftStyle(nsAWritableString& aBorderLeftStyle)=0; - NS_IMETHOD SetBorderLeftStyle(const nsAReadableString& aBorderLeftStyle)=0; + NS_IMETHOD GetBorderLeftStyle(nsString& aBorderLeftStyle)=0; + NS_IMETHOD SetBorderLeftStyle(const nsString& aBorderLeftStyle)=0; - NS_IMETHOD GetBorderTopWidth(nsAWritableString& aBorderTopWidth)=0; - NS_IMETHOD SetBorderTopWidth(const nsAReadableString& aBorderTopWidth)=0; + NS_IMETHOD GetBorderTopWidth(nsString& aBorderTopWidth)=0; + NS_IMETHOD SetBorderTopWidth(const nsString& aBorderTopWidth)=0; - NS_IMETHOD GetBorderRightWidth(nsAWritableString& aBorderRightWidth)=0; - NS_IMETHOD SetBorderRightWidth(const nsAReadableString& aBorderRightWidth)=0; + NS_IMETHOD GetBorderRightWidth(nsString& aBorderRightWidth)=0; + NS_IMETHOD SetBorderRightWidth(const nsString& aBorderRightWidth)=0; - NS_IMETHOD GetBorderBottomWidth(nsAWritableString& aBorderBottomWidth)=0; - NS_IMETHOD SetBorderBottomWidth(const nsAReadableString& aBorderBottomWidth)=0; + NS_IMETHOD GetBorderBottomWidth(nsString& aBorderBottomWidth)=0; + NS_IMETHOD SetBorderBottomWidth(const nsString& aBorderBottomWidth)=0; - NS_IMETHOD GetBorderLeftWidth(nsAWritableString& aBorderLeftWidth)=0; - NS_IMETHOD SetBorderLeftWidth(const nsAReadableString& aBorderLeftWidth)=0; + NS_IMETHOD GetBorderLeftWidth(nsString& aBorderLeftWidth)=0; + NS_IMETHOD SetBorderLeftWidth(const nsString& aBorderLeftWidth)=0; - NS_IMETHOD GetBorderWidth(nsAWritableString& aBorderWidth)=0; - NS_IMETHOD SetBorderWidth(const nsAReadableString& aBorderWidth)=0; + NS_IMETHOD GetBorderWidth(nsString& aBorderWidth)=0; + NS_IMETHOD SetBorderWidth(const nsString& aBorderWidth)=0; - NS_IMETHOD GetBottom(nsAWritableString& aBottom)=0; - NS_IMETHOD SetBottom(const nsAReadableString& aBottom)=0; + NS_IMETHOD GetBottom(nsString& aBottom)=0; + NS_IMETHOD SetBottom(const nsString& aBottom)=0; - NS_IMETHOD GetCaptionSide(nsAWritableString& aCaptionSide)=0; - NS_IMETHOD SetCaptionSide(const nsAReadableString& aCaptionSide)=0; + NS_IMETHOD GetCaptionSide(nsString& aCaptionSide)=0; + NS_IMETHOD SetCaptionSide(const nsString& aCaptionSide)=0; - NS_IMETHOD GetClear(nsAWritableString& aClear)=0; - NS_IMETHOD SetClear(const nsAReadableString& aClear)=0; + NS_IMETHOD GetClear(nsString& aClear)=0; + NS_IMETHOD SetClear(const nsString& aClear)=0; - NS_IMETHOD GetClip(nsAWritableString& aClip)=0; - NS_IMETHOD SetClip(const nsAReadableString& aClip)=0; + NS_IMETHOD GetClip(nsString& aClip)=0; + NS_IMETHOD SetClip(const nsString& aClip)=0; - NS_IMETHOD GetColor(nsAWritableString& aColor)=0; - NS_IMETHOD SetColor(const nsAReadableString& aColor)=0; + NS_IMETHOD GetColor(nsString& aColor)=0; + NS_IMETHOD SetColor(const nsString& aColor)=0; - NS_IMETHOD GetContent(nsAWritableString& aContent)=0; - NS_IMETHOD SetContent(const nsAReadableString& aContent)=0; + NS_IMETHOD GetContent(nsString& aContent)=0; + NS_IMETHOD SetContent(const nsString& aContent)=0; - NS_IMETHOD GetCounterIncrement(nsAWritableString& aCounterIncrement)=0; - NS_IMETHOD SetCounterIncrement(const nsAReadableString& aCounterIncrement)=0; + NS_IMETHOD GetCounterIncrement(nsString& aCounterIncrement)=0; + NS_IMETHOD SetCounterIncrement(const nsString& aCounterIncrement)=0; - NS_IMETHOD GetCounterReset(nsAWritableString& aCounterReset)=0; - NS_IMETHOD SetCounterReset(const nsAReadableString& aCounterReset)=0; + NS_IMETHOD GetCounterReset(nsString& aCounterReset)=0; + NS_IMETHOD SetCounterReset(const nsString& aCounterReset)=0; - NS_IMETHOD GetCue(nsAWritableString& aCue)=0; - NS_IMETHOD SetCue(const nsAReadableString& aCue)=0; + NS_IMETHOD GetCue(nsString& aCue)=0; + NS_IMETHOD SetCue(const nsString& aCue)=0; - NS_IMETHOD GetCueAfter(nsAWritableString& aCueAfter)=0; - NS_IMETHOD SetCueAfter(const nsAReadableString& aCueAfter)=0; + NS_IMETHOD GetCueAfter(nsString& aCueAfter)=0; + NS_IMETHOD SetCueAfter(const nsString& aCueAfter)=0; - NS_IMETHOD GetCueBefore(nsAWritableString& aCueBefore)=0; - NS_IMETHOD SetCueBefore(const nsAReadableString& aCueBefore)=0; + NS_IMETHOD GetCueBefore(nsString& aCueBefore)=0; + NS_IMETHOD SetCueBefore(const nsString& aCueBefore)=0; - NS_IMETHOD GetCursor(nsAWritableString& aCursor)=0; - NS_IMETHOD SetCursor(const nsAReadableString& aCursor)=0; + NS_IMETHOD GetCursor(nsString& aCursor)=0; + NS_IMETHOD SetCursor(const nsString& aCursor)=0; - NS_IMETHOD GetDirection(nsAWritableString& aDirection)=0; - NS_IMETHOD SetDirection(const nsAReadableString& aDirection)=0; + NS_IMETHOD GetDirection(nsString& aDirection)=0; + NS_IMETHOD SetDirection(const nsString& aDirection)=0; - NS_IMETHOD GetDisplay(nsAWritableString& aDisplay)=0; - NS_IMETHOD SetDisplay(const nsAReadableString& aDisplay)=0; + NS_IMETHOD GetDisplay(nsString& aDisplay)=0; + NS_IMETHOD SetDisplay(const nsString& aDisplay)=0; - NS_IMETHOD GetElevation(nsAWritableString& aElevation)=0; - NS_IMETHOD SetElevation(const nsAReadableString& aElevation)=0; + NS_IMETHOD GetElevation(nsString& aElevation)=0; + NS_IMETHOD SetElevation(const nsString& aElevation)=0; - NS_IMETHOD GetEmptyCells(nsAWritableString& aEmptyCells)=0; - NS_IMETHOD SetEmptyCells(const nsAReadableString& aEmptyCells)=0; + NS_IMETHOD GetEmptyCells(nsString& aEmptyCells)=0; + NS_IMETHOD SetEmptyCells(const nsString& aEmptyCells)=0; - NS_IMETHOD GetCssFloat(nsAWritableString& aCssFloat)=0; - NS_IMETHOD SetCssFloat(const nsAReadableString& aCssFloat)=0; + NS_IMETHOD GetCssFloat(nsString& aCssFloat)=0; + NS_IMETHOD SetCssFloat(const nsString& aCssFloat)=0; - NS_IMETHOD GetFont(nsAWritableString& aFont)=0; - NS_IMETHOD SetFont(const nsAReadableString& aFont)=0; + NS_IMETHOD GetFont(nsString& aFont)=0; + NS_IMETHOD SetFont(const nsString& aFont)=0; - NS_IMETHOD GetFontFamily(nsAWritableString& aFontFamily)=0; - NS_IMETHOD SetFontFamily(const nsAReadableString& aFontFamily)=0; + NS_IMETHOD GetFontFamily(nsString& aFontFamily)=0; + NS_IMETHOD SetFontFamily(const nsString& aFontFamily)=0; - NS_IMETHOD GetFontSize(nsAWritableString& aFontSize)=0; - NS_IMETHOD SetFontSize(const nsAReadableString& aFontSize)=0; + NS_IMETHOD GetFontSize(nsString& aFontSize)=0; + NS_IMETHOD SetFontSize(const nsString& aFontSize)=0; - NS_IMETHOD GetFontSizeAdjust(nsAWritableString& aFontSizeAdjust)=0; - NS_IMETHOD SetFontSizeAdjust(const nsAReadableString& aFontSizeAdjust)=0; + NS_IMETHOD GetFontSizeAdjust(nsString& aFontSizeAdjust)=0; + NS_IMETHOD SetFontSizeAdjust(const nsString& aFontSizeAdjust)=0; - NS_IMETHOD GetFontStretch(nsAWritableString& aFontStretch)=0; - NS_IMETHOD SetFontStretch(const nsAReadableString& aFontStretch)=0; + NS_IMETHOD GetFontStretch(nsString& aFontStretch)=0; + NS_IMETHOD SetFontStretch(const nsString& aFontStretch)=0; - NS_IMETHOD GetFontStyle(nsAWritableString& aFontStyle)=0; - NS_IMETHOD SetFontStyle(const nsAReadableString& aFontStyle)=0; + NS_IMETHOD GetFontStyle(nsString& aFontStyle)=0; + NS_IMETHOD SetFontStyle(const nsString& aFontStyle)=0; - NS_IMETHOD GetFontVariant(nsAWritableString& aFontVariant)=0; - NS_IMETHOD SetFontVariant(const nsAReadableString& aFontVariant)=0; + NS_IMETHOD GetFontVariant(nsString& aFontVariant)=0; + NS_IMETHOD SetFontVariant(const nsString& aFontVariant)=0; - NS_IMETHOD GetFontWeight(nsAWritableString& aFontWeight)=0; - NS_IMETHOD SetFontWeight(const nsAReadableString& aFontWeight)=0; + NS_IMETHOD GetFontWeight(nsString& aFontWeight)=0; + NS_IMETHOD SetFontWeight(const nsString& aFontWeight)=0; - NS_IMETHOD GetHeight(nsAWritableString& aHeight)=0; - NS_IMETHOD SetHeight(const nsAReadableString& aHeight)=0; + NS_IMETHOD GetHeight(nsString& aHeight)=0; + NS_IMETHOD SetHeight(const nsString& aHeight)=0; - NS_IMETHOD GetLeft(nsAWritableString& aLeft)=0; - NS_IMETHOD SetLeft(const nsAReadableString& aLeft)=0; + NS_IMETHOD GetLeft(nsString& aLeft)=0; + NS_IMETHOD SetLeft(const nsString& aLeft)=0; - NS_IMETHOD GetLetterSpacing(nsAWritableString& aLetterSpacing)=0; - NS_IMETHOD SetLetterSpacing(const nsAReadableString& aLetterSpacing)=0; + NS_IMETHOD GetLetterSpacing(nsString& aLetterSpacing)=0; + NS_IMETHOD SetLetterSpacing(const nsString& aLetterSpacing)=0; - NS_IMETHOD GetLineHeight(nsAWritableString& aLineHeight)=0; - NS_IMETHOD SetLineHeight(const nsAReadableString& aLineHeight)=0; + NS_IMETHOD GetLineHeight(nsString& aLineHeight)=0; + NS_IMETHOD SetLineHeight(const nsString& aLineHeight)=0; - NS_IMETHOD GetListStyle(nsAWritableString& aListStyle)=0; - NS_IMETHOD SetListStyle(const nsAReadableString& aListStyle)=0; + NS_IMETHOD GetListStyle(nsString& aListStyle)=0; + NS_IMETHOD SetListStyle(const nsString& aListStyle)=0; - NS_IMETHOD GetListStyleImage(nsAWritableString& aListStyleImage)=0; - NS_IMETHOD SetListStyleImage(const nsAReadableString& aListStyleImage)=0; + NS_IMETHOD GetListStyleImage(nsString& aListStyleImage)=0; + NS_IMETHOD SetListStyleImage(const nsString& aListStyleImage)=0; - NS_IMETHOD GetListStylePosition(nsAWritableString& aListStylePosition)=0; - NS_IMETHOD SetListStylePosition(const nsAReadableString& aListStylePosition)=0; + NS_IMETHOD GetListStylePosition(nsString& aListStylePosition)=0; + NS_IMETHOD SetListStylePosition(const nsString& aListStylePosition)=0; - NS_IMETHOD GetListStyleType(nsAWritableString& aListStyleType)=0; - NS_IMETHOD SetListStyleType(const nsAReadableString& aListStyleType)=0; + NS_IMETHOD GetListStyleType(nsString& aListStyleType)=0; + NS_IMETHOD SetListStyleType(const nsString& aListStyleType)=0; - NS_IMETHOD GetMargin(nsAWritableString& aMargin)=0; - NS_IMETHOD SetMargin(const nsAReadableString& aMargin)=0; + NS_IMETHOD GetMargin(nsString& aMargin)=0; + NS_IMETHOD SetMargin(const nsString& aMargin)=0; - NS_IMETHOD GetMarginTop(nsAWritableString& aMarginTop)=0; - NS_IMETHOD SetMarginTop(const nsAReadableString& aMarginTop)=0; + NS_IMETHOD GetMarginTop(nsString& aMarginTop)=0; + NS_IMETHOD SetMarginTop(const nsString& aMarginTop)=0; - NS_IMETHOD GetMarginRight(nsAWritableString& aMarginRight)=0; - NS_IMETHOD SetMarginRight(const nsAReadableString& aMarginRight)=0; + NS_IMETHOD GetMarginRight(nsString& aMarginRight)=0; + NS_IMETHOD SetMarginRight(const nsString& aMarginRight)=0; - NS_IMETHOD GetMarginBottom(nsAWritableString& aMarginBottom)=0; - NS_IMETHOD SetMarginBottom(const nsAReadableString& aMarginBottom)=0; + NS_IMETHOD GetMarginBottom(nsString& aMarginBottom)=0; + NS_IMETHOD SetMarginBottom(const nsString& aMarginBottom)=0; - NS_IMETHOD GetMarginLeft(nsAWritableString& aMarginLeft)=0; - NS_IMETHOD SetMarginLeft(const nsAReadableString& aMarginLeft)=0; + NS_IMETHOD GetMarginLeft(nsString& aMarginLeft)=0; + NS_IMETHOD SetMarginLeft(const nsString& aMarginLeft)=0; - NS_IMETHOD GetMarkerOffset(nsAWritableString& aMarkerOffset)=0; - NS_IMETHOD SetMarkerOffset(const nsAReadableString& aMarkerOffset)=0; + NS_IMETHOD GetMarkerOffset(nsString& aMarkerOffset)=0; + NS_IMETHOD SetMarkerOffset(const nsString& aMarkerOffset)=0; - NS_IMETHOD GetMarks(nsAWritableString& aMarks)=0; - NS_IMETHOD SetMarks(const nsAReadableString& aMarks)=0; + NS_IMETHOD GetMarks(nsString& aMarks)=0; + NS_IMETHOD SetMarks(const nsString& aMarks)=0; - NS_IMETHOD GetMaxHeight(nsAWritableString& aMaxHeight)=0; - NS_IMETHOD SetMaxHeight(const nsAReadableString& aMaxHeight)=0; + NS_IMETHOD GetMaxHeight(nsString& aMaxHeight)=0; + NS_IMETHOD SetMaxHeight(const nsString& aMaxHeight)=0; - NS_IMETHOD GetMaxWidth(nsAWritableString& aMaxWidth)=0; - NS_IMETHOD SetMaxWidth(const nsAReadableString& aMaxWidth)=0; + NS_IMETHOD GetMaxWidth(nsString& aMaxWidth)=0; + NS_IMETHOD SetMaxWidth(const nsString& aMaxWidth)=0; - NS_IMETHOD GetMinHeight(nsAWritableString& aMinHeight)=0; - NS_IMETHOD SetMinHeight(const nsAReadableString& aMinHeight)=0; + NS_IMETHOD GetMinHeight(nsString& aMinHeight)=0; + NS_IMETHOD SetMinHeight(const nsString& aMinHeight)=0; - NS_IMETHOD GetMinWidth(nsAWritableString& aMinWidth)=0; - NS_IMETHOD SetMinWidth(const nsAReadableString& aMinWidth)=0; + NS_IMETHOD GetMinWidth(nsString& aMinWidth)=0; + NS_IMETHOD SetMinWidth(const nsString& aMinWidth)=0; - NS_IMETHOD GetOrphans(nsAWritableString& aOrphans)=0; - NS_IMETHOD SetOrphans(const nsAReadableString& aOrphans)=0; + NS_IMETHOD GetOrphans(nsString& aOrphans)=0; + NS_IMETHOD SetOrphans(const nsString& aOrphans)=0; - NS_IMETHOD GetOutline(nsAWritableString& aOutline)=0; - NS_IMETHOD SetOutline(const nsAReadableString& aOutline)=0; + NS_IMETHOD GetOutline(nsString& aOutline)=0; + NS_IMETHOD SetOutline(const nsString& aOutline)=0; - NS_IMETHOD GetOutlineColor(nsAWritableString& aOutlineColor)=0; - NS_IMETHOD SetOutlineColor(const nsAReadableString& aOutlineColor)=0; + NS_IMETHOD GetOutlineColor(nsString& aOutlineColor)=0; + NS_IMETHOD SetOutlineColor(const nsString& aOutlineColor)=0; - NS_IMETHOD GetOutlineStyle(nsAWritableString& aOutlineStyle)=0; - NS_IMETHOD SetOutlineStyle(const nsAReadableString& aOutlineStyle)=0; + NS_IMETHOD GetOutlineStyle(nsString& aOutlineStyle)=0; + NS_IMETHOD SetOutlineStyle(const nsString& aOutlineStyle)=0; - NS_IMETHOD GetOutlineWidth(nsAWritableString& aOutlineWidth)=0; - NS_IMETHOD SetOutlineWidth(const nsAReadableString& aOutlineWidth)=0; + NS_IMETHOD GetOutlineWidth(nsString& aOutlineWidth)=0; + NS_IMETHOD SetOutlineWidth(const nsString& aOutlineWidth)=0; - NS_IMETHOD GetOverflow(nsAWritableString& aOverflow)=0; - NS_IMETHOD SetOverflow(const nsAReadableString& aOverflow)=0; + NS_IMETHOD GetOverflow(nsString& aOverflow)=0; + NS_IMETHOD SetOverflow(const nsString& aOverflow)=0; - NS_IMETHOD GetPadding(nsAWritableString& aPadding)=0; - NS_IMETHOD SetPadding(const nsAReadableString& aPadding)=0; + NS_IMETHOD GetPadding(nsString& aPadding)=0; + NS_IMETHOD SetPadding(const nsString& aPadding)=0; - NS_IMETHOD GetPaddingTop(nsAWritableString& aPaddingTop)=0; - NS_IMETHOD SetPaddingTop(const nsAReadableString& aPaddingTop)=0; + NS_IMETHOD GetPaddingTop(nsString& aPaddingTop)=0; + NS_IMETHOD SetPaddingTop(const nsString& aPaddingTop)=0; - NS_IMETHOD GetPaddingRight(nsAWritableString& aPaddingRight)=0; - NS_IMETHOD SetPaddingRight(const nsAReadableString& aPaddingRight)=0; + NS_IMETHOD GetPaddingRight(nsString& aPaddingRight)=0; + NS_IMETHOD SetPaddingRight(const nsString& aPaddingRight)=0; - NS_IMETHOD GetPaddingBottom(nsAWritableString& aPaddingBottom)=0; - NS_IMETHOD SetPaddingBottom(const nsAReadableString& aPaddingBottom)=0; + NS_IMETHOD GetPaddingBottom(nsString& aPaddingBottom)=0; + NS_IMETHOD SetPaddingBottom(const nsString& aPaddingBottom)=0; - NS_IMETHOD GetPaddingLeft(nsAWritableString& aPaddingLeft)=0; - NS_IMETHOD SetPaddingLeft(const nsAReadableString& aPaddingLeft)=0; + NS_IMETHOD GetPaddingLeft(nsString& aPaddingLeft)=0; + NS_IMETHOD SetPaddingLeft(const nsString& aPaddingLeft)=0; - NS_IMETHOD GetPage(nsAWritableString& aPage)=0; - NS_IMETHOD SetPage(const nsAReadableString& aPage)=0; + NS_IMETHOD GetPage(nsString& aPage)=0; + NS_IMETHOD SetPage(const nsString& aPage)=0; - NS_IMETHOD GetPageBreakAfter(nsAWritableString& aPageBreakAfter)=0; - NS_IMETHOD SetPageBreakAfter(const nsAReadableString& aPageBreakAfter)=0; + NS_IMETHOD GetPageBreakAfter(nsString& aPageBreakAfter)=0; + NS_IMETHOD SetPageBreakAfter(const nsString& aPageBreakAfter)=0; - NS_IMETHOD GetPageBreakBefore(nsAWritableString& aPageBreakBefore)=0; - NS_IMETHOD SetPageBreakBefore(const nsAReadableString& aPageBreakBefore)=0; + NS_IMETHOD GetPageBreakBefore(nsString& aPageBreakBefore)=0; + NS_IMETHOD SetPageBreakBefore(const nsString& aPageBreakBefore)=0; - NS_IMETHOD GetPageBreakInside(nsAWritableString& aPageBreakInside)=0; - NS_IMETHOD SetPageBreakInside(const nsAReadableString& aPageBreakInside)=0; + NS_IMETHOD GetPageBreakInside(nsString& aPageBreakInside)=0; + NS_IMETHOD SetPageBreakInside(const nsString& aPageBreakInside)=0; - NS_IMETHOD GetPause(nsAWritableString& aPause)=0; - NS_IMETHOD SetPause(const nsAReadableString& aPause)=0; + NS_IMETHOD GetPause(nsString& aPause)=0; + NS_IMETHOD SetPause(const nsString& aPause)=0; - NS_IMETHOD GetPauseAfter(nsAWritableString& aPauseAfter)=0; - NS_IMETHOD SetPauseAfter(const nsAReadableString& aPauseAfter)=0; + NS_IMETHOD GetPauseAfter(nsString& aPauseAfter)=0; + NS_IMETHOD SetPauseAfter(const nsString& aPauseAfter)=0; - NS_IMETHOD GetPauseBefore(nsAWritableString& aPauseBefore)=0; - NS_IMETHOD SetPauseBefore(const nsAReadableString& aPauseBefore)=0; + NS_IMETHOD GetPauseBefore(nsString& aPauseBefore)=0; + NS_IMETHOD SetPauseBefore(const nsString& aPauseBefore)=0; - NS_IMETHOD GetPitch(nsAWritableString& aPitch)=0; - NS_IMETHOD SetPitch(const nsAReadableString& aPitch)=0; + NS_IMETHOD GetPitch(nsString& aPitch)=0; + NS_IMETHOD SetPitch(const nsString& aPitch)=0; - NS_IMETHOD GetPitchRange(nsAWritableString& aPitchRange)=0; - NS_IMETHOD SetPitchRange(const nsAReadableString& aPitchRange)=0; + NS_IMETHOD GetPitchRange(nsString& aPitchRange)=0; + NS_IMETHOD SetPitchRange(const nsString& aPitchRange)=0; - NS_IMETHOD GetPlayDuring(nsAWritableString& aPlayDuring)=0; - NS_IMETHOD SetPlayDuring(const nsAReadableString& aPlayDuring)=0; + NS_IMETHOD GetPlayDuring(nsString& aPlayDuring)=0; + NS_IMETHOD SetPlayDuring(const nsString& aPlayDuring)=0; - NS_IMETHOD GetPosition(nsAWritableString& aPosition)=0; - NS_IMETHOD SetPosition(const nsAReadableString& aPosition)=0; + NS_IMETHOD GetPosition(nsString& aPosition)=0; + NS_IMETHOD SetPosition(const nsString& aPosition)=0; - NS_IMETHOD GetQuotes(nsAWritableString& aQuotes)=0; - NS_IMETHOD SetQuotes(const nsAReadableString& aQuotes)=0; + NS_IMETHOD GetQuotes(nsString& aQuotes)=0; + NS_IMETHOD SetQuotes(const nsString& aQuotes)=0; - NS_IMETHOD GetRichness(nsAWritableString& aRichness)=0; - NS_IMETHOD SetRichness(const nsAReadableString& aRichness)=0; + NS_IMETHOD GetRichness(nsString& aRichness)=0; + NS_IMETHOD SetRichness(const nsString& aRichness)=0; - NS_IMETHOD GetRight(nsAWritableString& aRight)=0; - NS_IMETHOD SetRight(const nsAReadableString& aRight)=0; + NS_IMETHOD GetRight(nsString& aRight)=0; + NS_IMETHOD SetRight(const nsString& aRight)=0; - NS_IMETHOD GetSize(nsAWritableString& aSize)=0; - NS_IMETHOD SetSize(const nsAReadableString& aSize)=0; + NS_IMETHOD GetSize(nsString& aSize)=0; + NS_IMETHOD SetSize(const nsString& aSize)=0; - NS_IMETHOD GetSpeak(nsAWritableString& aSpeak)=0; - NS_IMETHOD SetSpeak(const nsAReadableString& aSpeak)=0; + NS_IMETHOD GetSpeak(nsString& aSpeak)=0; + NS_IMETHOD SetSpeak(const nsString& aSpeak)=0; - NS_IMETHOD GetSpeakHeader(nsAWritableString& aSpeakHeader)=0; - NS_IMETHOD SetSpeakHeader(const nsAReadableString& aSpeakHeader)=0; + NS_IMETHOD GetSpeakHeader(nsString& aSpeakHeader)=0; + NS_IMETHOD SetSpeakHeader(const nsString& aSpeakHeader)=0; - NS_IMETHOD GetSpeakNumeral(nsAWritableString& aSpeakNumeral)=0; - NS_IMETHOD SetSpeakNumeral(const nsAReadableString& aSpeakNumeral)=0; + NS_IMETHOD GetSpeakNumeral(nsString& aSpeakNumeral)=0; + NS_IMETHOD SetSpeakNumeral(const nsString& aSpeakNumeral)=0; - NS_IMETHOD GetSpeakPunctuation(nsAWritableString& aSpeakPunctuation)=0; - NS_IMETHOD SetSpeakPunctuation(const nsAReadableString& aSpeakPunctuation)=0; + NS_IMETHOD GetSpeakPunctuation(nsString& aSpeakPunctuation)=0; + NS_IMETHOD SetSpeakPunctuation(const nsString& aSpeakPunctuation)=0; - NS_IMETHOD GetSpeechRate(nsAWritableString& aSpeechRate)=0; - NS_IMETHOD SetSpeechRate(const nsAReadableString& aSpeechRate)=0; + NS_IMETHOD GetSpeechRate(nsString& aSpeechRate)=0; + NS_IMETHOD SetSpeechRate(const nsString& aSpeechRate)=0; - NS_IMETHOD GetStress(nsAWritableString& aStress)=0; - NS_IMETHOD SetStress(const nsAReadableString& aStress)=0; + NS_IMETHOD GetStress(nsString& aStress)=0; + NS_IMETHOD SetStress(const nsString& aStress)=0; - NS_IMETHOD GetTableLayout(nsAWritableString& aTableLayout)=0; - NS_IMETHOD SetTableLayout(const nsAReadableString& aTableLayout)=0; + NS_IMETHOD GetTableLayout(nsString& aTableLayout)=0; + NS_IMETHOD SetTableLayout(const nsString& aTableLayout)=0; - NS_IMETHOD GetTextAlign(nsAWritableString& aTextAlign)=0; - NS_IMETHOD SetTextAlign(const nsAReadableString& aTextAlign)=0; + NS_IMETHOD GetTextAlign(nsString& aTextAlign)=0; + NS_IMETHOD SetTextAlign(const nsString& aTextAlign)=0; - NS_IMETHOD GetTextDecoration(nsAWritableString& aTextDecoration)=0; - NS_IMETHOD SetTextDecoration(const nsAReadableString& aTextDecoration)=0; + NS_IMETHOD GetTextDecoration(nsString& aTextDecoration)=0; + NS_IMETHOD SetTextDecoration(const nsString& aTextDecoration)=0; - NS_IMETHOD GetTextIndent(nsAWritableString& aTextIndent)=0; - NS_IMETHOD SetTextIndent(const nsAReadableString& aTextIndent)=0; + NS_IMETHOD GetTextIndent(nsString& aTextIndent)=0; + NS_IMETHOD SetTextIndent(const nsString& aTextIndent)=0; - NS_IMETHOD GetTextShadow(nsAWritableString& aTextShadow)=0; - NS_IMETHOD SetTextShadow(const nsAReadableString& aTextShadow)=0; + NS_IMETHOD GetTextShadow(nsString& aTextShadow)=0; + NS_IMETHOD SetTextShadow(const nsString& aTextShadow)=0; - NS_IMETHOD GetTextTransform(nsAWritableString& aTextTransform)=0; - NS_IMETHOD SetTextTransform(const nsAReadableString& aTextTransform)=0; + NS_IMETHOD GetTextTransform(nsString& aTextTransform)=0; + NS_IMETHOD SetTextTransform(const nsString& aTextTransform)=0; - NS_IMETHOD GetTop(nsAWritableString& aTop)=0; - NS_IMETHOD SetTop(const nsAReadableString& aTop)=0; + NS_IMETHOD GetTop(nsString& aTop)=0; + NS_IMETHOD SetTop(const nsString& aTop)=0; - NS_IMETHOD GetUnicodeBidi(nsAWritableString& aUnicodeBidi)=0; - NS_IMETHOD SetUnicodeBidi(const nsAReadableString& aUnicodeBidi)=0; + NS_IMETHOD GetUnicodeBidi(nsString& aUnicodeBidi)=0; + NS_IMETHOD SetUnicodeBidi(const nsString& aUnicodeBidi)=0; - NS_IMETHOD GetVerticalAlign(nsAWritableString& aVerticalAlign)=0; - NS_IMETHOD SetVerticalAlign(const nsAReadableString& aVerticalAlign)=0; + NS_IMETHOD GetVerticalAlign(nsString& aVerticalAlign)=0; + NS_IMETHOD SetVerticalAlign(const nsString& aVerticalAlign)=0; - NS_IMETHOD GetVisibility(nsAWritableString& aVisibility)=0; - NS_IMETHOD SetVisibility(const nsAReadableString& aVisibility)=0; + NS_IMETHOD GetVisibility(nsString& aVisibility)=0; + NS_IMETHOD SetVisibility(const nsString& aVisibility)=0; - NS_IMETHOD GetVoiceFamily(nsAWritableString& aVoiceFamily)=0; - NS_IMETHOD SetVoiceFamily(const nsAReadableString& aVoiceFamily)=0; + NS_IMETHOD GetVoiceFamily(nsString& aVoiceFamily)=0; + NS_IMETHOD SetVoiceFamily(const nsString& aVoiceFamily)=0; - NS_IMETHOD GetVolume(nsAWritableString& aVolume)=0; - NS_IMETHOD SetVolume(const nsAReadableString& aVolume)=0; + NS_IMETHOD GetVolume(nsString& aVolume)=0; + NS_IMETHOD SetVolume(const nsString& aVolume)=0; - NS_IMETHOD GetWhiteSpace(nsAWritableString& aWhiteSpace)=0; - NS_IMETHOD SetWhiteSpace(const nsAReadableString& aWhiteSpace)=0; + NS_IMETHOD GetWhiteSpace(nsString& aWhiteSpace)=0; + NS_IMETHOD SetWhiteSpace(const nsString& aWhiteSpace)=0; - NS_IMETHOD GetWidows(nsAWritableString& aWidows)=0; - NS_IMETHOD SetWidows(const nsAReadableString& aWidows)=0; + NS_IMETHOD GetWidows(nsString& aWidows)=0; + NS_IMETHOD SetWidows(const nsString& aWidows)=0; - NS_IMETHOD GetWidth(nsAWritableString& aWidth)=0; - NS_IMETHOD SetWidth(const nsAReadableString& aWidth)=0; + NS_IMETHOD GetWidth(nsString& aWidth)=0; + NS_IMETHOD SetWidth(const nsString& aWidth)=0; - NS_IMETHOD GetWordSpacing(nsAWritableString& aWordSpacing)=0; - NS_IMETHOD SetWordSpacing(const nsAReadableString& aWordSpacing)=0; + NS_IMETHOD GetWordSpacing(nsString& aWordSpacing)=0; + NS_IMETHOD SetWordSpacing(const nsString& aWordSpacing)=0; - NS_IMETHOD GetZIndex(nsAWritableString& aZIndex)=0; - NS_IMETHOD SetZIndex(const nsAReadableString& aZIndex)=0; + NS_IMETHOD GetZIndex(nsString& aZIndex)=0; + NS_IMETHOD SetZIndex(const nsString& aZIndex)=0; - NS_IMETHOD GetBehavior(nsAWritableString& aBehavior)=0; - NS_IMETHOD SetBehavior(const nsAReadableString& aBehavior)=0; + NS_IMETHOD GetBehavior(nsString& aBehavior)=0; + NS_IMETHOD SetBehavior(const nsString& aBehavior)=0; - NS_IMETHOD GetOpacity(nsAWritableString& aOpacity)=0; - NS_IMETHOD SetOpacity(const nsAReadableString& aOpacity)=0; + NS_IMETHOD GetOpacity(nsString& aOpacity)=0; + NS_IMETHOD SetOpacity(const nsString& aOpacity)=0; }; #define NS_DECL_IDOMCSS2PROPERTIES \ - NS_IMETHOD GetAzimuth(nsAWritableString& aAzimuth); \ - NS_IMETHOD SetAzimuth(const nsAReadableString& aAzimuth); \ - NS_IMETHOD GetBackground(nsAWritableString& aBackground); \ - NS_IMETHOD SetBackground(const nsAReadableString& aBackground); \ - NS_IMETHOD GetBackgroundAttachment(nsAWritableString& aBackgroundAttachment); \ - NS_IMETHOD SetBackgroundAttachment(const nsAReadableString& aBackgroundAttachment); \ - NS_IMETHOD GetBackgroundColor(nsAWritableString& aBackgroundColor); \ - NS_IMETHOD SetBackgroundColor(const nsAReadableString& aBackgroundColor); \ - NS_IMETHOD GetBackgroundImage(nsAWritableString& aBackgroundImage); \ - NS_IMETHOD SetBackgroundImage(const nsAReadableString& aBackgroundImage); \ - NS_IMETHOD GetBackgroundPosition(nsAWritableString& aBackgroundPosition); \ - NS_IMETHOD SetBackgroundPosition(const nsAReadableString& aBackgroundPosition); \ - NS_IMETHOD GetBackgroundRepeat(nsAWritableString& aBackgroundRepeat); \ - NS_IMETHOD SetBackgroundRepeat(const nsAReadableString& aBackgroundRepeat); \ - NS_IMETHOD GetBorder(nsAWritableString& aBorder); \ - NS_IMETHOD SetBorder(const nsAReadableString& aBorder); \ - NS_IMETHOD GetBorderCollapse(nsAWritableString& aBorderCollapse); \ - NS_IMETHOD SetBorderCollapse(const nsAReadableString& aBorderCollapse); \ - NS_IMETHOD GetBorderColor(nsAWritableString& aBorderColor); \ - NS_IMETHOD SetBorderColor(const nsAReadableString& aBorderColor); \ - NS_IMETHOD GetBorderSpacing(nsAWritableString& aBorderSpacing); \ - NS_IMETHOD SetBorderSpacing(const nsAReadableString& aBorderSpacing); \ - NS_IMETHOD GetBorderStyle(nsAWritableString& aBorderStyle); \ - NS_IMETHOD SetBorderStyle(const nsAReadableString& aBorderStyle); \ - NS_IMETHOD GetBorderTop(nsAWritableString& aBorderTop); \ - NS_IMETHOD SetBorderTop(const nsAReadableString& aBorderTop); \ - NS_IMETHOD GetBorderRight(nsAWritableString& aBorderRight); \ - NS_IMETHOD SetBorderRight(const nsAReadableString& aBorderRight); \ - NS_IMETHOD GetBorderBottom(nsAWritableString& aBorderBottom); \ - NS_IMETHOD SetBorderBottom(const nsAReadableString& aBorderBottom); \ - NS_IMETHOD GetBorderLeft(nsAWritableString& aBorderLeft); \ - NS_IMETHOD SetBorderLeft(const nsAReadableString& aBorderLeft); \ - NS_IMETHOD GetBorderTopColor(nsAWritableString& aBorderTopColor); \ - NS_IMETHOD SetBorderTopColor(const nsAReadableString& aBorderTopColor); \ - NS_IMETHOD GetBorderRightColor(nsAWritableString& aBorderRightColor); \ - NS_IMETHOD SetBorderRightColor(const nsAReadableString& aBorderRightColor); \ - NS_IMETHOD GetBorderBottomColor(nsAWritableString& aBorderBottomColor); \ - NS_IMETHOD SetBorderBottomColor(const nsAReadableString& aBorderBottomColor); \ - NS_IMETHOD GetBorderLeftColor(nsAWritableString& aBorderLeftColor); \ - NS_IMETHOD SetBorderLeftColor(const nsAReadableString& aBorderLeftColor); \ - NS_IMETHOD GetBorderTopStyle(nsAWritableString& aBorderTopStyle); \ - NS_IMETHOD SetBorderTopStyle(const nsAReadableString& aBorderTopStyle); \ - NS_IMETHOD GetBorderRightStyle(nsAWritableString& aBorderRightStyle); \ - NS_IMETHOD SetBorderRightStyle(const nsAReadableString& aBorderRightStyle); \ - NS_IMETHOD GetBorderBottomStyle(nsAWritableString& aBorderBottomStyle); \ - NS_IMETHOD SetBorderBottomStyle(const nsAReadableString& aBorderBottomStyle); \ - NS_IMETHOD GetBorderLeftStyle(nsAWritableString& aBorderLeftStyle); \ - NS_IMETHOD SetBorderLeftStyle(const nsAReadableString& aBorderLeftStyle); \ - NS_IMETHOD GetBorderTopWidth(nsAWritableString& aBorderTopWidth); \ - NS_IMETHOD SetBorderTopWidth(const nsAReadableString& aBorderTopWidth); \ - NS_IMETHOD GetBorderRightWidth(nsAWritableString& aBorderRightWidth); \ - NS_IMETHOD SetBorderRightWidth(const nsAReadableString& aBorderRightWidth); \ - NS_IMETHOD GetBorderBottomWidth(nsAWritableString& aBorderBottomWidth); \ - NS_IMETHOD SetBorderBottomWidth(const nsAReadableString& aBorderBottomWidth); \ - NS_IMETHOD GetBorderLeftWidth(nsAWritableString& aBorderLeftWidth); \ - NS_IMETHOD SetBorderLeftWidth(const nsAReadableString& aBorderLeftWidth); \ - NS_IMETHOD GetBorderWidth(nsAWritableString& aBorderWidth); \ - NS_IMETHOD SetBorderWidth(const nsAReadableString& aBorderWidth); \ - NS_IMETHOD GetBottom(nsAWritableString& aBottom); \ - NS_IMETHOD SetBottom(const nsAReadableString& aBottom); \ - NS_IMETHOD GetCaptionSide(nsAWritableString& aCaptionSide); \ - NS_IMETHOD SetCaptionSide(const nsAReadableString& aCaptionSide); \ - NS_IMETHOD GetClear(nsAWritableString& aClear); \ - NS_IMETHOD SetClear(const nsAReadableString& aClear); \ - NS_IMETHOD GetClip(nsAWritableString& aClip); \ - NS_IMETHOD SetClip(const nsAReadableString& aClip); \ - NS_IMETHOD GetColor(nsAWritableString& aColor); \ - NS_IMETHOD SetColor(const nsAReadableString& aColor); \ - NS_IMETHOD GetContent(nsAWritableString& aContent); \ - NS_IMETHOD SetContent(const nsAReadableString& aContent); \ - NS_IMETHOD GetCounterIncrement(nsAWritableString& aCounterIncrement); \ - NS_IMETHOD SetCounterIncrement(const nsAReadableString& aCounterIncrement); \ - NS_IMETHOD GetCounterReset(nsAWritableString& aCounterReset); \ - NS_IMETHOD SetCounterReset(const nsAReadableString& aCounterReset); \ - NS_IMETHOD GetCue(nsAWritableString& aCue); \ - NS_IMETHOD SetCue(const nsAReadableString& aCue); \ - NS_IMETHOD GetCueAfter(nsAWritableString& aCueAfter); \ - NS_IMETHOD SetCueAfter(const nsAReadableString& aCueAfter); \ - NS_IMETHOD GetCueBefore(nsAWritableString& aCueBefore); \ - NS_IMETHOD SetCueBefore(const nsAReadableString& aCueBefore); \ - NS_IMETHOD GetCursor(nsAWritableString& aCursor); \ - NS_IMETHOD SetCursor(const nsAReadableString& aCursor); \ - NS_IMETHOD GetDirection(nsAWritableString& aDirection); \ - NS_IMETHOD SetDirection(const nsAReadableString& aDirection); \ - NS_IMETHOD GetDisplay(nsAWritableString& aDisplay); \ - NS_IMETHOD SetDisplay(const nsAReadableString& aDisplay); \ - NS_IMETHOD GetElevation(nsAWritableString& aElevation); \ - NS_IMETHOD SetElevation(const nsAReadableString& aElevation); \ - NS_IMETHOD GetEmptyCells(nsAWritableString& aEmptyCells); \ - NS_IMETHOD SetEmptyCells(const nsAReadableString& aEmptyCells); \ - NS_IMETHOD GetCssFloat(nsAWritableString& aCssFloat); \ - NS_IMETHOD SetCssFloat(const nsAReadableString& aCssFloat); \ - NS_IMETHOD GetFont(nsAWritableString& aFont); \ - NS_IMETHOD SetFont(const nsAReadableString& aFont); \ - NS_IMETHOD GetFontFamily(nsAWritableString& aFontFamily); \ - NS_IMETHOD SetFontFamily(const nsAReadableString& aFontFamily); \ - NS_IMETHOD GetFontSize(nsAWritableString& aFontSize); \ - NS_IMETHOD SetFontSize(const nsAReadableString& aFontSize); \ - NS_IMETHOD GetFontSizeAdjust(nsAWritableString& aFontSizeAdjust); \ - NS_IMETHOD SetFontSizeAdjust(const nsAReadableString& aFontSizeAdjust); \ - NS_IMETHOD GetFontStretch(nsAWritableString& aFontStretch); \ - NS_IMETHOD SetFontStretch(const nsAReadableString& aFontStretch); \ - NS_IMETHOD GetFontStyle(nsAWritableString& aFontStyle); \ - NS_IMETHOD SetFontStyle(const nsAReadableString& aFontStyle); \ - NS_IMETHOD GetFontVariant(nsAWritableString& aFontVariant); \ - NS_IMETHOD SetFontVariant(const nsAReadableString& aFontVariant); \ - NS_IMETHOD GetFontWeight(nsAWritableString& aFontWeight); \ - NS_IMETHOD SetFontWeight(const nsAReadableString& aFontWeight); \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight); \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight); \ - NS_IMETHOD GetLeft(nsAWritableString& aLeft); \ - NS_IMETHOD SetLeft(const nsAReadableString& aLeft); \ - NS_IMETHOD GetLetterSpacing(nsAWritableString& aLetterSpacing); \ - NS_IMETHOD SetLetterSpacing(const nsAReadableString& aLetterSpacing); \ - NS_IMETHOD GetLineHeight(nsAWritableString& aLineHeight); \ - NS_IMETHOD SetLineHeight(const nsAReadableString& aLineHeight); \ - NS_IMETHOD GetListStyle(nsAWritableString& aListStyle); \ - NS_IMETHOD SetListStyle(const nsAReadableString& aListStyle); \ - NS_IMETHOD GetListStyleImage(nsAWritableString& aListStyleImage); \ - NS_IMETHOD SetListStyleImage(const nsAReadableString& aListStyleImage); \ - NS_IMETHOD GetListStylePosition(nsAWritableString& aListStylePosition); \ - NS_IMETHOD SetListStylePosition(const nsAReadableString& aListStylePosition); \ - NS_IMETHOD GetListStyleType(nsAWritableString& aListStyleType); \ - NS_IMETHOD SetListStyleType(const nsAReadableString& aListStyleType); \ - NS_IMETHOD GetMargin(nsAWritableString& aMargin); \ - NS_IMETHOD SetMargin(const nsAReadableString& aMargin); \ - NS_IMETHOD GetMarginTop(nsAWritableString& aMarginTop); \ - NS_IMETHOD SetMarginTop(const nsAReadableString& aMarginTop); \ - NS_IMETHOD GetMarginRight(nsAWritableString& aMarginRight); \ - NS_IMETHOD SetMarginRight(const nsAReadableString& aMarginRight); \ - NS_IMETHOD GetMarginBottom(nsAWritableString& aMarginBottom); \ - NS_IMETHOD SetMarginBottom(const nsAReadableString& aMarginBottom); \ - NS_IMETHOD GetMarginLeft(nsAWritableString& aMarginLeft); \ - NS_IMETHOD SetMarginLeft(const nsAReadableString& aMarginLeft); \ - NS_IMETHOD GetMarkerOffset(nsAWritableString& aMarkerOffset); \ - NS_IMETHOD SetMarkerOffset(const nsAReadableString& aMarkerOffset); \ - NS_IMETHOD GetMarks(nsAWritableString& aMarks); \ - NS_IMETHOD SetMarks(const nsAReadableString& aMarks); \ - NS_IMETHOD GetMaxHeight(nsAWritableString& aMaxHeight); \ - NS_IMETHOD SetMaxHeight(const nsAReadableString& aMaxHeight); \ - NS_IMETHOD GetMaxWidth(nsAWritableString& aMaxWidth); \ - NS_IMETHOD SetMaxWidth(const nsAReadableString& aMaxWidth); \ - NS_IMETHOD GetMinHeight(nsAWritableString& aMinHeight); \ - NS_IMETHOD SetMinHeight(const nsAReadableString& aMinHeight); \ - NS_IMETHOD GetMinWidth(nsAWritableString& aMinWidth); \ - NS_IMETHOD SetMinWidth(const nsAReadableString& aMinWidth); \ - NS_IMETHOD GetOrphans(nsAWritableString& aOrphans); \ - NS_IMETHOD SetOrphans(const nsAReadableString& aOrphans); \ - NS_IMETHOD GetOutline(nsAWritableString& aOutline); \ - NS_IMETHOD SetOutline(const nsAReadableString& aOutline); \ - NS_IMETHOD GetOutlineColor(nsAWritableString& aOutlineColor); \ - NS_IMETHOD SetOutlineColor(const nsAReadableString& aOutlineColor); \ - NS_IMETHOD GetOutlineStyle(nsAWritableString& aOutlineStyle); \ - NS_IMETHOD SetOutlineStyle(const nsAReadableString& aOutlineStyle); \ - NS_IMETHOD GetOutlineWidth(nsAWritableString& aOutlineWidth); \ - NS_IMETHOD SetOutlineWidth(const nsAReadableString& aOutlineWidth); \ - NS_IMETHOD GetOverflow(nsAWritableString& aOverflow); \ - NS_IMETHOD SetOverflow(const nsAReadableString& aOverflow); \ - NS_IMETHOD GetPadding(nsAWritableString& aPadding); \ - NS_IMETHOD SetPadding(const nsAReadableString& aPadding); \ - NS_IMETHOD GetPaddingTop(nsAWritableString& aPaddingTop); \ - NS_IMETHOD SetPaddingTop(const nsAReadableString& aPaddingTop); \ - NS_IMETHOD GetPaddingRight(nsAWritableString& aPaddingRight); \ - NS_IMETHOD SetPaddingRight(const nsAReadableString& aPaddingRight); \ - NS_IMETHOD GetPaddingBottom(nsAWritableString& aPaddingBottom); \ - NS_IMETHOD SetPaddingBottom(const nsAReadableString& aPaddingBottom); \ - NS_IMETHOD GetPaddingLeft(nsAWritableString& aPaddingLeft); \ - NS_IMETHOD SetPaddingLeft(const nsAReadableString& aPaddingLeft); \ - NS_IMETHOD GetPage(nsAWritableString& aPage); \ - NS_IMETHOD SetPage(const nsAReadableString& aPage); \ - NS_IMETHOD GetPageBreakAfter(nsAWritableString& aPageBreakAfter); \ - NS_IMETHOD SetPageBreakAfter(const nsAReadableString& aPageBreakAfter); \ - NS_IMETHOD GetPageBreakBefore(nsAWritableString& aPageBreakBefore); \ - NS_IMETHOD SetPageBreakBefore(const nsAReadableString& aPageBreakBefore); \ - NS_IMETHOD GetPageBreakInside(nsAWritableString& aPageBreakInside); \ - NS_IMETHOD SetPageBreakInside(const nsAReadableString& aPageBreakInside); \ - NS_IMETHOD GetPause(nsAWritableString& aPause); \ - NS_IMETHOD SetPause(const nsAReadableString& aPause); \ - NS_IMETHOD GetPauseAfter(nsAWritableString& aPauseAfter); \ - NS_IMETHOD SetPauseAfter(const nsAReadableString& aPauseAfter); \ - NS_IMETHOD GetPauseBefore(nsAWritableString& aPauseBefore); \ - NS_IMETHOD SetPauseBefore(const nsAReadableString& aPauseBefore); \ - NS_IMETHOD GetPitch(nsAWritableString& aPitch); \ - NS_IMETHOD SetPitch(const nsAReadableString& aPitch); \ - NS_IMETHOD GetPitchRange(nsAWritableString& aPitchRange); \ - NS_IMETHOD SetPitchRange(const nsAReadableString& aPitchRange); \ - NS_IMETHOD GetPlayDuring(nsAWritableString& aPlayDuring); \ - NS_IMETHOD SetPlayDuring(const nsAReadableString& aPlayDuring); \ - NS_IMETHOD GetPosition(nsAWritableString& aPosition); \ - NS_IMETHOD SetPosition(const nsAReadableString& aPosition); \ - NS_IMETHOD GetQuotes(nsAWritableString& aQuotes); \ - NS_IMETHOD SetQuotes(const nsAReadableString& aQuotes); \ - NS_IMETHOD GetRichness(nsAWritableString& aRichness); \ - NS_IMETHOD SetRichness(const nsAReadableString& aRichness); \ - NS_IMETHOD GetRight(nsAWritableString& aRight); \ - NS_IMETHOD SetRight(const nsAReadableString& aRight); \ - NS_IMETHOD GetSize(nsAWritableString& aSize); \ - NS_IMETHOD SetSize(const nsAReadableString& aSize); \ - NS_IMETHOD GetSpeak(nsAWritableString& aSpeak); \ - NS_IMETHOD SetSpeak(const nsAReadableString& aSpeak); \ - NS_IMETHOD GetSpeakHeader(nsAWritableString& aSpeakHeader); \ - NS_IMETHOD SetSpeakHeader(const nsAReadableString& aSpeakHeader); \ - NS_IMETHOD GetSpeakNumeral(nsAWritableString& aSpeakNumeral); \ - NS_IMETHOD SetSpeakNumeral(const nsAReadableString& aSpeakNumeral); \ - NS_IMETHOD GetSpeakPunctuation(nsAWritableString& aSpeakPunctuation); \ - NS_IMETHOD SetSpeakPunctuation(const nsAReadableString& aSpeakPunctuation); \ - NS_IMETHOD GetSpeechRate(nsAWritableString& aSpeechRate); \ - NS_IMETHOD SetSpeechRate(const nsAReadableString& aSpeechRate); \ - NS_IMETHOD GetStress(nsAWritableString& aStress); \ - NS_IMETHOD SetStress(const nsAReadableString& aStress); \ - NS_IMETHOD GetTableLayout(nsAWritableString& aTableLayout); \ - NS_IMETHOD SetTableLayout(const nsAReadableString& aTableLayout); \ - NS_IMETHOD GetTextAlign(nsAWritableString& aTextAlign); \ - NS_IMETHOD SetTextAlign(const nsAReadableString& aTextAlign); \ - NS_IMETHOD GetTextDecoration(nsAWritableString& aTextDecoration); \ - NS_IMETHOD SetTextDecoration(const nsAReadableString& aTextDecoration); \ - NS_IMETHOD GetTextIndent(nsAWritableString& aTextIndent); \ - NS_IMETHOD SetTextIndent(const nsAReadableString& aTextIndent); \ - NS_IMETHOD GetTextShadow(nsAWritableString& aTextShadow); \ - NS_IMETHOD SetTextShadow(const nsAReadableString& aTextShadow); \ - NS_IMETHOD GetTextTransform(nsAWritableString& aTextTransform); \ - NS_IMETHOD SetTextTransform(const nsAReadableString& aTextTransform); \ - NS_IMETHOD GetTop(nsAWritableString& aTop); \ - NS_IMETHOD SetTop(const nsAReadableString& aTop); \ - NS_IMETHOD GetUnicodeBidi(nsAWritableString& aUnicodeBidi); \ - NS_IMETHOD SetUnicodeBidi(const nsAReadableString& aUnicodeBidi); \ - NS_IMETHOD GetVerticalAlign(nsAWritableString& aVerticalAlign); \ - NS_IMETHOD SetVerticalAlign(const nsAReadableString& aVerticalAlign); \ - NS_IMETHOD GetVisibility(nsAWritableString& aVisibility); \ - NS_IMETHOD SetVisibility(const nsAReadableString& aVisibility); \ - NS_IMETHOD GetVoiceFamily(nsAWritableString& aVoiceFamily); \ - NS_IMETHOD SetVoiceFamily(const nsAReadableString& aVoiceFamily); \ - NS_IMETHOD GetVolume(nsAWritableString& aVolume); \ - NS_IMETHOD SetVolume(const nsAReadableString& aVolume); \ - NS_IMETHOD GetWhiteSpace(nsAWritableString& aWhiteSpace); \ - NS_IMETHOD SetWhiteSpace(const nsAReadableString& aWhiteSpace); \ - NS_IMETHOD GetWidows(nsAWritableString& aWidows); \ - NS_IMETHOD SetWidows(const nsAReadableString& aWidows); \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth); \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth); \ - NS_IMETHOD GetWordSpacing(nsAWritableString& aWordSpacing); \ - NS_IMETHOD SetWordSpacing(const nsAReadableString& aWordSpacing); \ - NS_IMETHOD GetZIndex(nsAWritableString& aZIndex); \ - NS_IMETHOD SetZIndex(const nsAReadableString& aZIndex); \ - NS_IMETHOD GetBehavior(nsAWritableString& aBehavior); \ - NS_IMETHOD SetBehavior(const nsAReadableString& aBehavior); \ - NS_IMETHOD GetOpacity(nsAWritableString& aOpacity); \ - NS_IMETHOD SetOpacity(const nsAReadableString& aOpacity); \ + NS_IMETHOD GetAzimuth(nsString& aAzimuth); \ + NS_IMETHOD SetAzimuth(const nsString& aAzimuth); \ + NS_IMETHOD GetBackground(nsString& aBackground); \ + NS_IMETHOD SetBackground(const nsString& aBackground); \ + NS_IMETHOD GetBackgroundAttachment(nsString& aBackgroundAttachment); \ + NS_IMETHOD SetBackgroundAttachment(const nsString& aBackgroundAttachment); \ + NS_IMETHOD GetBackgroundColor(nsString& aBackgroundColor); \ + NS_IMETHOD SetBackgroundColor(const nsString& aBackgroundColor); \ + NS_IMETHOD GetBackgroundImage(nsString& aBackgroundImage); \ + NS_IMETHOD SetBackgroundImage(const nsString& aBackgroundImage); \ + NS_IMETHOD GetBackgroundPosition(nsString& aBackgroundPosition); \ + NS_IMETHOD SetBackgroundPosition(const nsString& aBackgroundPosition); \ + NS_IMETHOD GetBackgroundRepeat(nsString& aBackgroundRepeat); \ + NS_IMETHOD SetBackgroundRepeat(const nsString& aBackgroundRepeat); \ + NS_IMETHOD GetBorder(nsString& aBorder); \ + NS_IMETHOD SetBorder(const nsString& aBorder); \ + NS_IMETHOD GetBorderCollapse(nsString& aBorderCollapse); \ + NS_IMETHOD SetBorderCollapse(const nsString& aBorderCollapse); \ + NS_IMETHOD GetBorderColor(nsString& aBorderColor); \ + NS_IMETHOD SetBorderColor(const nsString& aBorderColor); \ + NS_IMETHOD GetBorderSpacing(nsString& aBorderSpacing); \ + NS_IMETHOD SetBorderSpacing(const nsString& aBorderSpacing); \ + NS_IMETHOD GetBorderStyle(nsString& aBorderStyle); \ + NS_IMETHOD SetBorderStyle(const nsString& aBorderStyle); \ + NS_IMETHOD GetBorderTop(nsString& aBorderTop); \ + NS_IMETHOD SetBorderTop(const nsString& aBorderTop); \ + NS_IMETHOD GetBorderRight(nsString& aBorderRight); \ + NS_IMETHOD SetBorderRight(const nsString& aBorderRight); \ + NS_IMETHOD GetBorderBottom(nsString& aBorderBottom); \ + NS_IMETHOD SetBorderBottom(const nsString& aBorderBottom); \ + NS_IMETHOD GetBorderLeft(nsString& aBorderLeft); \ + NS_IMETHOD SetBorderLeft(const nsString& aBorderLeft); \ + NS_IMETHOD GetBorderTopColor(nsString& aBorderTopColor); \ + NS_IMETHOD SetBorderTopColor(const nsString& aBorderTopColor); \ + NS_IMETHOD GetBorderRightColor(nsString& aBorderRightColor); \ + NS_IMETHOD SetBorderRightColor(const nsString& aBorderRightColor); \ + NS_IMETHOD GetBorderBottomColor(nsString& aBorderBottomColor); \ + NS_IMETHOD SetBorderBottomColor(const nsString& aBorderBottomColor); \ + NS_IMETHOD GetBorderLeftColor(nsString& aBorderLeftColor); \ + NS_IMETHOD SetBorderLeftColor(const nsString& aBorderLeftColor); \ + NS_IMETHOD GetBorderTopStyle(nsString& aBorderTopStyle); \ + NS_IMETHOD SetBorderTopStyle(const nsString& aBorderTopStyle); \ + NS_IMETHOD GetBorderRightStyle(nsString& aBorderRightStyle); \ + NS_IMETHOD SetBorderRightStyle(const nsString& aBorderRightStyle); \ + NS_IMETHOD GetBorderBottomStyle(nsString& aBorderBottomStyle); \ + NS_IMETHOD SetBorderBottomStyle(const nsString& aBorderBottomStyle); \ + NS_IMETHOD GetBorderLeftStyle(nsString& aBorderLeftStyle); \ + NS_IMETHOD SetBorderLeftStyle(const nsString& aBorderLeftStyle); \ + NS_IMETHOD GetBorderTopWidth(nsString& aBorderTopWidth); \ + NS_IMETHOD SetBorderTopWidth(const nsString& aBorderTopWidth); \ + NS_IMETHOD GetBorderRightWidth(nsString& aBorderRightWidth); \ + NS_IMETHOD SetBorderRightWidth(const nsString& aBorderRightWidth); \ + NS_IMETHOD GetBorderBottomWidth(nsString& aBorderBottomWidth); \ + NS_IMETHOD SetBorderBottomWidth(const nsString& aBorderBottomWidth); \ + NS_IMETHOD GetBorderLeftWidth(nsString& aBorderLeftWidth); \ + NS_IMETHOD SetBorderLeftWidth(const nsString& aBorderLeftWidth); \ + NS_IMETHOD GetBorderWidth(nsString& aBorderWidth); \ + NS_IMETHOD SetBorderWidth(const nsString& aBorderWidth); \ + NS_IMETHOD GetBottom(nsString& aBottom); \ + NS_IMETHOD SetBottom(const nsString& aBottom); \ + NS_IMETHOD GetCaptionSide(nsString& aCaptionSide); \ + NS_IMETHOD SetCaptionSide(const nsString& aCaptionSide); \ + NS_IMETHOD GetClear(nsString& aClear); \ + NS_IMETHOD SetClear(const nsString& aClear); \ + NS_IMETHOD GetClip(nsString& aClip); \ + NS_IMETHOD SetClip(const nsString& aClip); \ + NS_IMETHOD GetColor(nsString& aColor); \ + NS_IMETHOD SetColor(const nsString& aColor); \ + NS_IMETHOD GetContent(nsString& aContent); \ + NS_IMETHOD SetContent(const nsString& aContent); \ + NS_IMETHOD GetCounterIncrement(nsString& aCounterIncrement); \ + NS_IMETHOD SetCounterIncrement(const nsString& aCounterIncrement); \ + NS_IMETHOD GetCounterReset(nsString& aCounterReset); \ + NS_IMETHOD SetCounterReset(const nsString& aCounterReset); \ + NS_IMETHOD GetCue(nsString& aCue); \ + NS_IMETHOD SetCue(const nsString& aCue); \ + NS_IMETHOD GetCueAfter(nsString& aCueAfter); \ + NS_IMETHOD SetCueAfter(const nsString& aCueAfter); \ + NS_IMETHOD GetCueBefore(nsString& aCueBefore); \ + NS_IMETHOD SetCueBefore(const nsString& aCueBefore); \ + NS_IMETHOD GetCursor(nsString& aCursor); \ + NS_IMETHOD SetCursor(const nsString& aCursor); \ + NS_IMETHOD GetDirection(nsString& aDirection); \ + NS_IMETHOD SetDirection(const nsString& aDirection); \ + NS_IMETHOD GetDisplay(nsString& aDisplay); \ + NS_IMETHOD SetDisplay(const nsString& aDisplay); \ + NS_IMETHOD GetElevation(nsString& aElevation); \ + NS_IMETHOD SetElevation(const nsString& aElevation); \ + NS_IMETHOD GetEmptyCells(nsString& aEmptyCells); \ + NS_IMETHOD SetEmptyCells(const nsString& aEmptyCells); \ + NS_IMETHOD GetCssFloat(nsString& aCssFloat); \ + NS_IMETHOD SetCssFloat(const nsString& aCssFloat); \ + NS_IMETHOD GetFont(nsString& aFont); \ + NS_IMETHOD SetFont(const nsString& aFont); \ + NS_IMETHOD GetFontFamily(nsString& aFontFamily); \ + NS_IMETHOD SetFontFamily(const nsString& aFontFamily); \ + NS_IMETHOD GetFontSize(nsString& aFontSize); \ + NS_IMETHOD SetFontSize(const nsString& aFontSize); \ + NS_IMETHOD GetFontSizeAdjust(nsString& aFontSizeAdjust); \ + NS_IMETHOD SetFontSizeAdjust(const nsString& aFontSizeAdjust); \ + NS_IMETHOD GetFontStretch(nsString& aFontStretch); \ + NS_IMETHOD SetFontStretch(const nsString& aFontStretch); \ + NS_IMETHOD GetFontStyle(nsString& aFontStyle); \ + NS_IMETHOD SetFontStyle(const nsString& aFontStyle); \ + NS_IMETHOD GetFontVariant(nsString& aFontVariant); \ + NS_IMETHOD SetFontVariant(const nsString& aFontVariant); \ + NS_IMETHOD GetFontWeight(nsString& aFontWeight); \ + NS_IMETHOD SetFontWeight(const nsString& aFontWeight); \ + NS_IMETHOD GetHeight(nsString& aHeight); \ + NS_IMETHOD SetHeight(const nsString& aHeight); \ + NS_IMETHOD GetLeft(nsString& aLeft); \ + NS_IMETHOD SetLeft(const nsString& aLeft); \ + NS_IMETHOD GetLetterSpacing(nsString& aLetterSpacing); \ + NS_IMETHOD SetLetterSpacing(const nsString& aLetterSpacing); \ + NS_IMETHOD GetLineHeight(nsString& aLineHeight); \ + NS_IMETHOD SetLineHeight(const nsString& aLineHeight); \ + NS_IMETHOD GetListStyle(nsString& aListStyle); \ + NS_IMETHOD SetListStyle(const nsString& aListStyle); \ + NS_IMETHOD GetListStyleImage(nsString& aListStyleImage); \ + NS_IMETHOD SetListStyleImage(const nsString& aListStyleImage); \ + NS_IMETHOD GetListStylePosition(nsString& aListStylePosition); \ + NS_IMETHOD SetListStylePosition(const nsString& aListStylePosition); \ + NS_IMETHOD GetListStyleType(nsString& aListStyleType); \ + NS_IMETHOD SetListStyleType(const nsString& aListStyleType); \ + NS_IMETHOD GetMargin(nsString& aMargin); \ + NS_IMETHOD SetMargin(const nsString& aMargin); \ + NS_IMETHOD GetMarginTop(nsString& aMarginTop); \ + NS_IMETHOD SetMarginTop(const nsString& aMarginTop); \ + NS_IMETHOD GetMarginRight(nsString& aMarginRight); \ + NS_IMETHOD SetMarginRight(const nsString& aMarginRight); \ + NS_IMETHOD GetMarginBottom(nsString& aMarginBottom); \ + NS_IMETHOD SetMarginBottom(const nsString& aMarginBottom); \ + NS_IMETHOD GetMarginLeft(nsString& aMarginLeft); \ + NS_IMETHOD SetMarginLeft(const nsString& aMarginLeft); \ + NS_IMETHOD GetMarkerOffset(nsString& aMarkerOffset); \ + NS_IMETHOD SetMarkerOffset(const nsString& aMarkerOffset); \ + NS_IMETHOD GetMarks(nsString& aMarks); \ + NS_IMETHOD SetMarks(const nsString& aMarks); \ + NS_IMETHOD GetMaxHeight(nsString& aMaxHeight); \ + NS_IMETHOD SetMaxHeight(const nsString& aMaxHeight); \ + NS_IMETHOD GetMaxWidth(nsString& aMaxWidth); \ + NS_IMETHOD SetMaxWidth(const nsString& aMaxWidth); \ + NS_IMETHOD GetMinHeight(nsString& aMinHeight); \ + NS_IMETHOD SetMinHeight(const nsString& aMinHeight); \ + NS_IMETHOD GetMinWidth(nsString& aMinWidth); \ + NS_IMETHOD SetMinWidth(const nsString& aMinWidth); \ + NS_IMETHOD GetOrphans(nsString& aOrphans); \ + NS_IMETHOD SetOrphans(const nsString& aOrphans); \ + NS_IMETHOD GetOutline(nsString& aOutline); \ + NS_IMETHOD SetOutline(const nsString& aOutline); \ + NS_IMETHOD GetOutlineColor(nsString& aOutlineColor); \ + NS_IMETHOD SetOutlineColor(const nsString& aOutlineColor); \ + NS_IMETHOD GetOutlineStyle(nsString& aOutlineStyle); \ + NS_IMETHOD SetOutlineStyle(const nsString& aOutlineStyle); \ + NS_IMETHOD GetOutlineWidth(nsString& aOutlineWidth); \ + NS_IMETHOD SetOutlineWidth(const nsString& aOutlineWidth); \ + NS_IMETHOD GetOverflow(nsString& aOverflow); \ + NS_IMETHOD SetOverflow(const nsString& aOverflow); \ + NS_IMETHOD GetPadding(nsString& aPadding); \ + NS_IMETHOD SetPadding(const nsString& aPadding); \ + NS_IMETHOD GetPaddingTop(nsString& aPaddingTop); \ + NS_IMETHOD SetPaddingTop(const nsString& aPaddingTop); \ + NS_IMETHOD GetPaddingRight(nsString& aPaddingRight); \ + NS_IMETHOD SetPaddingRight(const nsString& aPaddingRight); \ + NS_IMETHOD GetPaddingBottom(nsString& aPaddingBottom); \ + NS_IMETHOD SetPaddingBottom(const nsString& aPaddingBottom); \ + NS_IMETHOD GetPaddingLeft(nsString& aPaddingLeft); \ + NS_IMETHOD SetPaddingLeft(const nsString& aPaddingLeft); \ + NS_IMETHOD GetPage(nsString& aPage); \ + NS_IMETHOD SetPage(const nsString& aPage); \ + NS_IMETHOD GetPageBreakAfter(nsString& aPageBreakAfter); \ + NS_IMETHOD SetPageBreakAfter(const nsString& aPageBreakAfter); \ + NS_IMETHOD GetPageBreakBefore(nsString& aPageBreakBefore); \ + NS_IMETHOD SetPageBreakBefore(const nsString& aPageBreakBefore); \ + NS_IMETHOD GetPageBreakInside(nsString& aPageBreakInside); \ + NS_IMETHOD SetPageBreakInside(const nsString& aPageBreakInside); \ + NS_IMETHOD GetPause(nsString& aPause); \ + NS_IMETHOD SetPause(const nsString& aPause); \ + NS_IMETHOD GetPauseAfter(nsString& aPauseAfter); \ + NS_IMETHOD SetPauseAfter(const nsString& aPauseAfter); \ + NS_IMETHOD GetPauseBefore(nsString& aPauseBefore); \ + NS_IMETHOD SetPauseBefore(const nsString& aPauseBefore); \ + NS_IMETHOD GetPitch(nsString& aPitch); \ + NS_IMETHOD SetPitch(const nsString& aPitch); \ + NS_IMETHOD GetPitchRange(nsString& aPitchRange); \ + NS_IMETHOD SetPitchRange(const nsString& aPitchRange); \ + NS_IMETHOD GetPlayDuring(nsString& aPlayDuring); \ + NS_IMETHOD SetPlayDuring(const nsString& aPlayDuring); \ + NS_IMETHOD GetPosition(nsString& aPosition); \ + NS_IMETHOD SetPosition(const nsString& aPosition); \ + NS_IMETHOD GetQuotes(nsString& aQuotes); \ + NS_IMETHOD SetQuotes(const nsString& aQuotes); \ + NS_IMETHOD GetRichness(nsString& aRichness); \ + NS_IMETHOD SetRichness(const nsString& aRichness); \ + NS_IMETHOD GetRight(nsString& aRight); \ + NS_IMETHOD SetRight(const nsString& aRight); \ + NS_IMETHOD GetSize(nsString& aSize); \ + NS_IMETHOD SetSize(const nsString& aSize); \ + NS_IMETHOD GetSpeak(nsString& aSpeak); \ + NS_IMETHOD SetSpeak(const nsString& aSpeak); \ + NS_IMETHOD GetSpeakHeader(nsString& aSpeakHeader); \ + NS_IMETHOD SetSpeakHeader(const nsString& aSpeakHeader); \ + NS_IMETHOD GetSpeakNumeral(nsString& aSpeakNumeral); \ + NS_IMETHOD SetSpeakNumeral(const nsString& aSpeakNumeral); \ + NS_IMETHOD GetSpeakPunctuation(nsString& aSpeakPunctuation); \ + NS_IMETHOD SetSpeakPunctuation(const nsString& aSpeakPunctuation); \ + NS_IMETHOD GetSpeechRate(nsString& aSpeechRate); \ + NS_IMETHOD SetSpeechRate(const nsString& aSpeechRate); \ + NS_IMETHOD GetStress(nsString& aStress); \ + NS_IMETHOD SetStress(const nsString& aStress); \ + NS_IMETHOD GetTableLayout(nsString& aTableLayout); \ + NS_IMETHOD SetTableLayout(const nsString& aTableLayout); \ + NS_IMETHOD GetTextAlign(nsString& aTextAlign); \ + NS_IMETHOD SetTextAlign(const nsString& aTextAlign); \ + NS_IMETHOD GetTextDecoration(nsString& aTextDecoration); \ + NS_IMETHOD SetTextDecoration(const nsString& aTextDecoration); \ + NS_IMETHOD GetTextIndent(nsString& aTextIndent); \ + NS_IMETHOD SetTextIndent(const nsString& aTextIndent); \ + NS_IMETHOD GetTextShadow(nsString& aTextShadow); \ + NS_IMETHOD SetTextShadow(const nsString& aTextShadow); \ + NS_IMETHOD GetTextTransform(nsString& aTextTransform); \ + NS_IMETHOD SetTextTransform(const nsString& aTextTransform); \ + NS_IMETHOD GetTop(nsString& aTop); \ + NS_IMETHOD SetTop(const nsString& aTop); \ + NS_IMETHOD GetUnicodeBidi(nsString& aUnicodeBidi); \ + NS_IMETHOD SetUnicodeBidi(const nsString& aUnicodeBidi); \ + NS_IMETHOD GetVerticalAlign(nsString& aVerticalAlign); \ + NS_IMETHOD SetVerticalAlign(const nsString& aVerticalAlign); \ + NS_IMETHOD GetVisibility(nsString& aVisibility); \ + NS_IMETHOD SetVisibility(const nsString& aVisibility); \ + NS_IMETHOD GetVoiceFamily(nsString& aVoiceFamily); \ + NS_IMETHOD SetVoiceFamily(const nsString& aVoiceFamily); \ + NS_IMETHOD GetVolume(nsString& aVolume); \ + NS_IMETHOD SetVolume(const nsString& aVolume); \ + NS_IMETHOD GetWhiteSpace(nsString& aWhiteSpace); \ + NS_IMETHOD SetWhiteSpace(const nsString& aWhiteSpace); \ + NS_IMETHOD GetWidows(nsString& aWidows); \ + NS_IMETHOD SetWidows(const nsString& aWidows); \ + NS_IMETHOD GetWidth(nsString& aWidth); \ + NS_IMETHOD SetWidth(const nsString& aWidth); \ + NS_IMETHOD GetWordSpacing(nsString& aWordSpacing); \ + NS_IMETHOD SetWordSpacing(const nsString& aWordSpacing); \ + NS_IMETHOD GetZIndex(nsString& aZIndex); \ + NS_IMETHOD SetZIndex(const nsString& aZIndex); \ + NS_IMETHOD GetBehavior(nsString& aBehavior); \ + NS_IMETHOD SetBehavior(const nsString& aBehavior); \ + NS_IMETHOD GetOpacity(nsString& aOpacity); \ + NS_IMETHOD SetOpacity(const nsString& aOpacity); \ #define NS_FORWARD_IDOMCSS2PROPERTIES(_to) \ - NS_IMETHOD GetAzimuth(nsAWritableString& aAzimuth) { return _to GetAzimuth(aAzimuth); } \ - NS_IMETHOD SetAzimuth(const nsAReadableString& aAzimuth) { return _to SetAzimuth(aAzimuth); } \ - NS_IMETHOD GetBackground(nsAWritableString& aBackground) { return _to GetBackground(aBackground); } \ - NS_IMETHOD SetBackground(const nsAReadableString& aBackground) { return _to SetBackground(aBackground); } \ - NS_IMETHOD GetBackgroundAttachment(nsAWritableString& aBackgroundAttachment) { return _to GetBackgroundAttachment(aBackgroundAttachment); } \ - NS_IMETHOD SetBackgroundAttachment(const nsAReadableString& aBackgroundAttachment) { return _to SetBackgroundAttachment(aBackgroundAttachment); } \ - NS_IMETHOD GetBackgroundColor(nsAWritableString& aBackgroundColor) { return _to GetBackgroundColor(aBackgroundColor); } \ - NS_IMETHOD SetBackgroundColor(const nsAReadableString& aBackgroundColor) { return _to SetBackgroundColor(aBackgroundColor); } \ - NS_IMETHOD GetBackgroundImage(nsAWritableString& aBackgroundImage) { return _to GetBackgroundImage(aBackgroundImage); } \ - NS_IMETHOD SetBackgroundImage(const nsAReadableString& aBackgroundImage) { return _to SetBackgroundImage(aBackgroundImage); } \ - NS_IMETHOD GetBackgroundPosition(nsAWritableString& aBackgroundPosition) { return _to GetBackgroundPosition(aBackgroundPosition); } \ - NS_IMETHOD SetBackgroundPosition(const nsAReadableString& aBackgroundPosition) { return _to SetBackgroundPosition(aBackgroundPosition); } \ - NS_IMETHOD GetBackgroundRepeat(nsAWritableString& aBackgroundRepeat) { return _to GetBackgroundRepeat(aBackgroundRepeat); } \ - NS_IMETHOD SetBackgroundRepeat(const nsAReadableString& aBackgroundRepeat) { return _to SetBackgroundRepeat(aBackgroundRepeat); } \ - NS_IMETHOD GetBorder(nsAWritableString& aBorder) { return _to GetBorder(aBorder); } \ - NS_IMETHOD SetBorder(const nsAReadableString& aBorder) { return _to SetBorder(aBorder); } \ - NS_IMETHOD GetBorderCollapse(nsAWritableString& aBorderCollapse) { return _to GetBorderCollapse(aBorderCollapse); } \ - NS_IMETHOD SetBorderCollapse(const nsAReadableString& aBorderCollapse) { return _to SetBorderCollapse(aBorderCollapse); } \ - NS_IMETHOD GetBorderColor(nsAWritableString& aBorderColor) { return _to GetBorderColor(aBorderColor); } \ - NS_IMETHOD SetBorderColor(const nsAReadableString& aBorderColor) { return _to SetBorderColor(aBorderColor); } \ - NS_IMETHOD GetBorderSpacing(nsAWritableString& aBorderSpacing) { return _to GetBorderSpacing(aBorderSpacing); } \ - NS_IMETHOD SetBorderSpacing(const nsAReadableString& aBorderSpacing) { return _to SetBorderSpacing(aBorderSpacing); } \ - NS_IMETHOD GetBorderStyle(nsAWritableString& aBorderStyle) { return _to GetBorderStyle(aBorderStyle); } \ - NS_IMETHOD SetBorderStyle(const nsAReadableString& aBorderStyle) { return _to SetBorderStyle(aBorderStyle); } \ - NS_IMETHOD GetBorderTop(nsAWritableString& aBorderTop) { return _to GetBorderTop(aBorderTop); } \ - NS_IMETHOD SetBorderTop(const nsAReadableString& aBorderTop) { return _to SetBorderTop(aBorderTop); } \ - NS_IMETHOD GetBorderRight(nsAWritableString& aBorderRight) { return _to GetBorderRight(aBorderRight); } \ - NS_IMETHOD SetBorderRight(const nsAReadableString& aBorderRight) { return _to SetBorderRight(aBorderRight); } \ - NS_IMETHOD GetBorderBottom(nsAWritableString& aBorderBottom) { return _to GetBorderBottom(aBorderBottom); } \ - NS_IMETHOD SetBorderBottom(const nsAReadableString& aBorderBottom) { return _to SetBorderBottom(aBorderBottom); } \ - NS_IMETHOD GetBorderLeft(nsAWritableString& aBorderLeft) { return _to GetBorderLeft(aBorderLeft); } \ - NS_IMETHOD SetBorderLeft(const nsAReadableString& aBorderLeft) { return _to SetBorderLeft(aBorderLeft); } \ - NS_IMETHOD GetBorderTopColor(nsAWritableString& aBorderTopColor) { return _to GetBorderTopColor(aBorderTopColor); } \ - NS_IMETHOD SetBorderTopColor(const nsAReadableString& aBorderTopColor) { return _to SetBorderTopColor(aBorderTopColor); } \ - NS_IMETHOD GetBorderRightColor(nsAWritableString& aBorderRightColor) { return _to GetBorderRightColor(aBorderRightColor); } \ - NS_IMETHOD SetBorderRightColor(const nsAReadableString& aBorderRightColor) { return _to SetBorderRightColor(aBorderRightColor); } \ - NS_IMETHOD GetBorderBottomColor(nsAWritableString& aBorderBottomColor) { return _to GetBorderBottomColor(aBorderBottomColor); } \ - NS_IMETHOD SetBorderBottomColor(const nsAReadableString& aBorderBottomColor) { return _to SetBorderBottomColor(aBorderBottomColor); } \ - NS_IMETHOD GetBorderLeftColor(nsAWritableString& aBorderLeftColor) { return _to GetBorderLeftColor(aBorderLeftColor); } \ - NS_IMETHOD SetBorderLeftColor(const nsAReadableString& aBorderLeftColor) { return _to SetBorderLeftColor(aBorderLeftColor); } \ - NS_IMETHOD GetBorderTopStyle(nsAWritableString& aBorderTopStyle) { return _to GetBorderTopStyle(aBorderTopStyle); } \ - NS_IMETHOD SetBorderTopStyle(const nsAReadableString& aBorderTopStyle) { return _to SetBorderTopStyle(aBorderTopStyle); } \ - NS_IMETHOD GetBorderRightStyle(nsAWritableString& aBorderRightStyle) { return _to GetBorderRightStyle(aBorderRightStyle); } \ - NS_IMETHOD SetBorderRightStyle(const nsAReadableString& aBorderRightStyle) { return _to SetBorderRightStyle(aBorderRightStyle); } \ - NS_IMETHOD GetBorderBottomStyle(nsAWritableString& aBorderBottomStyle) { return _to GetBorderBottomStyle(aBorderBottomStyle); } \ - NS_IMETHOD SetBorderBottomStyle(const nsAReadableString& aBorderBottomStyle) { return _to SetBorderBottomStyle(aBorderBottomStyle); } \ - NS_IMETHOD GetBorderLeftStyle(nsAWritableString& aBorderLeftStyle) { return _to GetBorderLeftStyle(aBorderLeftStyle); } \ - NS_IMETHOD SetBorderLeftStyle(const nsAReadableString& aBorderLeftStyle) { return _to SetBorderLeftStyle(aBorderLeftStyle); } \ - NS_IMETHOD GetBorderTopWidth(nsAWritableString& aBorderTopWidth) { return _to GetBorderTopWidth(aBorderTopWidth); } \ - NS_IMETHOD SetBorderTopWidth(const nsAReadableString& aBorderTopWidth) { return _to SetBorderTopWidth(aBorderTopWidth); } \ - NS_IMETHOD GetBorderRightWidth(nsAWritableString& aBorderRightWidth) { return _to GetBorderRightWidth(aBorderRightWidth); } \ - NS_IMETHOD SetBorderRightWidth(const nsAReadableString& aBorderRightWidth) { return _to SetBorderRightWidth(aBorderRightWidth); } \ - NS_IMETHOD GetBorderBottomWidth(nsAWritableString& aBorderBottomWidth) { return _to GetBorderBottomWidth(aBorderBottomWidth); } \ - NS_IMETHOD SetBorderBottomWidth(const nsAReadableString& aBorderBottomWidth) { return _to SetBorderBottomWidth(aBorderBottomWidth); } \ - NS_IMETHOD GetBorderLeftWidth(nsAWritableString& aBorderLeftWidth) { return _to GetBorderLeftWidth(aBorderLeftWidth); } \ - NS_IMETHOD SetBorderLeftWidth(const nsAReadableString& aBorderLeftWidth) { return _to SetBorderLeftWidth(aBorderLeftWidth); } \ - NS_IMETHOD GetBorderWidth(nsAWritableString& aBorderWidth) { return _to GetBorderWidth(aBorderWidth); } \ - NS_IMETHOD SetBorderWidth(const nsAReadableString& aBorderWidth) { return _to SetBorderWidth(aBorderWidth); } \ - NS_IMETHOD GetBottom(nsAWritableString& aBottom) { return _to GetBottom(aBottom); } \ - NS_IMETHOD SetBottom(const nsAReadableString& aBottom) { return _to SetBottom(aBottom); } \ - NS_IMETHOD GetCaptionSide(nsAWritableString& aCaptionSide) { return _to GetCaptionSide(aCaptionSide); } \ - NS_IMETHOD SetCaptionSide(const nsAReadableString& aCaptionSide) { return _to SetCaptionSide(aCaptionSide); } \ - NS_IMETHOD GetClear(nsAWritableString& aClear) { return _to GetClear(aClear); } \ - NS_IMETHOD SetClear(const nsAReadableString& aClear) { return _to SetClear(aClear); } \ - NS_IMETHOD GetClip(nsAWritableString& aClip) { return _to GetClip(aClip); } \ - NS_IMETHOD SetClip(const nsAReadableString& aClip) { return _to SetClip(aClip); } \ - NS_IMETHOD GetColor(nsAWritableString& aColor) { return _to GetColor(aColor); } \ - NS_IMETHOD SetColor(const nsAReadableString& aColor) { return _to SetColor(aColor); } \ - NS_IMETHOD GetContent(nsAWritableString& aContent) { return _to GetContent(aContent); } \ - NS_IMETHOD SetContent(const nsAReadableString& aContent) { return _to SetContent(aContent); } \ - NS_IMETHOD GetCounterIncrement(nsAWritableString& aCounterIncrement) { return _to GetCounterIncrement(aCounterIncrement); } \ - NS_IMETHOD SetCounterIncrement(const nsAReadableString& aCounterIncrement) { return _to SetCounterIncrement(aCounterIncrement); } \ - NS_IMETHOD GetCounterReset(nsAWritableString& aCounterReset) { return _to GetCounterReset(aCounterReset); } \ - NS_IMETHOD SetCounterReset(const nsAReadableString& aCounterReset) { return _to SetCounterReset(aCounterReset); } \ - NS_IMETHOD GetCue(nsAWritableString& aCue) { return _to GetCue(aCue); } \ - NS_IMETHOD SetCue(const nsAReadableString& aCue) { return _to SetCue(aCue); } \ - NS_IMETHOD GetCueAfter(nsAWritableString& aCueAfter) { return _to GetCueAfter(aCueAfter); } \ - NS_IMETHOD SetCueAfter(const nsAReadableString& aCueAfter) { return _to SetCueAfter(aCueAfter); } \ - NS_IMETHOD GetCueBefore(nsAWritableString& aCueBefore) { return _to GetCueBefore(aCueBefore); } \ - NS_IMETHOD SetCueBefore(const nsAReadableString& aCueBefore) { return _to SetCueBefore(aCueBefore); } \ - NS_IMETHOD GetCursor(nsAWritableString& aCursor) { return _to GetCursor(aCursor); } \ - NS_IMETHOD SetCursor(const nsAReadableString& aCursor) { return _to SetCursor(aCursor); } \ - NS_IMETHOD GetDirection(nsAWritableString& aDirection) { return _to GetDirection(aDirection); } \ - NS_IMETHOD SetDirection(const nsAReadableString& aDirection) { return _to SetDirection(aDirection); } \ - NS_IMETHOD GetDisplay(nsAWritableString& aDisplay) { return _to GetDisplay(aDisplay); } \ - NS_IMETHOD SetDisplay(const nsAReadableString& aDisplay) { return _to SetDisplay(aDisplay); } \ - NS_IMETHOD GetElevation(nsAWritableString& aElevation) { return _to GetElevation(aElevation); } \ - NS_IMETHOD SetElevation(const nsAReadableString& aElevation) { return _to SetElevation(aElevation); } \ - NS_IMETHOD GetEmptyCells(nsAWritableString& aEmptyCells) { return _to GetEmptyCells(aEmptyCells); } \ - NS_IMETHOD SetEmptyCells(const nsAReadableString& aEmptyCells) { return _to SetEmptyCells(aEmptyCells); } \ - NS_IMETHOD GetCssFloat(nsAWritableString& aCssFloat) { return _to GetCssFloat(aCssFloat); } \ - NS_IMETHOD SetCssFloat(const nsAReadableString& aCssFloat) { return _to SetCssFloat(aCssFloat); } \ - NS_IMETHOD GetFont(nsAWritableString& aFont) { return _to GetFont(aFont); } \ - NS_IMETHOD SetFont(const nsAReadableString& aFont) { return _to SetFont(aFont); } \ - NS_IMETHOD GetFontFamily(nsAWritableString& aFontFamily) { return _to GetFontFamily(aFontFamily); } \ - NS_IMETHOD SetFontFamily(const nsAReadableString& aFontFamily) { return _to SetFontFamily(aFontFamily); } \ - NS_IMETHOD GetFontSize(nsAWritableString& aFontSize) { return _to GetFontSize(aFontSize); } \ - NS_IMETHOD SetFontSize(const nsAReadableString& aFontSize) { return _to SetFontSize(aFontSize); } \ - NS_IMETHOD GetFontSizeAdjust(nsAWritableString& aFontSizeAdjust) { return _to GetFontSizeAdjust(aFontSizeAdjust); } \ - NS_IMETHOD SetFontSizeAdjust(const nsAReadableString& aFontSizeAdjust) { return _to SetFontSizeAdjust(aFontSizeAdjust); } \ - NS_IMETHOD GetFontStretch(nsAWritableString& aFontStretch) { return _to GetFontStretch(aFontStretch); } \ - NS_IMETHOD SetFontStretch(const nsAReadableString& aFontStretch) { return _to SetFontStretch(aFontStretch); } \ - NS_IMETHOD GetFontStyle(nsAWritableString& aFontStyle) { return _to GetFontStyle(aFontStyle); } \ - NS_IMETHOD SetFontStyle(const nsAReadableString& aFontStyle) { return _to SetFontStyle(aFontStyle); } \ - NS_IMETHOD GetFontVariant(nsAWritableString& aFontVariant) { return _to GetFontVariant(aFontVariant); } \ - NS_IMETHOD SetFontVariant(const nsAReadableString& aFontVariant) { return _to SetFontVariant(aFontVariant); } \ - NS_IMETHOD GetFontWeight(nsAWritableString& aFontWeight) { return _to GetFontWeight(aFontWeight); } \ - NS_IMETHOD SetFontWeight(const nsAReadableString& aFontWeight) { return _to SetFontWeight(aFontWeight); } \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight) { return _to GetHeight(aHeight); } \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight) { return _to SetHeight(aHeight); } \ - NS_IMETHOD GetLeft(nsAWritableString& aLeft) { return _to GetLeft(aLeft); } \ - NS_IMETHOD SetLeft(const nsAReadableString& aLeft) { return _to SetLeft(aLeft); } \ - NS_IMETHOD GetLetterSpacing(nsAWritableString& aLetterSpacing) { return _to GetLetterSpacing(aLetterSpacing); } \ - NS_IMETHOD SetLetterSpacing(const nsAReadableString& aLetterSpacing) { return _to SetLetterSpacing(aLetterSpacing); } \ - NS_IMETHOD GetLineHeight(nsAWritableString& aLineHeight) { return _to GetLineHeight(aLineHeight); } \ - NS_IMETHOD SetLineHeight(const nsAReadableString& aLineHeight) { return _to SetLineHeight(aLineHeight); } \ - NS_IMETHOD GetListStyle(nsAWritableString& aListStyle) { return _to GetListStyle(aListStyle); } \ - NS_IMETHOD SetListStyle(const nsAReadableString& aListStyle) { return _to SetListStyle(aListStyle); } \ - NS_IMETHOD GetListStyleImage(nsAWritableString& aListStyleImage) { return _to GetListStyleImage(aListStyleImage); } \ - NS_IMETHOD SetListStyleImage(const nsAReadableString& aListStyleImage) { return _to SetListStyleImage(aListStyleImage); } \ - NS_IMETHOD GetListStylePosition(nsAWritableString& aListStylePosition) { return _to GetListStylePosition(aListStylePosition); } \ - NS_IMETHOD SetListStylePosition(const nsAReadableString& aListStylePosition) { return _to SetListStylePosition(aListStylePosition); } \ - NS_IMETHOD GetListStyleType(nsAWritableString& aListStyleType) { return _to GetListStyleType(aListStyleType); } \ - NS_IMETHOD SetListStyleType(const nsAReadableString& aListStyleType) { return _to SetListStyleType(aListStyleType); } \ - NS_IMETHOD GetMargin(nsAWritableString& aMargin) { return _to GetMargin(aMargin); } \ - NS_IMETHOD SetMargin(const nsAReadableString& aMargin) { return _to SetMargin(aMargin); } \ - NS_IMETHOD GetMarginTop(nsAWritableString& aMarginTop) { return _to GetMarginTop(aMarginTop); } \ - NS_IMETHOD SetMarginTop(const nsAReadableString& aMarginTop) { return _to SetMarginTop(aMarginTop); } \ - NS_IMETHOD GetMarginRight(nsAWritableString& aMarginRight) { return _to GetMarginRight(aMarginRight); } \ - NS_IMETHOD SetMarginRight(const nsAReadableString& aMarginRight) { return _to SetMarginRight(aMarginRight); } \ - NS_IMETHOD GetMarginBottom(nsAWritableString& aMarginBottom) { return _to GetMarginBottom(aMarginBottom); } \ - NS_IMETHOD SetMarginBottom(const nsAReadableString& aMarginBottom) { return _to SetMarginBottom(aMarginBottom); } \ - NS_IMETHOD GetMarginLeft(nsAWritableString& aMarginLeft) { return _to GetMarginLeft(aMarginLeft); } \ - NS_IMETHOD SetMarginLeft(const nsAReadableString& aMarginLeft) { return _to SetMarginLeft(aMarginLeft); } \ - NS_IMETHOD GetMarkerOffset(nsAWritableString& aMarkerOffset) { return _to GetMarkerOffset(aMarkerOffset); } \ - NS_IMETHOD SetMarkerOffset(const nsAReadableString& aMarkerOffset) { return _to SetMarkerOffset(aMarkerOffset); } \ - NS_IMETHOD GetMarks(nsAWritableString& aMarks) { return _to GetMarks(aMarks); } \ - NS_IMETHOD SetMarks(const nsAReadableString& aMarks) { return _to SetMarks(aMarks); } \ - NS_IMETHOD GetMaxHeight(nsAWritableString& aMaxHeight) { return _to GetMaxHeight(aMaxHeight); } \ - NS_IMETHOD SetMaxHeight(const nsAReadableString& aMaxHeight) { return _to SetMaxHeight(aMaxHeight); } \ - NS_IMETHOD GetMaxWidth(nsAWritableString& aMaxWidth) { return _to GetMaxWidth(aMaxWidth); } \ - NS_IMETHOD SetMaxWidth(const nsAReadableString& aMaxWidth) { return _to SetMaxWidth(aMaxWidth); } \ - NS_IMETHOD GetMinHeight(nsAWritableString& aMinHeight) { return _to GetMinHeight(aMinHeight); } \ - NS_IMETHOD SetMinHeight(const nsAReadableString& aMinHeight) { return _to SetMinHeight(aMinHeight); } \ - NS_IMETHOD GetMinWidth(nsAWritableString& aMinWidth) { return _to GetMinWidth(aMinWidth); } \ - NS_IMETHOD SetMinWidth(const nsAReadableString& aMinWidth) { return _to SetMinWidth(aMinWidth); } \ - NS_IMETHOD GetOrphans(nsAWritableString& aOrphans) { return _to GetOrphans(aOrphans); } \ - NS_IMETHOD SetOrphans(const nsAReadableString& aOrphans) { return _to SetOrphans(aOrphans); } \ - NS_IMETHOD GetOutline(nsAWritableString& aOutline) { return _to GetOutline(aOutline); } \ - NS_IMETHOD SetOutline(const nsAReadableString& aOutline) { return _to SetOutline(aOutline); } \ - NS_IMETHOD GetOutlineColor(nsAWritableString& aOutlineColor) { return _to GetOutlineColor(aOutlineColor); } \ - NS_IMETHOD SetOutlineColor(const nsAReadableString& aOutlineColor) { return _to SetOutlineColor(aOutlineColor); } \ - NS_IMETHOD GetOutlineStyle(nsAWritableString& aOutlineStyle) { return _to GetOutlineStyle(aOutlineStyle); } \ - NS_IMETHOD SetOutlineStyle(const nsAReadableString& aOutlineStyle) { return _to SetOutlineStyle(aOutlineStyle); } \ - NS_IMETHOD GetOutlineWidth(nsAWritableString& aOutlineWidth) { return _to GetOutlineWidth(aOutlineWidth); } \ - NS_IMETHOD SetOutlineWidth(const nsAReadableString& aOutlineWidth) { return _to SetOutlineWidth(aOutlineWidth); } \ - NS_IMETHOD GetOverflow(nsAWritableString& aOverflow) { return _to GetOverflow(aOverflow); } \ - NS_IMETHOD SetOverflow(const nsAReadableString& aOverflow) { return _to SetOverflow(aOverflow); } \ - NS_IMETHOD GetPadding(nsAWritableString& aPadding) { return _to GetPadding(aPadding); } \ - NS_IMETHOD SetPadding(const nsAReadableString& aPadding) { return _to SetPadding(aPadding); } \ - NS_IMETHOD GetPaddingTop(nsAWritableString& aPaddingTop) { return _to GetPaddingTop(aPaddingTop); } \ - NS_IMETHOD SetPaddingTop(const nsAReadableString& aPaddingTop) { return _to SetPaddingTop(aPaddingTop); } \ - NS_IMETHOD GetPaddingRight(nsAWritableString& aPaddingRight) { return _to GetPaddingRight(aPaddingRight); } \ - NS_IMETHOD SetPaddingRight(const nsAReadableString& aPaddingRight) { return _to SetPaddingRight(aPaddingRight); } \ - NS_IMETHOD GetPaddingBottom(nsAWritableString& aPaddingBottom) { return _to GetPaddingBottom(aPaddingBottom); } \ - NS_IMETHOD SetPaddingBottom(const nsAReadableString& aPaddingBottom) { return _to SetPaddingBottom(aPaddingBottom); } \ - NS_IMETHOD GetPaddingLeft(nsAWritableString& aPaddingLeft) { return _to GetPaddingLeft(aPaddingLeft); } \ - NS_IMETHOD SetPaddingLeft(const nsAReadableString& aPaddingLeft) { return _to SetPaddingLeft(aPaddingLeft); } \ - NS_IMETHOD GetPage(nsAWritableString& aPage) { return _to GetPage(aPage); } \ - NS_IMETHOD SetPage(const nsAReadableString& aPage) { return _to SetPage(aPage); } \ - NS_IMETHOD GetPageBreakAfter(nsAWritableString& aPageBreakAfter) { return _to GetPageBreakAfter(aPageBreakAfter); } \ - NS_IMETHOD SetPageBreakAfter(const nsAReadableString& aPageBreakAfter) { return _to SetPageBreakAfter(aPageBreakAfter); } \ - NS_IMETHOD GetPageBreakBefore(nsAWritableString& aPageBreakBefore) { return _to GetPageBreakBefore(aPageBreakBefore); } \ - NS_IMETHOD SetPageBreakBefore(const nsAReadableString& aPageBreakBefore) { return _to SetPageBreakBefore(aPageBreakBefore); } \ - NS_IMETHOD GetPageBreakInside(nsAWritableString& aPageBreakInside) { return _to GetPageBreakInside(aPageBreakInside); } \ - NS_IMETHOD SetPageBreakInside(const nsAReadableString& aPageBreakInside) { return _to SetPageBreakInside(aPageBreakInside); } \ - NS_IMETHOD GetPause(nsAWritableString& aPause) { return _to GetPause(aPause); } \ - NS_IMETHOD SetPause(const nsAReadableString& aPause) { return _to SetPause(aPause); } \ - NS_IMETHOD GetPauseAfter(nsAWritableString& aPauseAfter) { return _to GetPauseAfter(aPauseAfter); } \ - NS_IMETHOD SetPauseAfter(const nsAReadableString& aPauseAfter) { return _to SetPauseAfter(aPauseAfter); } \ - NS_IMETHOD GetPauseBefore(nsAWritableString& aPauseBefore) { return _to GetPauseBefore(aPauseBefore); } \ - NS_IMETHOD SetPauseBefore(const nsAReadableString& aPauseBefore) { return _to SetPauseBefore(aPauseBefore); } \ - NS_IMETHOD GetPitch(nsAWritableString& aPitch) { return _to GetPitch(aPitch); } \ - NS_IMETHOD SetPitch(const nsAReadableString& aPitch) { return _to SetPitch(aPitch); } \ - NS_IMETHOD GetPitchRange(nsAWritableString& aPitchRange) { return _to GetPitchRange(aPitchRange); } \ - NS_IMETHOD SetPitchRange(const nsAReadableString& aPitchRange) { return _to SetPitchRange(aPitchRange); } \ - NS_IMETHOD GetPlayDuring(nsAWritableString& aPlayDuring) { return _to GetPlayDuring(aPlayDuring); } \ - NS_IMETHOD SetPlayDuring(const nsAReadableString& aPlayDuring) { return _to SetPlayDuring(aPlayDuring); } \ - NS_IMETHOD GetPosition(nsAWritableString& aPosition) { return _to GetPosition(aPosition); } \ - NS_IMETHOD SetPosition(const nsAReadableString& aPosition) { return _to SetPosition(aPosition); } \ - NS_IMETHOD GetQuotes(nsAWritableString& aQuotes) { return _to GetQuotes(aQuotes); } \ - NS_IMETHOD SetQuotes(const nsAReadableString& aQuotes) { return _to SetQuotes(aQuotes); } \ - NS_IMETHOD GetRichness(nsAWritableString& aRichness) { return _to GetRichness(aRichness); } \ - NS_IMETHOD SetRichness(const nsAReadableString& aRichness) { return _to SetRichness(aRichness); } \ - NS_IMETHOD GetRight(nsAWritableString& aRight) { return _to GetRight(aRight); } \ - NS_IMETHOD SetRight(const nsAReadableString& aRight) { return _to SetRight(aRight); } \ - NS_IMETHOD GetSize(nsAWritableString& aSize) { return _to GetSize(aSize); } \ - NS_IMETHOD SetSize(const nsAReadableString& aSize) { return _to SetSize(aSize); } \ - NS_IMETHOD GetSpeak(nsAWritableString& aSpeak) { return _to GetSpeak(aSpeak); } \ - NS_IMETHOD SetSpeak(const nsAReadableString& aSpeak) { return _to SetSpeak(aSpeak); } \ - NS_IMETHOD GetSpeakHeader(nsAWritableString& aSpeakHeader) { return _to GetSpeakHeader(aSpeakHeader); } \ - NS_IMETHOD SetSpeakHeader(const nsAReadableString& aSpeakHeader) { return _to SetSpeakHeader(aSpeakHeader); } \ - NS_IMETHOD GetSpeakNumeral(nsAWritableString& aSpeakNumeral) { return _to GetSpeakNumeral(aSpeakNumeral); } \ - NS_IMETHOD SetSpeakNumeral(const nsAReadableString& aSpeakNumeral) { return _to SetSpeakNumeral(aSpeakNumeral); } \ - NS_IMETHOD GetSpeakPunctuation(nsAWritableString& aSpeakPunctuation) { return _to GetSpeakPunctuation(aSpeakPunctuation); } \ - NS_IMETHOD SetSpeakPunctuation(const nsAReadableString& aSpeakPunctuation) { return _to SetSpeakPunctuation(aSpeakPunctuation); } \ - NS_IMETHOD GetSpeechRate(nsAWritableString& aSpeechRate) { return _to GetSpeechRate(aSpeechRate); } \ - NS_IMETHOD SetSpeechRate(const nsAReadableString& aSpeechRate) { return _to SetSpeechRate(aSpeechRate); } \ - NS_IMETHOD GetStress(nsAWritableString& aStress) { return _to GetStress(aStress); } \ - NS_IMETHOD SetStress(const nsAReadableString& aStress) { return _to SetStress(aStress); } \ - NS_IMETHOD GetTableLayout(nsAWritableString& aTableLayout) { return _to GetTableLayout(aTableLayout); } \ - NS_IMETHOD SetTableLayout(const nsAReadableString& aTableLayout) { return _to SetTableLayout(aTableLayout); } \ - NS_IMETHOD GetTextAlign(nsAWritableString& aTextAlign) { return _to GetTextAlign(aTextAlign); } \ - NS_IMETHOD SetTextAlign(const nsAReadableString& aTextAlign) { return _to SetTextAlign(aTextAlign); } \ - NS_IMETHOD GetTextDecoration(nsAWritableString& aTextDecoration) { return _to GetTextDecoration(aTextDecoration); } \ - NS_IMETHOD SetTextDecoration(const nsAReadableString& aTextDecoration) { return _to SetTextDecoration(aTextDecoration); } \ - NS_IMETHOD GetTextIndent(nsAWritableString& aTextIndent) { return _to GetTextIndent(aTextIndent); } \ - NS_IMETHOD SetTextIndent(const nsAReadableString& aTextIndent) { return _to SetTextIndent(aTextIndent); } \ - NS_IMETHOD GetTextShadow(nsAWritableString& aTextShadow) { return _to GetTextShadow(aTextShadow); } \ - NS_IMETHOD SetTextShadow(const nsAReadableString& aTextShadow) { return _to SetTextShadow(aTextShadow); } \ - NS_IMETHOD GetTextTransform(nsAWritableString& aTextTransform) { return _to GetTextTransform(aTextTransform); } \ - NS_IMETHOD SetTextTransform(const nsAReadableString& aTextTransform) { return _to SetTextTransform(aTextTransform); } \ - NS_IMETHOD GetTop(nsAWritableString& aTop) { return _to GetTop(aTop); } \ - NS_IMETHOD SetTop(const nsAReadableString& aTop) { return _to SetTop(aTop); } \ - NS_IMETHOD GetUnicodeBidi(nsAWritableString& aUnicodeBidi) { return _to GetUnicodeBidi(aUnicodeBidi); } \ - NS_IMETHOD SetUnicodeBidi(const nsAReadableString& aUnicodeBidi) { return _to SetUnicodeBidi(aUnicodeBidi); } \ - NS_IMETHOD GetVerticalAlign(nsAWritableString& aVerticalAlign) { return _to GetVerticalAlign(aVerticalAlign); } \ - NS_IMETHOD SetVerticalAlign(const nsAReadableString& aVerticalAlign) { return _to SetVerticalAlign(aVerticalAlign); } \ - NS_IMETHOD GetVisibility(nsAWritableString& aVisibility) { return _to GetVisibility(aVisibility); } \ - NS_IMETHOD SetVisibility(const nsAReadableString& aVisibility) { return _to SetVisibility(aVisibility); } \ - NS_IMETHOD GetVoiceFamily(nsAWritableString& aVoiceFamily) { return _to GetVoiceFamily(aVoiceFamily); } \ - NS_IMETHOD SetVoiceFamily(const nsAReadableString& aVoiceFamily) { return _to SetVoiceFamily(aVoiceFamily); } \ - NS_IMETHOD GetVolume(nsAWritableString& aVolume) { return _to GetVolume(aVolume); } \ - NS_IMETHOD SetVolume(const nsAReadableString& aVolume) { return _to SetVolume(aVolume); } \ - NS_IMETHOD GetWhiteSpace(nsAWritableString& aWhiteSpace) { return _to GetWhiteSpace(aWhiteSpace); } \ - NS_IMETHOD SetWhiteSpace(const nsAReadableString& aWhiteSpace) { return _to SetWhiteSpace(aWhiteSpace); } \ - NS_IMETHOD GetWidows(nsAWritableString& aWidows) { return _to GetWidows(aWidows); } \ - NS_IMETHOD SetWidows(const nsAReadableString& aWidows) { return _to SetWidows(aWidows); } \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth) { return _to GetWidth(aWidth); } \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth) { return _to SetWidth(aWidth); } \ - NS_IMETHOD GetWordSpacing(nsAWritableString& aWordSpacing) { return _to GetWordSpacing(aWordSpacing); } \ - NS_IMETHOD SetWordSpacing(const nsAReadableString& aWordSpacing) { return _to SetWordSpacing(aWordSpacing); } \ - NS_IMETHOD GetZIndex(nsAWritableString& aZIndex) { return _to GetZIndex(aZIndex); } \ - NS_IMETHOD SetZIndex(const nsAReadableString& aZIndex) { return _to SetZIndex(aZIndex); } \ - NS_IMETHOD GetBehavior(nsAWritableString& aBehavior) { return _to GetBehavior(aBehavior); } \ - NS_IMETHOD SetBehavior(const nsAReadableString& aBehavior) { return _to SetBehavior(aBehavior); } \ - NS_IMETHOD GetOpacity(nsAWritableString& aOpacity) { return _to GetOpacity(aOpacity); } \ - NS_IMETHOD SetOpacity(const nsAReadableString& aOpacity) { return _to SetOpacity(aOpacity); } \ + NS_IMETHOD GetAzimuth(nsString& aAzimuth) { return _to GetAzimuth(aAzimuth); } \ + NS_IMETHOD SetAzimuth(const nsString& aAzimuth) { return _to SetAzimuth(aAzimuth); } \ + NS_IMETHOD GetBackground(nsString& aBackground) { return _to GetBackground(aBackground); } \ + NS_IMETHOD SetBackground(const nsString& aBackground) { return _to SetBackground(aBackground); } \ + NS_IMETHOD GetBackgroundAttachment(nsString& aBackgroundAttachment) { return _to GetBackgroundAttachment(aBackgroundAttachment); } \ + NS_IMETHOD SetBackgroundAttachment(const nsString& aBackgroundAttachment) { return _to SetBackgroundAttachment(aBackgroundAttachment); } \ + NS_IMETHOD GetBackgroundColor(nsString& aBackgroundColor) { return _to GetBackgroundColor(aBackgroundColor); } \ + NS_IMETHOD SetBackgroundColor(const nsString& aBackgroundColor) { return _to SetBackgroundColor(aBackgroundColor); } \ + NS_IMETHOD GetBackgroundImage(nsString& aBackgroundImage) { return _to GetBackgroundImage(aBackgroundImage); } \ + NS_IMETHOD SetBackgroundImage(const nsString& aBackgroundImage) { return _to SetBackgroundImage(aBackgroundImage); } \ + NS_IMETHOD GetBackgroundPosition(nsString& aBackgroundPosition) { return _to GetBackgroundPosition(aBackgroundPosition); } \ + NS_IMETHOD SetBackgroundPosition(const nsString& aBackgroundPosition) { return _to SetBackgroundPosition(aBackgroundPosition); } \ + NS_IMETHOD GetBackgroundRepeat(nsString& aBackgroundRepeat) { return _to GetBackgroundRepeat(aBackgroundRepeat); } \ + NS_IMETHOD SetBackgroundRepeat(const nsString& aBackgroundRepeat) { return _to SetBackgroundRepeat(aBackgroundRepeat); } \ + NS_IMETHOD GetBorder(nsString& aBorder) { return _to GetBorder(aBorder); } \ + NS_IMETHOD SetBorder(const nsString& aBorder) { return _to SetBorder(aBorder); } \ + NS_IMETHOD GetBorderCollapse(nsString& aBorderCollapse) { return _to GetBorderCollapse(aBorderCollapse); } \ + NS_IMETHOD SetBorderCollapse(const nsString& aBorderCollapse) { return _to SetBorderCollapse(aBorderCollapse); } \ + NS_IMETHOD GetBorderColor(nsString& aBorderColor) { return _to GetBorderColor(aBorderColor); } \ + NS_IMETHOD SetBorderColor(const nsString& aBorderColor) { return _to SetBorderColor(aBorderColor); } \ + NS_IMETHOD GetBorderSpacing(nsString& aBorderSpacing) { return _to GetBorderSpacing(aBorderSpacing); } \ + NS_IMETHOD SetBorderSpacing(const nsString& aBorderSpacing) { return _to SetBorderSpacing(aBorderSpacing); } \ + NS_IMETHOD GetBorderStyle(nsString& aBorderStyle) { return _to GetBorderStyle(aBorderStyle); } \ + NS_IMETHOD SetBorderStyle(const nsString& aBorderStyle) { return _to SetBorderStyle(aBorderStyle); } \ + NS_IMETHOD GetBorderTop(nsString& aBorderTop) { return _to GetBorderTop(aBorderTop); } \ + NS_IMETHOD SetBorderTop(const nsString& aBorderTop) { return _to SetBorderTop(aBorderTop); } \ + NS_IMETHOD GetBorderRight(nsString& aBorderRight) { return _to GetBorderRight(aBorderRight); } \ + NS_IMETHOD SetBorderRight(const nsString& aBorderRight) { return _to SetBorderRight(aBorderRight); } \ + NS_IMETHOD GetBorderBottom(nsString& aBorderBottom) { return _to GetBorderBottom(aBorderBottom); } \ + NS_IMETHOD SetBorderBottom(const nsString& aBorderBottom) { return _to SetBorderBottom(aBorderBottom); } \ + NS_IMETHOD GetBorderLeft(nsString& aBorderLeft) { return _to GetBorderLeft(aBorderLeft); } \ + NS_IMETHOD SetBorderLeft(const nsString& aBorderLeft) { return _to SetBorderLeft(aBorderLeft); } \ + NS_IMETHOD GetBorderTopColor(nsString& aBorderTopColor) { return _to GetBorderTopColor(aBorderTopColor); } \ + NS_IMETHOD SetBorderTopColor(const nsString& aBorderTopColor) { return _to SetBorderTopColor(aBorderTopColor); } \ + NS_IMETHOD GetBorderRightColor(nsString& aBorderRightColor) { return _to GetBorderRightColor(aBorderRightColor); } \ + NS_IMETHOD SetBorderRightColor(const nsString& aBorderRightColor) { return _to SetBorderRightColor(aBorderRightColor); } \ + NS_IMETHOD GetBorderBottomColor(nsString& aBorderBottomColor) { return _to GetBorderBottomColor(aBorderBottomColor); } \ + NS_IMETHOD SetBorderBottomColor(const nsString& aBorderBottomColor) { return _to SetBorderBottomColor(aBorderBottomColor); } \ + NS_IMETHOD GetBorderLeftColor(nsString& aBorderLeftColor) { return _to GetBorderLeftColor(aBorderLeftColor); } \ + NS_IMETHOD SetBorderLeftColor(const nsString& aBorderLeftColor) { return _to SetBorderLeftColor(aBorderLeftColor); } \ + NS_IMETHOD GetBorderTopStyle(nsString& aBorderTopStyle) { return _to GetBorderTopStyle(aBorderTopStyle); } \ + NS_IMETHOD SetBorderTopStyle(const nsString& aBorderTopStyle) { return _to SetBorderTopStyle(aBorderTopStyle); } \ + NS_IMETHOD GetBorderRightStyle(nsString& aBorderRightStyle) { return _to GetBorderRightStyle(aBorderRightStyle); } \ + NS_IMETHOD SetBorderRightStyle(const nsString& aBorderRightStyle) { return _to SetBorderRightStyle(aBorderRightStyle); } \ + NS_IMETHOD GetBorderBottomStyle(nsString& aBorderBottomStyle) { return _to GetBorderBottomStyle(aBorderBottomStyle); } \ + NS_IMETHOD SetBorderBottomStyle(const nsString& aBorderBottomStyle) { return _to SetBorderBottomStyle(aBorderBottomStyle); } \ + NS_IMETHOD GetBorderLeftStyle(nsString& aBorderLeftStyle) { return _to GetBorderLeftStyle(aBorderLeftStyle); } \ + NS_IMETHOD SetBorderLeftStyle(const nsString& aBorderLeftStyle) { return _to SetBorderLeftStyle(aBorderLeftStyle); } \ + NS_IMETHOD GetBorderTopWidth(nsString& aBorderTopWidth) { return _to GetBorderTopWidth(aBorderTopWidth); } \ + NS_IMETHOD SetBorderTopWidth(const nsString& aBorderTopWidth) { return _to SetBorderTopWidth(aBorderTopWidth); } \ + NS_IMETHOD GetBorderRightWidth(nsString& aBorderRightWidth) { return _to GetBorderRightWidth(aBorderRightWidth); } \ + NS_IMETHOD SetBorderRightWidth(const nsString& aBorderRightWidth) { return _to SetBorderRightWidth(aBorderRightWidth); } \ + NS_IMETHOD GetBorderBottomWidth(nsString& aBorderBottomWidth) { return _to GetBorderBottomWidth(aBorderBottomWidth); } \ + NS_IMETHOD SetBorderBottomWidth(const nsString& aBorderBottomWidth) { return _to SetBorderBottomWidth(aBorderBottomWidth); } \ + NS_IMETHOD GetBorderLeftWidth(nsString& aBorderLeftWidth) { return _to GetBorderLeftWidth(aBorderLeftWidth); } \ + NS_IMETHOD SetBorderLeftWidth(const nsString& aBorderLeftWidth) { return _to SetBorderLeftWidth(aBorderLeftWidth); } \ + NS_IMETHOD GetBorderWidth(nsString& aBorderWidth) { return _to GetBorderWidth(aBorderWidth); } \ + NS_IMETHOD SetBorderWidth(const nsString& aBorderWidth) { return _to SetBorderWidth(aBorderWidth); } \ + NS_IMETHOD GetBottom(nsString& aBottom) { return _to GetBottom(aBottom); } \ + NS_IMETHOD SetBottom(const nsString& aBottom) { return _to SetBottom(aBottom); } \ + NS_IMETHOD GetCaptionSide(nsString& aCaptionSide) { return _to GetCaptionSide(aCaptionSide); } \ + NS_IMETHOD SetCaptionSide(const nsString& aCaptionSide) { return _to SetCaptionSide(aCaptionSide); } \ + NS_IMETHOD GetClear(nsString& aClear) { return _to GetClear(aClear); } \ + NS_IMETHOD SetClear(const nsString& aClear) { return _to SetClear(aClear); } \ + NS_IMETHOD GetClip(nsString& aClip) { return _to GetClip(aClip); } \ + NS_IMETHOD SetClip(const nsString& aClip) { return _to SetClip(aClip); } \ + NS_IMETHOD GetColor(nsString& aColor) { return _to GetColor(aColor); } \ + NS_IMETHOD SetColor(const nsString& aColor) { return _to SetColor(aColor); } \ + NS_IMETHOD GetContent(nsString& aContent) { return _to GetContent(aContent); } \ + NS_IMETHOD SetContent(const nsString& aContent) { return _to SetContent(aContent); } \ + NS_IMETHOD GetCounterIncrement(nsString& aCounterIncrement) { return _to GetCounterIncrement(aCounterIncrement); } \ + NS_IMETHOD SetCounterIncrement(const nsString& aCounterIncrement) { return _to SetCounterIncrement(aCounterIncrement); } \ + NS_IMETHOD GetCounterReset(nsString& aCounterReset) { return _to GetCounterReset(aCounterReset); } \ + NS_IMETHOD SetCounterReset(const nsString& aCounterReset) { return _to SetCounterReset(aCounterReset); } \ + NS_IMETHOD GetCue(nsString& aCue) { return _to GetCue(aCue); } \ + NS_IMETHOD SetCue(const nsString& aCue) { return _to SetCue(aCue); } \ + NS_IMETHOD GetCueAfter(nsString& aCueAfter) { return _to GetCueAfter(aCueAfter); } \ + NS_IMETHOD SetCueAfter(const nsString& aCueAfter) { return _to SetCueAfter(aCueAfter); } \ + NS_IMETHOD GetCueBefore(nsString& aCueBefore) { return _to GetCueBefore(aCueBefore); } \ + NS_IMETHOD SetCueBefore(const nsString& aCueBefore) { return _to SetCueBefore(aCueBefore); } \ + NS_IMETHOD GetCursor(nsString& aCursor) { return _to GetCursor(aCursor); } \ + NS_IMETHOD SetCursor(const nsString& aCursor) { return _to SetCursor(aCursor); } \ + NS_IMETHOD GetDirection(nsString& aDirection) { return _to GetDirection(aDirection); } \ + NS_IMETHOD SetDirection(const nsString& aDirection) { return _to SetDirection(aDirection); } \ + NS_IMETHOD GetDisplay(nsString& aDisplay) { return _to GetDisplay(aDisplay); } \ + NS_IMETHOD SetDisplay(const nsString& aDisplay) { return _to SetDisplay(aDisplay); } \ + NS_IMETHOD GetElevation(nsString& aElevation) { return _to GetElevation(aElevation); } \ + NS_IMETHOD SetElevation(const nsString& aElevation) { return _to SetElevation(aElevation); } \ + NS_IMETHOD GetEmptyCells(nsString& aEmptyCells) { return _to GetEmptyCells(aEmptyCells); } \ + NS_IMETHOD SetEmptyCells(const nsString& aEmptyCells) { return _to SetEmptyCells(aEmptyCells); } \ + NS_IMETHOD GetCssFloat(nsString& aCssFloat) { return _to GetCssFloat(aCssFloat); } \ + NS_IMETHOD SetCssFloat(const nsString& aCssFloat) { return _to SetCssFloat(aCssFloat); } \ + NS_IMETHOD GetFont(nsString& aFont) { return _to GetFont(aFont); } \ + NS_IMETHOD SetFont(const nsString& aFont) { return _to SetFont(aFont); } \ + NS_IMETHOD GetFontFamily(nsString& aFontFamily) { return _to GetFontFamily(aFontFamily); } \ + NS_IMETHOD SetFontFamily(const nsString& aFontFamily) { return _to SetFontFamily(aFontFamily); } \ + NS_IMETHOD GetFontSize(nsString& aFontSize) { return _to GetFontSize(aFontSize); } \ + NS_IMETHOD SetFontSize(const nsString& aFontSize) { return _to SetFontSize(aFontSize); } \ + NS_IMETHOD GetFontSizeAdjust(nsString& aFontSizeAdjust) { return _to GetFontSizeAdjust(aFontSizeAdjust); } \ + NS_IMETHOD SetFontSizeAdjust(const nsString& aFontSizeAdjust) { return _to SetFontSizeAdjust(aFontSizeAdjust); } \ + NS_IMETHOD GetFontStretch(nsString& aFontStretch) { return _to GetFontStretch(aFontStretch); } \ + NS_IMETHOD SetFontStretch(const nsString& aFontStretch) { return _to SetFontStretch(aFontStretch); } \ + NS_IMETHOD GetFontStyle(nsString& aFontStyle) { return _to GetFontStyle(aFontStyle); } \ + NS_IMETHOD SetFontStyle(const nsString& aFontStyle) { return _to SetFontStyle(aFontStyle); } \ + NS_IMETHOD GetFontVariant(nsString& aFontVariant) { return _to GetFontVariant(aFontVariant); } \ + NS_IMETHOD SetFontVariant(const nsString& aFontVariant) { return _to SetFontVariant(aFontVariant); } \ + NS_IMETHOD GetFontWeight(nsString& aFontWeight) { return _to GetFontWeight(aFontWeight); } \ + NS_IMETHOD SetFontWeight(const nsString& aFontWeight) { return _to SetFontWeight(aFontWeight); } \ + NS_IMETHOD GetHeight(nsString& aHeight) { return _to GetHeight(aHeight); } \ + NS_IMETHOD SetHeight(const nsString& aHeight) { return _to SetHeight(aHeight); } \ + NS_IMETHOD GetLeft(nsString& aLeft) { return _to GetLeft(aLeft); } \ + NS_IMETHOD SetLeft(const nsString& aLeft) { return _to SetLeft(aLeft); } \ + NS_IMETHOD GetLetterSpacing(nsString& aLetterSpacing) { return _to GetLetterSpacing(aLetterSpacing); } \ + NS_IMETHOD SetLetterSpacing(const nsString& aLetterSpacing) { return _to SetLetterSpacing(aLetterSpacing); } \ + NS_IMETHOD GetLineHeight(nsString& aLineHeight) { return _to GetLineHeight(aLineHeight); } \ + NS_IMETHOD SetLineHeight(const nsString& aLineHeight) { return _to SetLineHeight(aLineHeight); } \ + NS_IMETHOD GetListStyle(nsString& aListStyle) { return _to GetListStyle(aListStyle); } \ + NS_IMETHOD SetListStyle(const nsString& aListStyle) { return _to SetListStyle(aListStyle); } \ + NS_IMETHOD GetListStyleImage(nsString& aListStyleImage) { return _to GetListStyleImage(aListStyleImage); } \ + NS_IMETHOD SetListStyleImage(const nsString& aListStyleImage) { return _to SetListStyleImage(aListStyleImage); } \ + NS_IMETHOD GetListStylePosition(nsString& aListStylePosition) { return _to GetListStylePosition(aListStylePosition); } \ + NS_IMETHOD SetListStylePosition(const nsString& aListStylePosition) { return _to SetListStylePosition(aListStylePosition); } \ + NS_IMETHOD GetListStyleType(nsString& aListStyleType) { return _to GetListStyleType(aListStyleType); } \ + NS_IMETHOD SetListStyleType(const nsString& aListStyleType) { return _to SetListStyleType(aListStyleType); } \ + NS_IMETHOD GetMargin(nsString& aMargin) { return _to GetMargin(aMargin); } \ + NS_IMETHOD SetMargin(const nsString& aMargin) { return _to SetMargin(aMargin); } \ + NS_IMETHOD GetMarginTop(nsString& aMarginTop) { return _to GetMarginTop(aMarginTop); } \ + NS_IMETHOD SetMarginTop(const nsString& aMarginTop) { return _to SetMarginTop(aMarginTop); } \ + NS_IMETHOD GetMarginRight(nsString& aMarginRight) { return _to GetMarginRight(aMarginRight); } \ + NS_IMETHOD SetMarginRight(const nsString& aMarginRight) { return _to SetMarginRight(aMarginRight); } \ + NS_IMETHOD GetMarginBottom(nsString& aMarginBottom) { return _to GetMarginBottom(aMarginBottom); } \ + NS_IMETHOD SetMarginBottom(const nsString& aMarginBottom) { return _to SetMarginBottom(aMarginBottom); } \ + NS_IMETHOD GetMarginLeft(nsString& aMarginLeft) { return _to GetMarginLeft(aMarginLeft); } \ + NS_IMETHOD SetMarginLeft(const nsString& aMarginLeft) { return _to SetMarginLeft(aMarginLeft); } \ + NS_IMETHOD GetMarkerOffset(nsString& aMarkerOffset) { return _to GetMarkerOffset(aMarkerOffset); } \ + NS_IMETHOD SetMarkerOffset(const nsString& aMarkerOffset) { return _to SetMarkerOffset(aMarkerOffset); } \ + NS_IMETHOD GetMarks(nsString& aMarks) { return _to GetMarks(aMarks); } \ + NS_IMETHOD SetMarks(const nsString& aMarks) { return _to SetMarks(aMarks); } \ + NS_IMETHOD GetMaxHeight(nsString& aMaxHeight) { return _to GetMaxHeight(aMaxHeight); } \ + NS_IMETHOD SetMaxHeight(const nsString& aMaxHeight) { return _to SetMaxHeight(aMaxHeight); } \ + NS_IMETHOD GetMaxWidth(nsString& aMaxWidth) { return _to GetMaxWidth(aMaxWidth); } \ + NS_IMETHOD SetMaxWidth(const nsString& aMaxWidth) { return _to SetMaxWidth(aMaxWidth); } \ + NS_IMETHOD GetMinHeight(nsString& aMinHeight) { return _to GetMinHeight(aMinHeight); } \ + NS_IMETHOD SetMinHeight(const nsString& aMinHeight) { return _to SetMinHeight(aMinHeight); } \ + NS_IMETHOD GetMinWidth(nsString& aMinWidth) { return _to GetMinWidth(aMinWidth); } \ + NS_IMETHOD SetMinWidth(const nsString& aMinWidth) { return _to SetMinWidth(aMinWidth); } \ + NS_IMETHOD GetOrphans(nsString& aOrphans) { return _to GetOrphans(aOrphans); } \ + NS_IMETHOD SetOrphans(const nsString& aOrphans) { return _to SetOrphans(aOrphans); } \ + NS_IMETHOD GetOutline(nsString& aOutline) { return _to GetOutline(aOutline); } \ + NS_IMETHOD SetOutline(const nsString& aOutline) { return _to SetOutline(aOutline); } \ + NS_IMETHOD GetOutlineColor(nsString& aOutlineColor) { return _to GetOutlineColor(aOutlineColor); } \ + NS_IMETHOD SetOutlineColor(const nsString& aOutlineColor) { return _to SetOutlineColor(aOutlineColor); } \ + NS_IMETHOD GetOutlineStyle(nsString& aOutlineStyle) { return _to GetOutlineStyle(aOutlineStyle); } \ + NS_IMETHOD SetOutlineStyle(const nsString& aOutlineStyle) { return _to SetOutlineStyle(aOutlineStyle); } \ + NS_IMETHOD GetOutlineWidth(nsString& aOutlineWidth) { return _to GetOutlineWidth(aOutlineWidth); } \ + NS_IMETHOD SetOutlineWidth(const nsString& aOutlineWidth) { return _to SetOutlineWidth(aOutlineWidth); } \ + NS_IMETHOD GetOverflow(nsString& aOverflow) { return _to GetOverflow(aOverflow); } \ + NS_IMETHOD SetOverflow(const nsString& aOverflow) { return _to SetOverflow(aOverflow); } \ + NS_IMETHOD GetPadding(nsString& aPadding) { return _to GetPadding(aPadding); } \ + NS_IMETHOD SetPadding(const nsString& aPadding) { return _to SetPadding(aPadding); } \ + NS_IMETHOD GetPaddingTop(nsString& aPaddingTop) { return _to GetPaddingTop(aPaddingTop); } \ + NS_IMETHOD SetPaddingTop(const nsString& aPaddingTop) { return _to SetPaddingTop(aPaddingTop); } \ + NS_IMETHOD GetPaddingRight(nsString& aPaddingRight) { return _to GetPaddingRight(aPaddingRight); } \ + NS_IMETHOD SetPaddingRight(const nsString& aPaddingRight) { return _to SetPaddingRight(aPaddingRight); } \ + NS_IMETHOD GetPaddingBottom(nsString& aPaddingBottom) { return _to GetPaddingBottom(aPaddingBottom); } \ + NS_IMETHOD SetPaddingBottom(const nsString& aPaddingBottom) { return _to SetPaddingBottom(aPaddingBottom); } \ + NS_IMETHOD GetPaddingLeft(nsString& aPaddingLeft) { return _to GetPaddingLeft(aPaddingLeft); } \ + NS_IMETHOD SetPaddingLeft(const nsString& aPaddingLeft) { return _to SetPaddingLeft(aPaddingLeft); } \ + NS_IMETHOD GetPage(nsString& aPage) { return _to GetPage(aPage); } \ + NS_IMETHOD SetPage(const nsString& aPage) { return _to SetPage(aPage); } \ + NS_IMETHOD GetPageBreakAfter(nsString& aPageBreakAfter) { return _to GetPageBreakAfter(aPageBreakAfter); } \ + NS_IMETHOD SetPageBreakAfter(const nsString& aPageBreakAfter) { return _to SetPageBreakAfter(aPageBreakAfter); } \ + NS_IMETHOD GetPageBreakBefore(nsString& aPageBreakBefore) { return _to GetPageBreakBefore(aPageBreakBefore); } \ + NS_IMETHOD SetPageBreakBefore(const nsString& aPageBreakBefore) { return _to SetPageBreakBefore(aPageBreakBefore); } \ + NS_IMETHOD GetPageBreakInside(nsString& aPageBreakInside) { return _to GetPageBreakInside(aPageBreakInside); } \ + NS_IMETHOD SetPageBreakInside(const nsString& aPageBreakInside) { return _to SetPageBreakInside(aPageBreakInside); } \ + NS_IMETHOD GetPause(nsString& aPause) { return _to GetPause(aPause); } \ + NS_IMETHOD SetPause(const nsString& aPause) { return _to SetPause(aPause); } \ + NS_IMETHOD GetPauseAfter(nsString& aPauseAfter) { return _to GetPauseAfter(aPauseAfter); } \ + NS_IMETHOD SetPauseAfter(const nsString& aPauseAfter) { return _to SetPauseAfter(aPauseAfter); } \ + NS_IMETHOD GetPauseBefore(nsString& aPauseBefore) { return _to GetPauseBefore(aPauseBefore); } \ + NS_IMETHOD SetPauseBefore(const nsString& aPauseBefore) { return _to SetPauseBefore(aPauseBefore); } \ + NS_IMETHOD GetPitch(nsString& aPitch) { return _to GetPitch(aPitch); } \ + NS_IMETHOD SetPitch(const nsString& aPitch) { return _to SetPitch(aPitch); } \ + NS_IMETHOD GetPitchRange(nsString& aPitchRange) { return _to GetPitchRange(aPitchRange); } \ + NS_IMETHOD SetPitchRange(const nsString& aPitchRange) { return _to SetPitchRange(aPitchRange); } \ + NS_IMETHOD GetPlayDuring(nsString& aPlayDuring) { return _to GetPlayDuring(aPlayDuring); } \ + NS_IMETHOD SetPlayDuring(const nsString& aPlayDuring) { return _to SetPlayDuring(aPlayDuring); } \ + NS_IMETHOD GetPosition(nsString& aPosition) { return _to GetPosition(aPosition); } \ + NS_IMETHOD SetPosition(const nsString& aPosition) { return _to SetPosition(aPosition); } \ + NS_IMETHOD GetQuotes(nsString& aQuotes) { return _to GetQuotes(aQuotes); } \ + NS_IMETHOD SetQuotes(const nsString& aQuotes) { return _to SetQuotes(aQuotes); } \ + NS_IMETHOD GetRichness(nsString& aRichness) { return _to GetRichness(aRichness); } \ + NS_IMETHOD SetRichness(const nsString& aRichness) { return _to SetRichness(aRichness); } \ + NS_IMETHOD GetRight(nsString& aRight) { return _to GetRight(aRight); } \ + NS_IMETHOD SetRight(const nsString& aRight) { return _to SetRight(aRight); } \ + NS_IMETHOD GetSize(nsString& aSize) { return _to GetSize(aSize); } \ + NS_IMETHOD SetSize(const nsString& aSize) { return _to SetSize(aSize); } \ + NS_IMETHOD GetSpeak(nsString& aSpeak) { return _to GetSpeak(aSpeak); } \ + NS_IMETHOD SetSpeak(const nsString& aSpeak) { return _to SetSpeak(aSpeak); } \ + NS_IMETHOD GetSpeakHeader(nsString& aSpeakHeader) { return _to GetSpeakHeader(aSpeakHeader); } \ + NS_IMETHOD SetSpeakHeader(const nsString& aSpeakHeader) { return _to SetSpeakHeader(aSpeakHeader); } \ + NS_IMETHOD GetSpeakNumeral(nsString& aSpeakNumeral) { return _to GetSpeakNumeral(aSpeakNumeral); } \ + NS_IMETHOD SetSpeakNumeral(const nsString& aSpeakNumeral) { return _to SetSpeakNumeral(aSpeakNumeral); } \ + NS_IMETHOD GetSpeakPunctuation(nsString& aSpeakPunctuation) { return _to GetSpeakPunctuation(aSpeakPunctuation); } \ + NS_IMETHOD SetSpeakPunctuation(const nsString& aSpeakPunctuation) { return _to SetSpeakPunctuation(aSpeakPunctuation); } \ + NS_IMETHOD GetSpeechRate(nsString& aSpeechRate) { return _to GetSpeechRate(aSpeechRate); } \ + NS_IMETHOD SetSpeechRate(const nsString& aSpeechRate) { return _to SetSpeechRate(aSpeechRate); } \ + NS_IMETHOD GetStress(nsString& aStress) { return _to GetStress(aStress); } \ + NS_IMETHOD SetStress(const nsString& aStress) { return _to SetStress(aStress); } \ + NS_IMETHOD GetTableLayout(nsString& aTableLayout) { return _to GetTableLayout(aTableLayout); } \ + NS_IMETHOD SetTableLayout(const nsString& aTableLayout) { return _to SetTableLayout(aTableLayout); } \ + NS_IMETHOD GetTextAlign(nsString& aTextAlign) { return _to GetTextAlign(aTextAlign); } \ + NS_IMETHOD SetTextAlign(const nsString& aTextAlign) { return _to SetTextAlign(aTextAlign); } \ + NS_IMETHOD GetTextDecoration(nsString& aTextDecoration) { return _to GetTextDecoration(aTextDecoration); } \ + NS_IMETHOD SetTextDecoration(const nsString& aTextDecoration) { return _to SetTextDecoration(aTextDecoration); } \ + NS_IMETHOD GetTextIndent(nsString& aTextIndent) { return _to GetTextIndent(aTextIndent); } \ + NS_IMETHOD SetTextIndent(const nsString& aTextIndent) { return _to SetTextIndent(aTextIndent); } \ + NS_IMETHOD GetTextShadow(nsString& aTextShadow) { return _to GetTextShadow(aTextShadow); } \ + NS_IMETHOD SetTextShadow(const nsString& aTextShadow) { return _to SetTextShadow(aTextShadow); } \ + NS_IMETHOD GetTextTransform(nsString& aTextTransform) { return _to GetTextTransform(aTextTransform); } \ + NS_IMETHOD SetTextTransform(const nsString& aTextTransform) { return _to SetTextTransform(aTextTransform); } \ + NS_IMETHOD GetTop(nsString& aTop) { return _to GetTop(aTop); } \ + NS_IMETHOD SetTop(const nsString& aTop) { return _to SetTop(aTop); } \ + NS_IMETHOD GetUnicodeBidi(nsString& aUnicodeBidi) { return _to GetUnicodeBidi(aUnicodeBidi); } \ + NS_IMETHOD SetUnicodeBidi(const nsString& aUnicodeBidi) { return _to SetUnicodeBidi(aUnicodeBidi); } \ + NS_IMETHOD GetVerticalAlign(nsString& aVerticalAlign) { return _to GetVerticalAlign(aVerticalAlign); } \ + NS_IMETHOD SetVerticalAlign(const nsString& aVerticalAlign) { return _to SetVerticalAlign(aVerticalAlign); } \ + NS_IMETHOD GetVisibility(nsString& aVisibility) { return _to GetVisibility(aVisibility); } \ + NS_IMETHOD SetVisibility(const nsString& aVisibility) { return _to SetVisibility(aVisibility); } \ + NS_IMETHOD GetVoiceFamily(nsString& aVoiceFamily) { return _to GetVoiceFamily(aVoiceFamily); } \ + NS_IMETHOD SetVoiceFamily(const nsString& aVoiceFamily) { return _to SetVoiceFamily(aVoiceFamily); } \ + NS_IMETHOD GetVolume(nsString& aVolume) { return _to GetVolume(aVolume); } \ + NS_IMETHOD SetVolume(const nsString& aVolume) { return _to SetVolume(aVolume); } \ + NS_IMETHOD GetWhiteSpace(nsString& aWhiteSpace) { return _to GetWhiteSpace(aWhiteSpace); } \ + NS_IMETHOD SetWhiteSpace(const nsString& aWhiteSpace) { return _to SetWhiteSpace(aWhiteSpace); } \ + NS_IMETHOD GetWidows(nsString& aWidows) { return _to GetWidows(aWidows); } \ + NS_IMETHOD SetWidows(const nsString& aWidows) { return _to SetWidows(aWidows); } \ + NS_IMETHOD GetWidth(nsString& aWidth) { return _to GetWidth(aWidth); } \ + NS_IMETHOD SetWidth(const nsString& aWidth) { return _to SetWidth(aWidth); } \ + NS_IMETHOD GetWordSpacing(nsString& aWordSpacing) { return _to GetWordSpacing(aWordSpacing); } \ + NS_IMETHOD SetWordSpacing(const nsString& aWordSpacing) { return _to SetWordSpacing(aWordSpacing); } \ + NS_IMETHOD GetZIndex(nsString& aZIndex) { return _to GetZIndex(aZIndex); } \ + NS_IMETHOD SetZIndex(const nsString& aZIndex) { return _to SetZIndex(aZIndex); } \ + NS_IMETHOD GetBehavior(nsString& aBehavior) { return _to GetBehavior(aBehavior); } \ + NS_IMETHOD SetBehavior(const nsString& aBehavior) { return _to SetBehavior(aBehavior); } \ + NS_IMETHOD GetOpacity(nsString& aOpacity) { return _to GetOpacity(aOpacity); } \ + NS_IMETHOD SetOpacity(const nsString& aOpacity) { return _to SetOpacity(aOpacity); } \ extern "C" NS_DOM nsresult NS_InitCSS2PropertiesClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/css/nsIDOMCSSImportRule.h b/dom/public/css/nsIDOMCSSImportRule.h index 3793c3376c4..dc76e4c2822 100644 --- a/dom/public/css/nsIDOMCSSImportRule.h +++ b/dom/public/css/nsIDOMCSSImportRule.h @@ -40,7 +40,7 @@ class nsIDOMCSSImportRule : public nsIDOMCSSRule { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSIMPORTRULE_IID; return iid; } - NS_IMETHOD GetHref(nsAWritableString& aHref)=0; + NS_IMETHOD GetHref(nsString& aHref)=0; NS_IMETHOD GetMedia(nsIDOMMediaList** aMedia)=0; @@ -49,14 +49,14 @@ public: #define NS_DECL_IDOMCSSIMPORTRULE \ - NS_IMETHOD GetHref(nsAWritableString& aHref); \ + NS_IMETHOD GetHref(nsString& aHref); \ NS_IMETHOD GetMedia(nsIDOMMediaList** aMedia); \ NS_IMETHOD GetStyleSheet(nsIDOMCSSStyleSheet** aStyleSheet); \ #define NS_FORWARD_IDOMCSSIMPORTRULE(_to) \ - NS_IMETHOD GetHref(nsAWritableString& aHref) { return _to GetHref(aHref); } \ + NS_IMETHOD GetHref(nsString& aHref) { return _to GetHref(aHref); } \ NS_IMETHOD GetMedia(nsIDOMMediaList** aMedia) { return _to GetMedia(aMedia); } \ NS_IMETHOD GetStyleSheet(nsIDOMCSSStyleSheet** aStyleSheet) { return _to GetStyleSheet(aStyleSheet); } \ diff --git a/dom/public/css/nsIDOMCSSMediaRule.h b/dom/public/css/nsIDOMCSSMediaRule.h index e66b8b49c11..5a8a286e116 100644 --- a/dom/public/css/nsIDOMCSSMediaRule.h +++ b/dom/public/css/nsIDOMCSSMediaRule.h @@ -44,7 +44,7 @@ public: NS_IMETHOD GetCssRules(nsIDOMCSSRuleList** aCssRules)=0; - NS_IMETHOD InsertRule(const nsAReadableString& aRule, PRUint32 aIndex, PRUint32* aReturn)=0; + NS_IMETHOD InsertRule(const nsString& aRule, PRUint32 aIndex, PRUint32* aReturn)=0; NS_IMETHOD DeleteRule(PRUint32 aIndex)=0; }; @@ -53,7 +53,7 @@ public: #define NS_DECL_IDOMCSSMEDIARULE \ NS_IMETHOD GetMedia(nsIDOMMediaList** aMedia); \ NS_IMETHOD GetCssRules(nsIDOMCSSRuleList** aCssRules); \ - NS_IMETHOD InsertRule(const nsAReadableString& aRule, PRUint32 aIndex, PRUint32* aReturn); \ + NS_IMETHOD InsertRule(const nsString& aRule, PRUint32 aIndex, PRUint32* aReturn); \ NS_IMETHOD DeleteRule(PRUint32 aIndex); \ @@ -61,7 +61,7 @@ public: #define NS_FORWARD_IDOMCSSMEDIARULE(_to) \ NS_IMETHOD GetMedia(nsIDOMMediaList** aMedia) { return _to GetMedia(aMedia); } \ NS_IMETHOD GetCssRules(nsIDOMCSSRuleList** aCssRules) { return _to GetCssRules(aCssRules); } \ - NS_IMETHOD InsertRule(const nsAReadableString& aRule, PRUint32 aIndex, PRUint32* aReturn) { return _to InsertRule(aRule, aIndex, aReturn); } \ + NS_IMETHOD InsertRule(const nsString& aRule, PRUint32 aIndex, PRUint32* aReturn) { return _to InsertRule(aRule, aIndex, aReturn); } \ NS_IMETHOD DeleteRule(PRUint32 aIndex) { return _to DeleteRule(aIndex); } \ diff --git a/dom/public/css/nsIDOMCSSPageRule.h b/dom/public/css/nsIDOMCSSPageRule.h index 7e91a6ad392..d8349dcd192 100644 --- a/dom/public/css/nsIDOMCSSPageRule.h +++ b/dom/public/css/nsIDOMCSSPageRule.h @@ -39,23 +39,23 @@ class nsIDOMCSSPageRule : public nsIDOMCSSRule { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSPAGERULE_IID; return iid; } - NS_IMETHOD GetSelectorText(nsAWritableString& aSelectorText)=0; - NS_IMETHOD SetSelectorText(const nsAReadableString& aSelectorText)=0; + NS_IMETHOD GetSelectorText(nsString& aSelectorText)=0; + NS_IMETHOD SetSelectorText(const nsString& aSelectorText)=0; NS_IMETHOD GetStyle(nsIDOMCSSStyleDeclaration** aStyle)=0; }; #define NS_DECL_IDOMCSSPAGERULE \ - NS_IMETHOD GetSelectorText(nsAWritableString& aSelectorText); \ - NS_IMETHOD SetSelectorText(const nsAReadableString& aSelectorText); \ + NS_IMETHOD GetSelectorText(nsString& aSelectorText); \ + NS_IMETHOD SetSelectorText(const nsString& aSelectorText); \ NS_IMETHOD GetStyle(nsIDOMCSSStyleDeclaration** aStyle); \ #define NS_FORWARD_IDOMCSSPAGERULE(_to) \ - NS_IMETHOD GetSelectorText(nsAWritableString& aSelectorText) { return _to GetSelectorText(aSelectorText); } \ - NS_IMETHOD SetSelectorText(const nsAReadableString& aSelectorText) { return _to SetSelectorText(aSelectorText); } \ + NS_IMETHOD GetSelectorText(nsString& aSelectorText) { return _to GetSelectorText(aSelectorText); } \ + NS_IMETHOD SetSelectorText(const nsString& aSelectorText) { return _to SetSelectorText(aSelectorText); } \ NS_IMETHOD GetStyle(nsIDOMCSSStyleDeclaration** aStyle) { return _to GetStyle(aStyle); } \ diff --git a/dom/public/css/nsIDOMCSSPrimitiveValue.h b/dom/public/css/nsIDOMCSSPrimitiveValue.h index 852c7e85f9c..f57bfe8a04e 100644 --- a/dom/public/css/nsIDOMCSSPrimitiveValue.h +++ b/dom/public/css/nsIDOMCSSPrimitiveValue.h @@ -75,9 +75,9 @@ public: NS_IMETHOD GetFloatValue(PRUint16 aUnitType, float* aReturn)=0; - NS_IMETHOD SetStringValue(PRUint16 aStringType, const nsAReadableString& aStringValue)=0; + NS_IMETHOD SetStringValue(PRUint16 aStringType, const nsString& aStringValue)=0; - NS_IMETHOD GetStringValue(nsAWritableString& aReturn)=0; + NS_IMETHOD GetStringValue(nsString& aReturn)=0; NS_IMETHOD GetCounterValue(nsIDOMCounter** aReturn)=0; @@ -91,8 +91,8 @@ public: NS_IMETHOD GetPrimitiveType(PRUint16* aPrimitiveType); \ NS_IMETHOD SetFloatValue(PRUint16 aUnitType, float aFloatValue); \ NS_IMETHOD GetFloatValue(PRUint16 aUnitType, float* aReturn); \ - NS_IMETHOD SetStringValue(PRUint16 aStringType, const nsAReadableString& aStringValue); \ - NS_IMETHOD GetStringValue(nsAWritableString& aReturn); \ + NS_IMETHOD SetStringValue(PRUint16 aStringType, const nsString& aStringValue); \ + NS_IMETHOD GetStringValue(nsString& aReturn); \ NS_IMETHOD GetCounterValue(nsIDOMCounter** aReturn); \ NS_IMETHOD GetRectValue(nsIDOMRect** aReturn); \ NS_IMETHOD GetRGBColorValue(nsIDOMRGBColor** aReturn); \ @@ -103,8 +103,8 @@ public: NS_IMETHOD GetPrimitiveType(PRUint16* aPrimitiveType) { return _to GetPrimitiveType(aPrimitiveType); } \ NS_IMETHOD SetFloatValue(PRUint16 aUnitType, float aFloatValue) { return _to SetFloatValue(aUnitType, aFloatValue); } \ NS_IMETHOD GetFloatValue(PRUint16 aUnitType, float* aReturn) { return _to GetFloatValue(aUnitType, aReturn); } \ - NS_IMETHOD SetStringValue(PRUint16 aStringType, const nsAReadableString& aStringValue) { return _to SetStringValue(aStringType, aStringValue); } \ - NS_IMETHOD GetStringValue(nsAWritableString& aReturn) { return _to GetStringValue(aReturn); } \ + NS_IMETHOD SetStringValue(PRUint16 aStringType, const nsString& aStringValue) { return _to SetStringValue(aStringType, aStringValue); } \ + NS_IMETHOD GetStringValue(nsString& aReturn) { return _to GetStringValue(aReturn); } \ NS_IMETHOD GetCounterValue(nsIDOMCounter** aReturn) { return _to GetCounterValue(aReturn); } \ NS_IMETHOD GetRectValue(nsIDOMRect** aReturn) { return _to GetRectValue(aReturn); } \ NS_IMETHOD GetRGBColorValue(nsIDOMRGBColor** aReturn) { return _to GetRGBColorValue(aReturn); } \ diff --git a/dom/public/css/nsIDOMCSSRule.h b/dom/public/css/nsIDOMCSSRule.h index 18562f2d13c..c9db31f0a91 100644 --- a/dom/public/css/nsIDOMCSSRule.h +++ b/dom/public/css/nsIDOMCSSRule.h @@ -50,8 +50,8 @@ public: NS_IMETHOD GetType(PRUint16* aType)=0; - NS_IMETHOD GetCssText(nsAWritableString& aCssText)=0; - NS_IMETHOD SetCssText(const nsAReadableString& aCssText)=0; + NS_IMETHOD GetCssText(nsString& aCssText)=0; + NS_IMETHOD SetCssText(const nsString& aCssText)=0; NS_IMETHOD GetParentStyleSheet(nsIDOMCSSStyleSheet** aParentStyleSheet)=0; @@ -61,8 +61,8 @@ public: #define NS_DECL_IDOMCSSRULE \ NS_IMETHOD GetType(PRUint16* aType); \ - NS_IMETHOD GetCssText(nsAWritableString& aCssText); \ - NS_IMETHOD SetCssText(const nsAReadableString& aCssText); \ + NS_IMETHOD GetCssText(nsString& aCssText); \ + NS_IMETHOD SetCssText(const nsString& aCssText); \ NS_IMETHOD GetParentStyleSheet(nsIDOMCSSStyleSheet** aParentStyleSheet); \ NS_IMETHOD GetParentRule(nsIDOMCSSRule** aParentRule); \ @@ -70,8 +70,8 @@ public: #define NS_FORWARD_IDOMCSSRULE(_to) \ NS_IMETHOD GetType(PRUint16* aType) { return _to GetType(aType); } \ - NS_IMETHOD GetCssText(nsAWritableString& aCssText) { return _to GetCssText(aCssText); } \ - NS_IMETHOD SetCssText(const nsAReadableString& aCssText) { return _to SetCssText(aCssText); } \ + NS_IMETHOD GetCssText(nsString& aCssText) { return _to GetCssText(aCssText); } \ + NS_IMETHOD SetCssText(const nsString& aCssText) { return _to SetCssText(aCssText); } \ NS_IMETHOD GetParentStyleSheet(nsIDOMCSSStyleSheet** aParentStyleSheet) { return _to GetParentStyleSheet(aParentStyleSheet); } \ NS_IMETHOD GetParentRule(nsIDOMCSSRule** aParentRule) { return _to GetParentRule(aParentRule); } \ diff --git a/dom/public/css/nsIDOMCSSStyleDeclaration.h b/dom/public/css/nsIDOMCSSStyleDeclaration.h index 81ef5ab2a65..35ef3c2f92a 100644 --- a/dom/public/css/nsIDOMCSSStyleDeclaration.h +++ b/dom/public/css/nsIDOMCSSStyleDeclaration.h @@ -39,52 +39,52 @@ class nsIDOMCSSStyleDeclaration : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSSTYLEDECLARATION_IID; return iid; } - NS_IMETHOD GetCssText(nsAWritableString& aCssText)=0; - NS_IMETHOD SetCssText(const nsAReadableString& aCssText)=0; + NS_IMETHOD GetCssText(nsString& aCssText)=0; + NS_IMETHOD SetCssText(const nsString& aCssText)=0; NS_IMETHOD GetLength(PRUint32* aLength)=0; NS_IMETHOD GetParentRule(nsIDOMCSSRule** aParentRule)=0; - NS_IMETHOD GetPropertyValue(const nsAReadableString& aPropertyName, nsAWritableString& aReturn)=0; + NS_IMETHOD GetPropertyValue(const nsString& aPropertyName, nsString& aReturn)=0; - NS_IMETHOD GetPropertyCSSValue(const nsAReadableString& aPropertyName, nsIDOMCSSValue** aReturn)=0; + NS_IMETHOD GetPropertyCSSValue(const nsString& aPropertyName, nsIDOMCSSValue** aReturn)=0; - NS_IMETHOD RemoveProperty(const nsAReadableString& aPropertyName, nsAWritableString& aReturn)=0; + NS_IMETHOD RemoveProperty(const nsString& aPropertyName, nsString& aReturn)=0; - NS_IMETHOD GetPropertyPriority(const nsAReadableString& aPropertyName, nsAWritableString& aReturn)=0; + NS_IMETHOD GetPropertyPriority(const nsString& aPropertyName, nsString& aReturn)=0; - NS_IMETHOD SetProperty(const nsAReadableString& aPropertyName, const nsAReadableString& aValue, const nsAReadableString& aPriority)=0; + NS_IMETHOD SetProperty(const nsString& aPropertyName, const nsString& aValue, const nsString& aPriority)=0; - NS_IMETHOD Item(PRUint32 aIndex, nsAWritableString& aReturn)=0; + NS_IMETHOD Item(PRUint32 aIndex, nsString& aReturn)=0; }; #define NS_DECL_IDOMCSSSTYLEDECLARATION \ - NS_IMETHOD GetCssText(nsAWritableString& aCssText); \ - NS_IMETHOD SetCssText(const nsAReadableString& aCssText); \ + NS_IMETHOD GetCssText(nsString& aCssText); \ + NS_IMETHOD SetCssText(const nsString& aCssText); \ NS_IMETHOD GetLength(PRUint32* aLength); \ NS_IMETHOD GetParentRule(nsIDOMCSSRule** aParentRule); \ - NS_IMETHOD GetPropertyValue(const nsAReadableString& aPropertyName, nsAWritableString& aReturn); \ - NS_IMETHOD GetPropertyCSSValue(const nsAReadableString& aPropertyName, nsIDOMCSSValue** aReturn); \ - NS_IMETHOD RemoveProperty(const nsAReadableString& aPropertyName, nsAWritableString& aReturn); \ - NS_IMETHOD GetPropertyPriority(const nsAReadableString& aPropertyName, nsAWritableString& aReturn); \ - NS_IMETHOD SetProperty(const nsAReadableString& aPropertyName, const nsAReadableString& aValue, const nsAReadableString& aPriority); \ - NS_IMETHOD Item(PRUint32 aIndex, nsAWritableString& aReturn); \ + NS_IMETHOD GetPropertyValue(const nsString& aPropertyName, nsString& aReturn); \ + NS_IMETHOD GetPropertyCSSValue(const nsString& aPropertyName, nsIDOMCSSValue** aReturn); \ + NS_IMETHOD RemoveProperty(const nsString& aPropertyName, nsString& aReturn); \ + NS_IMETHOD GetPropertyPriority(const nsString& aPropertyName, nsString& aReturn); \ + NS_IMETHOD SetProperty(const nsString& aPropertyName, const nsString& aValue, const nsString& aPriority); \ + NS_IMETHOD Item(PRUint32 aIndex, nsString& aReturn); \ #define NS_FORWARD_IDOMCSSSTYLEDECLARATION(_to) \ - NS_IMETHOD GetCssText(nsAWritableString& aCssText) { return _to GetCssText(aCssText); } \ - NS_IMETHOD SetCssText(const nsAReadableString& aCssText) { return _to SetCssText(aCssText); } \ + NS_IMETHOD GetCssText(nsString& aCssText) { return _to GetCssText(aCssText); } \ + NS_IMETHOD SetCssText(const nsString& aCssText) { return _to SetCssText(aCssText); } \ NS_IMETHOD GetLength(PRUint32* aLength) { return _to GetLength(aLength); } \ NS_IMETHOD GetParentRule(nsIDOMCSSRule** aParentRule) { return _to GetParentRule(aParentRule); } \ - NS_IMETHOD GetPropertyValue(const nsAReadableString& aPropertyName, nsAWritableString& aReturn) { return _to GetPropertyValue(aPropertyName, aReturn); } \ - NS_IMETHOD GetPropertyCSSValue(const nsAReadableString& aPropertyName, nsIDOMCSSValue** aReturn) { return _to GetPropertyCSSValue(aPropertyName, aReturn); } \ - NS_IMETHOD RemoveProperty(const nsAReadableString& aPropertyName, nsAWritableString& aReturn) { return _to RemoveProperty(aPropertyName, aReturn); } \ - NS_IMETHOD GetPropertyPriority(const nsAReadableString& aPropertyName, nsAWritableString& aReturn) { return _to GetPropertyPriority(aPropertyName, aReturn); } \ - NS_IMETHOD SetProperty(const nsAReadableString& aPropertyName, const nsAReadableString& aValue, const nsAReadableString& aPriority) { return _to SetProperty(aPropertyName, aValue, aPriority); } \ - NS_IMETHOD Item(PRUint32 aIndex, nsAWritableString& aReturn) { return _to Item(aIndex, aReturn); } \ + NS_IMETHOD GetPropertyValue(const nsString& aPropertyName, nsString& aReturn) { return _to GetPropertyValue(aPropertyName, aReturn); } \ + NS_IMETHOD GetPropertyCSSValue(const nsString& aPropertyName, nsIDOMCSSValue** aReturn) { return _to GetPropertyCSSValue(aPropertyName, aReturn); } \ + NS_IMETHOD RemoveProperty(const nsString& aPropertyName, nsString& aReturn) { return _to RemoveProperty(aPropertyName, aReturn); } \ + NS_IMETHOD GetPropertyPriority(const nsString& aPropertyName, nsString& aReturn) { return _to GetPropertyPriority(aPropertyName, aReturn); } \ + NS_IMETHOD SetProperty(const nsString& aPropertyName, const nsString& aValue, const nsString& aPriority) { return _to SetProperty(aPropertyName, aValue, aPriority); } \ + NS_IMETHOD Item(PRUint32 aIndex, nsString& aReturn) { return _to Item(aIndex, aReturn); } \ extern "C" NS_DOM nsresult NS_InitCSSStyleDeclarationClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/css/nsIDOMCSSStyleRule.h b/dom/public/css/nsIDOMCSSStyleRule.h index 02651b04324..15126371eac 100644 --- a/dom/public/css/nsIDOMCSSStyleRule.h +++ b/dom/public/css/nsIDOMCSSStyleRule.h @@ -39,23 +39,23 @@ class nsIDOMCSSStyleRule : public nsIDOMCSSRule { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMCSSSTYLERULE_IID; return iid; } - NS_IMETHOD GetSelectorText(nsAWritableString& aSelectorText)=0; - NS_IMETHOD SetSelectorText(const nsAReadableString& aSelectorText)=0; + NS_IMETHOD GetSelectorText(nsString& aSelectorText)=0; + NS_IMETHOD SetSelectorText(const nsString& aSelectorText)=0; NS_IMETHOD GetStyle(nsIDOMCSSStyleDeclaration** aStyle)=0; }; #define NS_DECL_IDOMCSSSTYLERULE \ - NS_IMETHOD GetSelectorText(nsAWritableString& aSelectorText); \ - NS_IMETHOD SetSelectorText(const nsAReadableString& aSelectorText); \ + NS_IMETHOD GetSelectorText(nsString& aSelectorText); \ + NS_IMETHOD SetSelectorText(const nsString& aSelectorText); \ NS_IMETHOD GetStyle(nsIDOMCSSStyleDeclaration** aStyle); \ #define NS_FORWARD_IDOMCSSSTYLERULE(_to) \ - NS_IMETHOD GetSelectorText(nsAWritableString& aSelectorText) { return _to GetSelectorText(aSelectorText); } \ - NS_IMETHOD SetSelectorText(const nsAReadableString& aSelectorText) { return _to SetSelectorText(aSelectorText); } \ + NS_IMETHOD GetSelectorText(nsString& aSelectorText) { return _to GetSelectorText(aSelectorText); } \ + NS_IMETHOD SetSelectorText(const nsString& aSelectorText) { return _to SetSelectorText(aSelectorText); } \ NS_IMETHOD GetStyle(nsIDOMCSSStyleDeclaration** aStyle) { return _to GetStyle(aStyle); } \ diff --git a/dom/public/css/nsIDOMCSSStyleSheet.h b/dom/public/css/nsIDOMCSSStyleSheet.h index 8939f79c624..32aabd1966e 100644 --- a/dom/public/css/nsIDOMCSSStyleSheet.h +++ b/dom/public/css/nsIDOMCSSStyleSheet.h @@ -44,7 +44,7 @@ public: NS_IMETHOD GetCssRules(nsIDOMCSSRuleList** aCssRules)=0; - NS_IMETHOD InsertRule(const nsAReadableString& aRule, PRUint32 aIndex, PRUint32* aReturn)=0; + NS_IMETHOD InsertRule(const nsString& aRule, PRUint32 aIndex, PRUint32* aReturn)=0; NS_IMETHOD DeleteRule(PRUint32 aIndex)=0; }; @@ -53,7 +53,7 @@ public: #define NS_DECL_IDOMCSSSTYLESHEET \ NS_IMETHOD GetOwnerRule(nsIDOMCSSRule** aOwnerRule); \ NS_IMETHOD GetCssRules(nsIDOMCSSRuleList** aCssRules); \ - NS_IMETHOD InsertRule(const nsAReadableString& aRule, PRUint32 aIndex, PRUint32* aReturn); \ + NS_IMETHOD InsertRule(const nsString& aRule, PRUint32 aIndex, PRUint32* aReturn); \ NS_IMETHOD DeleteRule(PRUint32 aIndex); \ @@ -61,7 +61,7 @@ public: #define NS_FORWARD_IDOMCSSSTYLESHEET(_to) \ NS_IMETHOD GetOwnerRule(nsIDOMCSSRule** aOwnerRule) { return _to GetOwnerRule(aOwnerRule); } \ NS_IMETHOD GetCssRules(nsIDOMCSSRuleList** aCssRules) { return _to GetCssRules(aCssRules); } \ - NS_IMETHOD InsertRule(const nsAReadableString& aRule, PRUint32 aIndex, PRUint32* aReturn) { return _to InsertRule(aRule, aIndex, aReturn); } \ + NS_IMETHOD InsertRule(const nsString& aRule, PRUint32 aIndex, PRUint32* aReturn) { return _to InsertRule(aRule, aIndex, aReturn); } \ NS_IMETHOD DeleteRule(PRUint32 aIndex) { return _to DeleteRule(aIndex); } \ diff --git a/dom/public/css/nsIDOMCSSValue.h b/dom/public/css/nsIDOMCSSValue.h index 81a085053c6..86db54ecf61 100644 --- a/dom/public/css/nsIDOMCSSValue.h +++ b/dom/public/css/nsIDOMCSSValue.h @@ -43,23 +43,23 @@ public: CSS_CUSTOM = 3 }; - NS_IMETHOD GetCssText(nsAWritableString& aCssText)=0; - NS_IMETHOD SetCssText(const nsAReadableString& aCssText)=0; + NS_IMETHOD GetCssText(nsString& aCssText)=0; + NS_IMETHOD SetCssText(const nsString& aCssText)=0; NS_IMETHOD GetValueType(PRUint16* aValueType)=0; }; #define NS_DECL_IDOMCSSVALUE \ - NS_IMETHOD GetCssText(nsAWritableString& aCssText); \ - NS_IMETHOD SetCssText(const nsAReadableString& aCssText); \ + NS_IMETHOD GetCssText(nsString& aCssText); \ + NS_IMETHOD SetCssText(const nsString& aCssText); \ NS_IMETHOD GetValueType(PRUint16* aValueType); \ #define NS_FORWARD_IDOMCSSVALUE(_to) \ - NS_IMETHOD GetCssText(nsAWritableString& aCssText) { return _to GetCssText(aCssText); } \ - NS_IMETHOD SetCssText(const nsAReadableString& aCssText) { return _to SetCssText(aCssText); } \ + NS_IMETHOD GetCssText(nsString& aCssText) { return _to GetCssText(aCssText); } \ + NS_IMETHOD SetCssText(const nsString& aCssText) { return _to SetCssText(aCssText); } \ NS_IMETHOD GetValueType(PRUint16* aValueType) { return _to GetValueType(aValueType); } \ diff --git a/dom/public/css/nsIDOMCounter.h b/dom/public/css/nsIDOMCounter.h index cfdb7123be5..a4e11bd1ec3 100644 --- a/dom/public/css/nsIDOMCounter.h +++ b/dom/public/css/nsIDOMCounter.h @@ -37,25 +37,25 @@ class nsIDOMCounter : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMCOUNTER_IID; return iid; } - NS_IMETHOD GetIdentifier(nsAWritableString& aIdentifier)=0; + NS_IMETHOD GetIdentifier(nsString& aIdentifier)=0; - NS_IMETHOD GetListStyle(nsAWritableString& aListStyle)=0; + NS_IMETHOD GetListStyle(nsString& aListStyle)=0; - NS_IMETHOD GetSeparator(nsAWritableString& aSeparator)=0; + NS_IMETHOD GetSeparator(nsString& aSeparator)=0; }; #define NS_DECL_IDOMCOUNTER \ - NS_IMETHOD GetIdentifier(nsAWritableString& aIdentifier); \ - NS_IMETHOD GetListStyle(nsAWritableString& aListStyle); \ - NS_IMETHOD GetSeparator(nsAWritableString& aSeparator); \ + NS_IMETHOD GetIdentifier(nsString& aIdentifier); \ + NS_IMETHOD GetListStyle(nsString& aListStyle); \ + NS_IMETHOD GetSeparator(nsString& aSeparator); \ #define NS_FORWARD_IDOMCOUNTER(_to) \ - NS_IMETHOD GetIdentifier(nsAWritableString& aIdentifier) { return _to GetIdentifier(aIdentifier); } \ - NS_IMETHOD GetListStyle(nsAWritableString& aListStyle) { return _to GetListStyle(aListStyle); } \ - NS_IMETHOD GetSeparator(nsAWritableString& aSeparator) { return _to GetSeparator(aSeparator); } \ + NS_IMETHOD GetIdentifier(nsString& aIdentifier) { return _to GetIdentifier(aIdentifier); } \ + NS_IMETHOD GetListStyle(nsString& aListStyle) { return _to GetListStyle(aListStyle); } \ + NS_IMETHOD GetSeparator(nsString& aSeparator) { return _to GetSeparator(aSeparator); } \ extern "C" NS_DOM nsresult NS_InitCounterClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLAnchorElement.h b/dom/public/html/nsIDOMHTMLAnchorElement.h index 07403798c1c..56352b00ec2 100644 --- a/dom/public/html/nsIDOMHTMLAnchorElement.h +++ b/dom/public/html/nsIDOMHTMLAnchorElement.h @@ -38,41 +38,41 @@ class nsIDOMHTMLAnchorElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLANCHORELEMENT_IID; return iid; } - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey)=0; - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey)=0; + NS_IMETHOD GetAccessKey(nsString& aAccessKey)=0; + NS_IMETHOD SetAccessKey(const nsString& aAccessKey)=0; - NS_IMETHOD GetCharset(nsAWritableString& aCharset)=0; - NS_IMETHOD SetCharset(const nsAReadableString& aCharset)=0; + NS_IMETHOD GetCharset(nsString& aCharset)=0; + NS_IMETHOD SetCharset(const nsString& aCharset)=0; - NS_IMETHOD GetCoords(nsAWritableString& aCoords)=0; - NS_IMETHOD SetCoords(const nsAReadableString& aCoords)=0; + NS_IMETHOD GetCoords(nsString& aCoords)=0; + NS_IMETHOD SetCoords(const nsString& aCoords)=0; - NS_IMETHOD GetHref(nsAWritableString& aHref)=0; - NS_IMETHOD SetHref(const nsAReadableString& aHref)=0; + NS_IMETHOD GetHref(nsString& aHref)=0; + NS_IMETHOD SetHref(const nsString& aHref)=0; - NS_IMETHOD GetHreflang(nsAWritableString& aHreflang)=0; - NS_IMETHOD SetHreflang(const nsAReadableString& aHreflang)=0; + NS_IMETHOD GetHreflang(nsString& aHreflang)=0; + NS_IMETHOD SetHreflang(const nsString& aHreflang)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; - NS_IMETHOD GetRel(nsAWritableString& aRel)=0; - NS_IMETHOD SetRel(const nsAReadableString& aRel)=0; + NS_IMETHOD GetRel(nsString& aRel)=0; + NS_IMETHOD SetRel(const nsString& aRel)=0; - NS_IMETHOD GetRev(nsAWritableString& aRev)=0; - NS_IMETHOD SetRev(const nsAReadableString& aRev)=0; + NS_IMETHOD GetRev(nsString& aRev)=0; + NS_IMETHOD SetRev(const nsString& aRev)=0; - NS_IMETHOD GetShape(nsAWritableString& aShape)=0; - NS_IMETHOD SetShape(const nsAReadableString& aShape)=0; + NS_IMETHOD GetShape(nsString& aShape)=0; + NS_IMETHOD SetShape(const nsString& aShape)=0; NS_IMETHOD GetTabIndex(PRInt32* aTabIndex)=0; NS_IMETHOD SetTabIndex(PRInt32 aTabIndex)=0; - NS_IMETHOD GetTarget(nsAWritableString& aTarget)=0; - NS_IMETHOD SetTarget(const nsAReadableString& aTarget)=0; + NS_IMETHOD GetTarget(nsString& aTarget)=0; + NS_IMETHOD SetTarget(const nsString& aTarget)=0; - NS_IMETHOD GetType(nsAWritableString& aType)=0; - NS_IMETHOD SetType(const nsAReadableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; + NS_IMETHOD SetType(const nsString& aType)=0; NS_IMETHOD Blur()=0; @@ -81,60 +81,60 @@ public: #define NS_DECL_IDOMHTMLANCHORELEMENT \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey); \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey); \ - NS_IMETHOD GetCharset(nsAWritableString& aCharset); \ - NS_IMETHOD SetCharset(const nsAReadableString& aCharset); \ - NS_IMETHOD GetCoords(nsAWritableString& aCoords); \ - NS_IMETHOD SetCoords(const nsAReadableString& aCoords); \ - NS_IMETHOD GetHref(nsAWritableString& aHref); \ - NS_IMETHOD SetHref(const nsAReadableString& aHref); \ - NS_IMETHOD GetHreflang(nsAWritableString& aHreflang); \ - NS_IMETHOD SetHreflang(const nsAReadableString& aHreflang); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ - NS_IMETHOD GetRel(nsAWritableString& aRel); \ - NS_IMETHOD SetRel(const nsAReadableString& aRel); \ - NS_IMETHOD GetRev(nsAWritableString& aRev); \ - NS_IMETHOD SetRev(const nsAReadableString& aRev); \ - NS_IMETHOD GetShape(nsAWritableString& aShape); \ - NS_IMETHOD SetShape(const nsAReadableString& aShape); \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey); \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey); \ + NS_IMETHOD GetCharset(nsString& aCharset); \ + NS_IMETHOD SetCharset(const nsString& aCharset); \ + NS_IMETHOD GetCoords(nsString& aCoords); \ + NS_IMETHOD SetCoords(const nsString& aCoords); \ + NS_IMETHOD GetHref(nsString& aHref); \ + NS_IMETHOD SetHref(const nsString& aHref); \ + NS_IMETHOD GetHreflang(nsString& aHreflang); \ + NS_IMETHOD SetHreflang(const nsString& aHreflang); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ + NS_IMETHOD GetRel(nsString& aRel); \ + NS_IMETHOD SetRel(const nsString& aRel); \ + NS_IMETHOD GetRev(nsString& aRev); \ + NS_IMETHOD SetRev(const nsString& aRev); \ + NS_IMETHOD GetShape(nsString& aShape); \ + NS_IMETHOD SetShape(const nsString& aShape); \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex); \ NS_IMETHOD SetTabIndex(PRInt32 aTabIndex); \ - NS_IMETHOD GetTarget(nsAWritableString& aTarget); \ - NS_IMETHOD SetTarget(const nsAReadableString& aTarget); \ - NS_IMETHOD GetType(nsAWritableString& aType); \ - NS_IMETHOD SetType(const nsAReadableString& aType); \ + NS_IMETHOD GetTarget(nsString& aTarget); \ + NS_IMETHOD SetTarget(const nsString& aTarget); \ + NS_IMETHOD GetType(nsString& aType); \ + NS_IMETHOD SetType(const nsString& aType); \ NS_IMETHOD Blur(); \ NS_IMETHOD Focus(); \ #define NS_FORWARD_IDOMHTMLANCHORELEMENT(_to) \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ - NS_IMETHOD GetCharset(nsAWritableString& aCharset) { return _to GetCharset(aCharset); } \ - NS_IMETHOD SetCharset(const nsAReadableString& aCharset) { return _to SetCharset(aCharset); } \ - NS_IMETHOD GetCoords(nsAWritableString& aCoords) { return _to GetCoords(aCoords); } \ - NS_IMETHOD SetCoords(const nsAReadableString& aCoords) { return _to SetCoords(aCoords); } \ - NS_IMETHOD GetHref(nsAWritableString& aHref) { return _to GetHref(aHref); } \ - NS_IMETHOD SetHref(const nsAReadableString& aHref) { return _to SetHref(aHref); } \ - NS_IMETHOD GetHreflang(nsAWritableString& aHreflang) { return _to GetHreflang(aHreflang); } \ - NS_IMETHOD SetHreflang(const nsAReadableString& aHreflang) { return _to SetHreflang(aHreflang); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ - NS_IMETHOD GetRel(nsAWritableString& aRel) { return _to GetRel(aRel); } \ - NS_IMETHOD SetRel(const nsAReadableString& aRel) { return _to SetRel(aRel); } \ - NS_IMETHOD GetRev(nsAWritableString& aRev) { return _to GetRev(aRev); } \ - NS_IMETHOD SetRev(const nsAReadableString& aRev) { return _to SetRev(aRev); } \ - NS_IMETHOD GetShape(nsAWritableString& aShape) { return _to GetShape(aShape); } \ - NS_IMETHOD SetShape(const nsAReadableString& aShape) { return _to SetShape(aShape); } \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ + NS_IMETHOD GetCharset(nsString& aCharset) { return _to GetCharset(aCharset); } \ + NS_IMETHOD SetCharset(const nsString& aCharset) { return _to SetCharset(aCharset); } \ + NS_IMETHOD GetCoords(nsString& aCoords) { return _to GetCoords(aCoords); } \ + NS_IMETHOD SetCoords(const nsString& aCoords) { return _to SetCoords(aCoords); } \ + NS_IMETHOD GetHref(nsString& aHref) { return _to GetHref(aHref); } \ + NS_IMETHOD SetHref(const nsString& aHref) { return _to SetHref(aHref); } \ + NS_IMETHOD GetHreflang(nsString& aHreflang) { return _to GetHreflang(aHreflang); } \ + NS_IMETHOD SetHreflang(const nsString& aHreflang) { return _to SetHreflang(aHreflang); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetRel(nsString& aRel) { return _to GetRel(aRel); } \ + NS_IMETHOD SetRel(const nsString& aRel) { return _to SetRel(aRel); } \ + NS_IMETHOD GetRev(nsString& aRev) { return _to GetRev(aRev); } \ + NS_IMETHOD SetRev(const nsString& aRev) { return _to SetRev(aRev); } \ + NS_IMETHOD GetShape(nsString& aShape) { return _to GetShape(aShape); } \ + NS_IMETHOD SetShape(const nsString& aShape) { return _to SetShape(aShape); } \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex) { return _to GetTabIndex(aTabIndex); } \ NS_IMETHOD SetTabIndex(PRInt32 aTabIndex) { return _to SetTabIndex(aTabIndex); } \ - NS_IMETHOD GetTarget(nsAWritableString& aTarget) { return _to GetTarget(aTarget); } \ - NS_IMETHOD SetTarget(const nsAReadableString& aTarget) { return _to SetTarget(aTarget); } \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ - NS_IMETHOD SetType(const nsAReadableString& aType) { return _to SetType(aType); } \ + NS_IMETHOD GetTarget(nsString& aTarget) { return _to GetTarget(aTarget); } \ + NS_IMETHOD SetTarget(const nsString& aTarget) { return _to SetTarget(aTarget); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ + NS_IMETHOD SetType(const nsString& aType) { return _to SetType(aType); } \ NS_IMETHOD Blur() { return _to Blur(); } \ NS_IMETHOD Focus() { return _to Focus(); } \ diff --git a/dom/public/html/nsIDOMHTMLAppletElement.h b/dom/public/html/nsIDOMHTMLAppletElement.h index d31795160b4..fd8eeafa3fe 100644 --- a/dom/public/html/nsIDOMHTMLAppletElement.h +++ b/dom/public/html/nsIDOMHTMLAppletElement.h @@ -38,90 +38,90 @@ class nsIDOMHTMLAppletElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLAPPLETELEMENT_IID; return iid; } - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; - NS_IMETHOD GetAlt(nsAWritableString& aAlt)=0; - NS_IMETHOD SetAlt(const nsAReadableString& aAlt)=0; + NS_IMETHOD GetAlt(nsString& aAlt)=0; + NS_IMETHOD SetAlt(const nsString& aAlt)=0; - NS_IMETHOD GetArchive(nsAWritableString& aArchive)=0; - NS_IMETHOD SetArchive(const nsAReadableString& aArchive)=0; + NS_IMETHOD GetArchive(nsString& aArchive)=0; + NS_IMETHOD SetArchive(const nsString& aArchive)=0; - NS_IMETHOD GetCode(nsAWritableString& aCode)=0; - NS_IMETHOD SetCode(const nsAReadableString& aCode)=0; + NS_IMETHOD GetCode(nsString& aCode)=0; + NS_IMETHOD SetCode(const nsString& aCode)=0; - NS_IMETHOD GetCodeBase(nsAWritableString& aCodeBase)=0; - NS_IMETHOD SetCodeBase(const nsAReadableString& aCodeBase)=0; + NS_IMETHOD GetCodeBase(nsString& aCodeBase)=0; + NS_IMETHOD SetCodeBase(const nsString& aCodeBase)=0; - NS_IMETHOD GetHeight(nsAWritableString& aHeight)=0; - NS_IMETHOD SetHeight(const nsAReadableString& aHeight)=0; + NS_IMETHOD GetHeight(nsString& aHeight)=0; + NS_IMETHOD SetHeight(const nsString& aHeight)=0; - NS_IMETHOD GetHspace(nsAWritableString& aHspace)=0; - NS_IMETHOD SetHspace(const nsAReadableString& aHspace)=0; + NS_IMETHOD GetHspace(nsString& aHspace)=0; + NS_IMETHOD SetHspace(const nsString& aHspace)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; - NS_IMETHOD GetObject(nsAWritableString& aObject)=0; - NS_IMETHOD SetObject(const nsAReadableString& aObject)=0; + NS_IMETHOD GetObject(nsString& aObject)=0; + NS_IMETHOD SetObject(const nsString& aObject)=0; - NS_IMETHOD GetVspace(nsAWritableString& aVspace)=0; - NS_IMETHOD SetVspace(const nsAReadableString& aVspace)=0; + NS_IMETHOD GetVspace(nsString& aVspace)=0; + NS_IMETHOD SetVspace(const nsString& aVspace)=0; - NS_IMETHOD GetWidth(nsAWritableString& aWidth)=0; - NS_IMETHOD SetWidth(const nsAReadableString& aWidth)=0; + NS_IMETHOD GetWidth(nsString& aWidth)=0; + NS_IMETHOD SetWidth(const nsString& aWidth)=0; }; #define NS_DECL_IDOMHTMLAPPLETELEMENT \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ - NS_IMETHOD GetAlt(nsAWritableString& aAlt); \ - NS_IMETHOD SetAlt(const nsAReadableString& aAlt); \ - NS_IMETHOD GetArchive(nsAWritableString& aArchive); \ - NS_IMETHOD SetArchive(const nsAReadableString& aArchive); \ - NS_IMETHOD GetCode(nsAWritableString& aCode); \ - NS_IMETHOD SetCode(const nsAReadableString& aCode); \ - NS_IMETHOD GetCodeBase(nsAWritableString& aCodeBase); \ - NS_IMETHOD SetCodeBase(const nsAReadableString& aCodeBase); \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight); \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight); \ - NS_IMETHOD GetHspace(nsAWritableString& aHspace); \ - NS_IMETHOD SetHspace(const nsAReadableString& aHspace); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ - NS_IMETHOD GetObject(nsAWritableString& aObject); \ - NS_IMETHOD SetObject(const nsAReadableString& aObject); \ - NS_IMETHOD GetVspace(nsAWritableString& aVspace); \ - NS_IMETHOD SetVspace(const nsAReadableString& aVspace); \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth); \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ + NS_IMETHOD GetAlt(nsString& aAlt); \ + NS_IMETHOD SetAlt(const nsString& aAlt); \ + NS_IMETHOD GetArchive(nsString& aArchive); \ + NS_IMETHOD SetArchive(const nsString& aArchive); \ + NS_IMETHOD GetCode(nsString& aCode); \ + NS_IMETHOD SetCode(const nsString& aCode); \ + NS_IMETHOD GetCodeBase(nsString& aCodeBase); \ + NS_IMETHOD SetCodeBase(const nsString& aCodeBase); \ + NS_IMETHOD GetHeight(nsString& aHeight); \ + NS_IMETHOD SetHeight(const nsString& aHeight); \ + NS_IMETHOD GetHspace(nsString& aHspace); \ + NS_IMETHOD SetHspace(const nsString& aHspace); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ + NS_IMETHOD GetObject(nsString& aObject); \ + NS_IMETHOD SetObject(const nsString& aObject); \ + NS_IMETHOD GetVspace(nsString& aVspace); \ + NS_IMETHOD SetVspace(const nsString& aVspace); \ + NS_IMETHOD GetWidth(nsString& aWidth); \ + NS_IMETHOD SetWidth(const nsString& aWidth); \ #define NS_FORWARD_IDOMHTMLAPPLETELEMENT(_to) \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ - NS_IMETHOD GetAlt(nsAWritableString& aAlt) { return _to GetAlt(aAlt); } \ - NS_IMETHOD SetAlt(const nsAReadableString& aAlt) { return _to SetAlt(aAlt); } \ - NS_IMETHOD GetArchive(nsAWritableString& aArchive) { return _to GetArchive(aArchive); } \ - NS_IMETHOD SetArchive(const nsAReadableString& aArchive) { return _to SetArchive(aArchive); } \ - NS_IMETHOD GetCode(nsAWritableString& aCode) { return _to GetCode(aCode); } \ - NS_IMETHOD SetCode(const nsAReadableString& aCode) { return _to SetCode(aCode); } \ - NS_IMETHOD GetCodeBase(nsAWritableString& aCodeBase) { return _to GetCodeBase(aCodeBase); } \ - NS_IMETHOD SetCodeBase(const nsAReadableString& aCodeBase) { return _to SetCodeBase(aCodeBase); } \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight) { return _to GetHeight(aHeight); } \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight) { return _to SetHeight(aHeight); } \ - NS_IMETHOD GetHspace(nsAWritableString& aHspace) { return _to GetHspace(aHspace); } \ - NS_IMETHOD SetHspace(const nsAReadableString& aHspace) { return _to SetHspace(aHspace); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ - NS_IMETHOD GetObject(nsAWritableString& aObject) { return _to GetObject(aObject); } \ - NS_IMETHOD SetObject(const nsAReadableString& aObject) { return _to SetObject(aObject); } \ - NS_IMETHOD GetVspace(nsAWritableString& aVspace) { return _to GetVspace(aVspace); } \ - NS_IMETHOD SetVspace(const nsAReadableString& aVspace) { return _to SetVspace(aVspace); } \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth) { return _to GetWidth(aWidth); } \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth) { return _to SetWidth(aWidth); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetAlt(nsString& aAlt) { return _to GetAlt(aAlt); } \ + NS_IMETHOD SetAlt(const nsString& aAlt) { return _to SetAlt(aAlt); } \ + NS_IMETHOD GetArchive(nsString& aArchive) { return _to GetArchive(aArchive); } \ + NS_IMETHOD SetArchive(const nsString& aArchive) { return _to SetArchive(aArchive); } \ + NS_IMETHOD GetCode(nsString& aCode) { return _to GetCode(aCode); } \ + NS_IMETHOD SetCode(const nsString& aCode) { return _to SetCode(aCode); } \ + NS_IMETHOD GetCodeBase(nsString& aCodeBase) { return _to GetCodeBase(aCodeBase); } \ + NS_IMETHOD SetCodeBase(const nsString& aCodeBase) { return _to SetCodeBase(aCodeBase); } \ + NS_IMETHOD GetHeight(nsString& aHeight) { return _to GetHeight(aHeight); } \ + NS_IMETHOD SetHeight(const nsString& aHeight) { return _to SetHeight(aHeight); } \ + NS_IMETHOD GetHspace(nsString& aHspace) { return _to GetHspace(aHspace); } \ + NS_IMETHOD SetHspace(const nsString& aHspace) { return _to SetHspace(aHspace); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetObject(nsString& aObject) { return _to GetObject(aObject); } \ + NS_IMETHOD SetObject(const nsString& aObject) { return _to SetObject(aObject); } \ + NS_IMETHOD GetVspace(nsString& aVspace) { return _to GetVspace(aVspace); } \ + NS_IMETHOD SetVspace(const nsString& aVspace) { return _to SetVspace(aVspace); } \ + NS_IMETHOD GetWidth(nsString& aWidth) { return _to GetWidth(aWidth); } \ + NS_IMETHOD SetWidth(const nsString& aWidth) { return _to SetWidth(aWidth); } \ extern "C" NS_DOM nsresult NS_InitHTMLAppletElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLAreaElement.h b/dom/public/html/nsIDOMHTMLAreaElement.h index e21cabed075..8d4083091f5 100644 --- a/dom/public/html/nsIDOMHTMLAreaElement.h +++ b/dom/public/html/nsIDOMHTMLAreaElement.h @@ -38,69 +38,69 @@ class nsIDOMHTMLAreaElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLAREAELEMENT_IID; return iid; } - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey)=0; - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey)=0; + NS_IMETHOD GetAccessKey(nsString& aAccessKey)=0; + NS_IMETHOD SetAccessKey(const nsString& aAccessKey)=0; - NS_IMETHOD GetAlt(nsAWritableString& aAlt)=0; - NS_IMETHOD SetAlt(const nsAReadableString& aAlt)=0; + NS_IMETHOD GetAlt(nsString& aAlt)=0; + NS_IMETHOD SetAlt(const nsString& aAlt)=0; - NS_IMETHOD GetCoords(nsAWritableString& aCoords)=0; - NS_IMETHOD SetCoords(const nsAReadableString& aCoords)=0; + NS_IMETHOD GetCoords(nsString& aCoords)=0; + NS_IMETHOD SetCoords(const nsString& aCoords)=0; - NS_IMETHOD GetHref(nsAWritableString& aHref)=0; - NS_IMETHOD SetHref(const nsAReadableString& aHref)=0; + NS_IMETHOD GetHref(nsString& aHref)=0; + NS_IMETHOD SetHref(const nsString& aHref)=0; NS_IMETHOD GetNoHref(PRBool* aNoHref)=0; NS_IMETHOD SetNoHref(PRBool aNoHref)=0; - NS_IMETHOD GetShape(nsAWritableString& aShape)=0; - NS_IMETHOD SetShape(const nsAReadableString& aShape)=0; + NS_IMETHOD GetShape(nsString& aShape)=0; + NS_IMETHOD SetShape(const nsString& aShape)=0; NS_IMETHOD GetTabIndex(PRInt32* aTabIndex)=0; NS_IMETHOD SetTabIndex(PRInt32 aTabIndex)=0; - NS_IMETHOD GetTarget(nsAWritableString& aTarget)=0; - NS_IMETHOD SetTarget(const nsAReadableString& aTarget)=0; + NS_IMETHOD GetTarget(nsString& aTarget)=0; + NS_IMETHOD SetTarget(const nsString& aTarget)=0; }; #define NS_DECL_IDOMHTMLAREAELEMENT \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey); \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey); \ - NS_IMETHOD GetAlt(nsAWritableString& aAlt); \ - NS_IMETHOD SetAlt(const nsAReadableString& aAlt); \ - NS_IMETHOD GetCoords(nsAWritableString& aCoords); \ - NS_IMETHOD SetCoords(const nsAReadableString& aCoords); \ - NS_IMETHOD GetHref(nsAWritableString& aHref); \ - NS_IMETHOD SetHref(const nsAReadableString& aHref); \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey); \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey); \ + NS_IMETHOD GetAlt(nsString& aAlt); \ + NS_IMETHOD SetAlt(const nsString& aAlt); \ + NS_IMETHOD GetCoords(nsString& aCoords); \ + NS_IMETHOD SetCoords(const nsString& aCoords); \ + NS_IMETHOD GetHref(nsString& aHref); \ + NS_IMETHOD SetHref(const nsString& aHref); \ NS_IMETHOD GetNoHref(PRBool* aNoHref); \ NS_IMETHOD SetNoHref(PRBool aNoHref); \ - NS_IMETHOD GetShape(nsAWritableString& aShape); \ - NS_IMETHOD SetShape(const nsAReadableString& aShape); \ + NS_IMETHOD GetShape(nsString& aShape); \ + NS_IMETHOD SetShape(const nsString& aShape); \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex); \ NS_IMETHOD SetTabIndex(PRInt32 aTabIndex); \ - NS_IMETHOD GetTarget(nsAWritableString& aTarget); \ - NS_IMETHOD SetTarget(const nsAReadableString& aTarget); \ + NS_IMETHOD GetTarget(nsString& aTarget); \ + NS_IMETHOD SetTarget(const nsString& aTarget); \ #define NS_FORWARD_IDOMHTMLAREAELEMENT(_to) \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ - NS_IMETHOD GetAlt(nsAWritableString& aAlt) { return _to GetAlt(aAlt); } \ - NS_IMETHOD SetAlt(const nsAReadableString& aAlt) { return _to SetAlt(aAlt); } \ - NS_IMETHOD GetCoords(nsAWritableString& aCoords) { return _to GetCoords(aCoords); } \ - NS_IMETHOD SetCoords(const nsAReadableString& aCoords) { return _to SetCoords(aCoords); } \ - NS_IMETHOD GetHref(nsAWritableString& aHref) { return _to GetHref(aHref); } \ - NS_IMETHOD SetHref(const nsAReadableString& aHref) { return _to SetHref(aHref); } \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ + NS_IMETHOD GetAlt(nsString& aAlt) { return _to GetAlt(aAlt); } \ + NS_IMETHOD SetAlt(const nsString& aAlt) { return _to SetAlt(aAlt); } \ + NS_IMETHOD GetCoords(nsString& aCoords) { return _to GetCoords(aCoords); } \ + NS_IMETHOD SetCoords(const nsString& aCoords) { return _to SetCoords(aCoords); } \ + NS_IMETHOD GetHref(nsString& aHref) { return _to GetHref(aHref); } \ + NS_IMETHOD SetHref(const nsString& aHref) { return _to SetHref(aHref); } \ NS_IMETHOD GetNoHref(PRBool* aNoHref) { return _to GetNoHref(aNoHref); } \ NS_IMETHOD SetNoHref(PRBool aNoHref) { return _to SetNoHref(aNoHref); } \ - NS_IMETHOD GetShape(nsAWritableString& aShape) { return _to GetShape(aShape); } \ - NS_IMETHOD SetShape(const nsAReadableString& aShape) { return _to SetShape(aShape); } \ + NS_IMETHOD GetShape(nsString& aShape) { return _to GetShape(aShape); } \ + NS_IMETHOD SetShape(const nsString& aShape) { return _to SetShape(aShape); } \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex) { return _to GetTabIndex(aTabIndex); } \ NS_IMETHOD SetTabIndex(PRInt32 aTabIndex) { return _to SetTabIndex(aTabIndex); } \ - NS_IMETHOD GetTarget(nsAWritableString& aTarget) { return _to GetTarget(aTarget); } \ - NS_IMETHOD SetTarget(const nsAReadableString& aTarget) { return _to SetTarget(aTarget); } \ + NS_IMETHOD GetTarget(nsString& aTarget) { return _to GetTarget(aTarget); } \ + NS_IMETHOD SetTarget(const nsString& aTarget) { return _to SetTarget(aTarget); } \ extern "C" NS_DOM nsresult NS_InitHTMLAreaElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLBRElement.h b/dom/public/html/nsIDOMHTMLBRElement.h index bd87eef0939..c00d071a05d 100644 --- a/dom/public/html/nsIDOMHTMLBRElement.h +++ b/dom/public/html/nsIDOMHTMLBRElement.h @@ -38,20 +38,20 @@ class nsIDOMHTMLBRElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBRELEMENT_IID; return iid; } - NS_IMETHOD GetClear(nsAWritableString& aClear)=0; - NS_IMETHOD SetClear(const nsAReadableString& aClear)=0; + NS_IMETHOD GetClear(nsString& aClear)=0; + NS_IMETHOD SetClear(const nsString& aClear)=0; }; #define NS_DECL_IDOMHTMLBRELEMENT \ - NS_IMETHOD GetClear(nsAWritableString& aClear); \ - NS_IMETHOD SetClear(const nsAReadableString& aClear); \ + NS_IMETHOD GetClear(nsString& aClear); \ + NS_IMETHOD SetClear(const nsString& aClear); \ #define NS_FORWARD_IDOMHTMLBRELEMENT(_to) \ - NS_IMETHOD GetClear(nsAWritableString& aClear) { return _to GetClear(aClear); } \ - NS_IMETHOD SetClear(const nsAReadableString& aClear) { return _to SetClear(aClear); } \ + NS_IMETHOD GetClear(nsString& aClear) { return _to GetClear(aClear); } \ + NS_IMETHOD SetClear(const nsString& aClear) { return _to SetClear(aClear); } \ extern "C" NS_DOM nsresult NS_InitHTMLBRElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLBaseElement.h b/dom/public/html/nsIDOMHTMLBaseElement.h index 712f0d217b2..5742ba174a4 100644 --- a/dom/public/html/nsIDOMHTMLBaseElement.h +++ b/dom/public/html/nsIDOMHTMLBaseElement.h @@ -38,27 +38,27 @@ class nsIDOMHTMLBaseElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBASEELEMENT_IID; return iid; } - NS_IMETHOD GetHref(nsAWritableString& aHref)=0; - NS_IMETHOD SetHref(const nsAReadableString& aHref)=0; + NS_IMETHOD GetHref(nsString& aHref)=0; + NS_IMETHOD SetHref(const nsString& aHref)=0; - NS_IMETHOD GetTarget(nsAWritableString& aTarget)=0; - NS_IMETHOD SetTarget(const nsAReadableString& aTarget)=0; + NS_IMETHOD GetTarget(nsString& aTarget)=0; + NS_IMETHOD SetTarget(const nsString& aTarget)=0; }; #define NS_DECL_IDOMHTMLBASEELEMENT \ - NS_IMETHOD GetHref(nsAWritableString& aHref); \ - NS_IMETHOD SetHref(const nsAReadableString& aHref); \ - NS_IMETHOD GetTarget(nsAWritableString& aTarget); \ - NS_IMETHOD SetTarget(const nsAReadableString& aTarget); \ + NS_IMETHOD GetHref(nsString& aHref); \ + NS_IMETHOD SetHref(const nsString& aHref); \ + NS_IMETHOD GetTarget(nsString& aTarget); \ + NS_IMETHOD SetTarget(const nsString& aTarget); \ #define NS_FORWARD_IDOMHTMLBASEELEMENT(_to) \ - NS_IMETHOD GetHref(nsAWritableString& aHref) { return _to GetHref(aHref); } \ - NS_IMETHOD SetHref(const nsAReadableString& aHref) { return _to SetHref(aHref); } \ - NS_IMETHOD GetTarget(nsAWritableString& aTarget) { return _to GetTarget(aTarget); } \ - NS_IMETHOD SetTarget(const nsAReadableString& aTarget) { return _to SetTarget(aTarget); } \ + NS_IMETHOD GetHref(nsString& aHref) { return _to GetHref(aHref); } \ + NS_IMETHOD SetHref(const nsString& aHref) { return _to SetHref(aHref); } \ + NS_IMETHOD GetTarget(nsString& aTarget) { return _to GetTarget(aTarget); } \ + NS_IMETHOD SetTarget(const nsString& aTarget) { return _to SetTarget(aTarget); } \ extern "C" NS_DOM nsresult NS_InitHTMLBaseElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLBaseFontElement.h b/dom/public/html/nsIDOMHTMLBaseFontElement.h index 4a65836fce0..c2abdba5a7c 100644 --- a/dom/public/html/nsIDOMHTMLBaseFontElement.h +++ b/dom/public/html/nsIDOMHTMLBaseFontElement.h @@ -38,34 +38,34 @@ class nsIDOMHTMLBaseFontElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBASEFONTELEMENT_IID; return iid; } - NS_IMETHOD GetColor(nsAWritableString& aColor)=0; - NS_IMETHOD SetColor(const nsAReadableString& aColor)=0; + NS_IMETHOD GetColor(nsString& aColor)=0; + NS_IMETHOD SetColor(const nsString& aColor)=0; - NS_IMETHOD GetFace(nsAWritableString& aFace)=0; - NS_IMETHOD SetFace(const nsAReadableString& aFace)=0; + NS_IMETHOD GetFace(nsString& aFace)=0; + NS_IMETHOD SetFace(const nsString& aFace)=0; - NS_IMETHOD GetSize(nsAWritableString& aSize)=0; - NS_IMETHOD SetSize(const nsAReadableString& aSize)=0; + NS_IMETHOD GetSize(nsString& aSize)=0; + NS_IMETHOD SetSize(const nsString& aSize)=0; }; #define NS_DECL_IDOMHTMLBASEFONTELEMENT \ - NS_IMETHOD GetColor(nsAWritableString& aColor); \ - NS_IMETHOD SetColor(const nsAReadableString& aColor); \ - NS_IMETHOD GetFace(nsAWritableString& aFace); \ - NS_IMETHOD SetFace(const nsAReadableString& aFace); \ - NS_IMETHOD GetSize(nsAWritableString& aSize); \ - NS_IMETHOD SetSize(const nsAReadableString& aSize); \ + NS_IMETHOD GetColor(nsString& aColor); \ + NS_IMETHOD SetColor(const nsString& aColor); \ + NS_IMETHOD GetFace(nsString& aFace); \ + NS_IMETHOD SetFace(const nsString& aFace); \ + NS_IMETHOD GetSize(nsString& aSize); \ + NS_IMETHOD SetSize(const nsString& aSize); \ #define NS_FORWARD_IDOMHTMLBASEFONTELEMENT(_to) \ - NS_IMETHOD GetColor(nsAWritableString& aColor) { return _to GetColor(aColor); } \ - NS_IMETHOD SetColor(const nsAReadableString& aColor) { return _to SetColor(aColor); } \ - NS_IMETHOD GetFace(nsAWritableString& aFace) { return _to GetFace(aFace); } \ - NS_IMETHOD SetFace(const nsAReadableString& aFace) { return _to SetFace(aFace); } \ - NS_IMETHOD GetSize(nsAWritableString& aSize) { return _to GetSize(aSize); } \ - NS_IMETHOD SetSize(const nsAReadableString& aSize) { return _to SetSize(aSize); } \ + NS_IMETHOD GetColor(nsString& aColor) { return _to GetColor(aColor); } \ + NS_IMETHOD SetColor(const nsString& aColor) { return _to SetColor(aColor); } \ + NS_IMETHOD GetFace(nsString& aFace) { return _to GetFace(aFace); } \ + NS_IMETHOD SetFace(const nsString& aFace) { return _to SetFace(aFace); } \ + NS_IMETHOD GetSize(nsString& aSize) { return _to GetSize(aSize); } \ + NS_IMETHOD SetSize(const nsString& aSize) { return _to SetSize(aSize); } \ extern "C" NS_DOM nsresult NS_InitHTMLBaseFontElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLBodyElement.h b/dom/public/html/nsIDOMHTMLBodyElement.h index f5821ad856a..1795a43f47b 100644 --- a/dom/public/html/nsIDOMHTMLBodyElement.h +++ b/dom/public/html/nsIDOMHTMLBodyElement.h @@ -38,55 +38,55 @@ class nsIDOMHTMLBodyElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLBODYELEMENT_IID; return iid; } - NS_IMETHOD GetALink(nsAWritableString& aALink)=0; - NS_IMETHOD SetALink(const nsAReadableString& aALink)=0; + NS_IMETHOD GetALink(nsString& aALink)=0; + NS_IMETHOD SetALink(const nsString& aALink)=0; - NS_IMETHOD GetBackground(nsAWritableString& aBackground)=0; - NS_IMETHOD SetBackground(const nsAReadableString& aBackground)=0; + NS_IMETHOD GetBackground(nsString& aBackground)=0; + NS_IMETHOD SetBackground(const nsString& aBackground)=0; - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor)=0; - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor)=0; + NS_IMETHOD GetBgColor(nsString& aBgColor)=0; + NS_IMETHOD SetBgColor(const nsString& aBgColor)=0; - NS_IMETHOD GetLink(nsAWritableString& aLink)=0; - NS_IMETHOD SetLink(const nsAReadableString& aLink)=0; + NS_IMETHOD GetLink(nsString& aLink)=0; + NS_IMETHOD SetLink(const nsString& aLink)=0; - NS_IMETHOD GetText(nsAWritableString& aText)=0; - NS_IMETHOD SetText(const nsAReadableString& aText)=0; + NS_IMETHOD GetText(nsString& aText)=0; + NS_IMETHOD SetText(const nsString& aText)=0; - NS_IMETHOD GetVLink(nsAWritableString& aVLink)=0; - NS_IMETHOD SetVLink(const nsAReadableString& aVLink)=0; + NS_IMETHOD GetVLink(nsString& aVLink)=0; + NS_IMETHOD SetVLink(const nsString& aVLink)=0; }; #define NS_DECL_IDOMHTMLBODYELEMENT \ - NS_IMETHOD GetALink(nsAWritableString& aALink); \ - NS_IMETHOD SetALink(const nsAReadableString& aALink); \ - NS_IMETHOD GetBackground(nsAWritableString& aBackground); \ - NS_IMETHOD SetBackground(const nsAReadableString& aBackground); \ - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor); \ - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor); \ - NS_IMETHOD GetLink(nsAWritableString& aLink); \ - NS_IMETHOD SetLink(const nsAReadableString& aLink); \ - NS_IMETHOD GetText(nsAWritableString& aText); \ - NS_IMETHOD SetText(const nsAReadableString& aText); \ - NS_IMETHOD GetVLink(nsAWritableString& aVLink); \ - NS_IMETHOD SetVLink(const nsAReadableString& aVLink); \ + NS_IMETHOD GetALink(nsString& aALink); \ + NS_IMETHOD SetALink(const nsString& aALink); \ + NS_IMETHOD GetBackground(nsString& aBackground); \ + NS_IMETHOD SetBackground(const nsString& aBackground); \ + NS_IMETHOD GetBgColor(nsString& aBgColor); \ + NS_IMETHOD SetBgColor(const nsString& aBgColor); \ + NS_IMETHOD GetLink(nsString& aLink); \ + NS_IMETHOD SetLink(const nsString& aLink); \ + NS_IMETHOD GetText(nsString& aText); \ + NS_IMETHOD SetText(const nsString& aText); \ + NS_IMETHOD GetVLink(nsString& aVLink); \ + NS_IMETHOD SetVLink(const nsString& aVLink); \ #define NS_FORWARD_IDOMHTMLBODYELEMENT(_to) \ - NS_IMETHOD GetALink(nsAWritableString& aALink) { return _to GetALink(aALink); } \ - NS_IMETHOD SetALink(const nsAReadableString& aALink) { return _to SetALink(aALink); } \ - NS_IMETHOD GetBackground(nsAWritableString& aBackground) { return _to GetBackground(aBackground); } \ - NS_IMETHOD SetBackground(const nsAReadableString& aBackground) { return _to SetBackground(aBackground); } \ - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor) { return _to GetBgColor(aBgColor); } \ - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor) { return _to SetBgColor(aBgColor); } \ - NS_IMETHOD GetLink(nsAWritableString& aLink) { return _to GetLink(aLink); } \ - NS_IMETHOD SetLink(const nsAReadableString& aLink) { return _to SetLink(aLink); } \ - NS_IMETHOD GetText(nsAWritableString& aText) { return _to GetText(aText); } \ - NS_IMETHOD SetText(const nsAReadableString& aText) { return _to SetText(aText); } \ - NS_IMETHOD GetVLink(nsAWritableString& aVLink) { return _to GetVLink(aVLink); } \ - NS_IMETHOD SetVLink(const nsAReadableString& aVLink) { return _to SetVLink(aVLink); } \ + NS_IMETHOD GetALink(nsString& aALink) { return _to GetALink(aALink); } \ + NS_IMETHOD SetALink(const nsString& aALink) { return _to SetALink(aALink); } \ + NS_IMETHOD GetBackground(nsString& aBackground) { return _to GetBackground(aBackground); } \ + NS_IMETHOD SetBackground(const nsString& aBackground) { return _to SetBackground(aBackground); } \ + NS_IMETHOD GetBgColor(nsString& aBgColor) { return _to GetBgColor(aBgColor); } \ + NS_IMETHOD SetBgColor(const nsString& aBgColor) { return _to SetBgColor(aBgColor); } \ + NS_IMETHOD GetLink(nsString& aLink) { return _to GetLink(aLink); } \ + NS_IMETHOD SetLink(const nsString& aLink) { return _to SetLink(aLink); } \ + NS_IMETHOD GetText(nsString& aText) { return _to GetText(aText); } \ + NS_IMETHOD SetText(const nsString& aText) { return _to SetText(aText); } \ + NS_IMETHOD GetVLink(nsString& aVLink) { return _to GetVLink(aVLink); } \ + NS_IMETHOD SetVLink(const nsString& aVLink) { return _to SetVLink(aVLink); } \ extern "C" NS_DOM nsresult NS_InitHTMLBodyElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLButtonElement.h b/dom/public/html/nsIDOMHTMLButtonElement.h index 10208782050..41ecc6b519b 100644 --- a/dom/public/html/nsIDOMHTMLButtonElement.h +++ b/dom/public/html/nsIDOMHTMLButtonElement.h @@ -41,54 +41,54 @@ public: NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey)=0; - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey)=0; + NS_IMETHOD GetAccessKey(nsString& aAccessKey)=0; + NS_IMETHOD SetAccessKey(const nsString& aAccessKey)=0; NS_IMETHOD GetDisabled(PRBool* aDisabled)=0; NS_IMETHOD SetDisabled(PRBool aDisabled)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; NS_IMETHOD GetTabIndex(PRInt32* aTabIndex)=0; NS_IMETHOD SetTabIndex(PRInt32 aTabIndex)=0; - NS_IMETHOD GetType(nsAWritableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; - NS_IMETHOD GetValue(nsAWritableString& aValue)=0; - NS_IMETHOD SetValue(const nsAReadableString& aValue)=0; + NS_IMETHOD GetValue(nsString& aValue)=0; + NS_IMETHOD SetValue(const nsString& aValue)=0; }; #define NS_DECL_IDOMHTMLBUTTONELEMENT \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm); \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey); \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey); \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey); \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey); \ NS_IMETHOD GetDisabled(PRBool* aDisabled); \ NS_IMETHOD SetDisabled(PRBool aDisabled); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex); \ NS_IMETHOD SetTabIndex(PRInt32 aTabIndex); \ - NS_IMETHOD GetType(nsAWritableString& aType); \ - NS_IMETHOD GetValue(nsAWritableString& aValue); \ - NS_IMETHOD SetValue(const nsAReadableString& aValue); \ + NS_IMETHOD GetType(nsString& aType); \ + NS_IMETHOD GetValue(nsString& aValue); \ + NS_IMETHOD SetValue(const nsString& aValue); \ #define NS_FORWARD_IDOMHTMLBUTTONELEMENT(_to) \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm) { return _to GetForm(aForm); } \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ NS_IMETHOD GetDisabled(PRBool* aDisabled) { return _to GetDisabled(aDisabled); } \ NS_IMETHOD SetDisabled(PRBool aDisabled) { return _to SetDisabled(aDisabled); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex) { return _to GetTabIndex(aTabIndex); } \ NS_IMETHOD SetTabIndex(PRInt32 aTabIndex) { return _to SetTabIndex(aTabIndex); } \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ - NS_IMETHOD GetValue(nsAWritableString& aValue) { return _to GetValue(aValue); } \ - NS_IMETHOD SetValue(const nsAReadableString& aValue) { return _to SetValue(aValue); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ + NS_IMETHOD GetValue(nsString& aValue) { return _to GetValue(aValue); } \ + NS_IMETHOD SetValue(const nsString& aValue) { return _to SetValue(aValue); } \ extern "C" NS_DOM nsresult NS_InitHTMLButtonElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLCollection.h b/dom/public/html/nsIDOMHTMLCollection.h index 2847814c308..9f943db8dad 100644 --- a/dom/public/html/nsIDOMHTMLCollection.h +++ b/dom/public/html/nsIDOMHTMLCollection.h @@ -42,21 +42,21 @@ public: NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn)=0; - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn)=0; + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMNode** aReturn)=0; }; #define NS_DECL_IDOMHTMLCOLLECTION \ NS_IMETHOD GetLength(PRUint32* aLength); \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn); \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn); \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMNode** aReturn); \ #define NS_FORWARD_IDOMHTMLCOLLECTION(_to) \ NS_IMETHOD GetLength(PRUint32* aLength) { return _to GetLength(aLength); } \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn) { return _to Item(aIndex, aReturn); } \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn) { return _to NamedItem(aName, aReturn); } \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMNode** aReturn) { return _to NamedItem(aName, aReturn); } \ extern "C" NS_DOM nsresult NS_InitHTMLCollectionClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLDivElement.h b/dom/public/html/nsIDOMHTMLDivElement.h index 2dac8e54c84..0b3edcc5ed6 100644 --- a/dom/public/html/nsIDOMHTMLDivElement.h +++ b/dom/public/html/nsIDOMHTMLDivElement.h @@ -38,20 +38,20 @@ class nsIDOMHTMLDivElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLDIVELEMENT_IID; return iid; } - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; }; #define NS_DECL_IDOMHTMLDIVELEMENT \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ #define NS_FORWARD_IDOMHTMLDIVELEMENT(_to) \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ extern "C" NS_DOM nsresult NS_InitHTMLDivElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLDocument.h b/dom/public/html/nsIDOMHTMLDocument.h index 6a1c5e9ac43..8dfc6ace7bd 100644 --- a/dom/public/html/nsIDOMHTMLDocument.h +++ b/dom/public/html/nsIDOMHTMLDocument.h @@ -41,15 +41,15 @@ class nsIDOMHTMLDocument : public nsIDOMDocument { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLDOCUMENT_IID; return iid; } - NS_IMETHOD GetTitle(nsAWritableString& aTitle)=0; - NS_IMETHOD SetTitle(const nsAReadableString& aTitle)=0; + NS_IMETHOD GetTitle(nsString& aTitle)=0; + NS_IMETHOD SetTitle(const nsString& aTitle)=0; - NS_IMETHOD GetReferrer(nsAWritableString& aReferrer)=0; + NS_IMETHOD GetReferrer(nsString& aReferrer)=0; - NS_IMETHOD GetDomain(nsAWritableString& aDomain)=0; - NS_IMETHOD SetDomain(const nsAReadableString& aDomain)=0; + NS_IMETHOD GetDomain(nsString& aDomain)=0; + NS_IMETHOD SetDomain(const nsString& aDomain)=0; - NS_IMETHOD GetURL(nsAWritableString& aURL)=0; + NS_IMETHOD GetURL(nsString& aURL)=0; NS_IMETHOD GetBody(nsIDOMHTMLElement** aBody)=0; NS_IMETHOD SetBody(nsIDOMHTMLElement* aBody)=0; @@ -64,28 +64,28 @@ public: NS_IMETHOD GetAnchors(nsIDOMHTMLCollection** aAnchors)=0; - NS_IMETHOD GetCookie(nsAWritableString& aCookie)=0; - NS_IMETHOD SetCookie(const nsAReadableString& aCookie)=0; + NS_IMETHOD GetCookie(nsString& aCookie)=0; + NS_IMETHOD SetCookie(const nsString& aCookie)=0; NS_IMETHOD Open()=0; NS_IMETHOD Close()=0; - NS_IMETHOD Write(const nsAReadableString& aText)=0; + NS_IMETHOD Write(const nsString& aText)=0; - NS_IMETHOD Writeln(const nsAReadableString& aText)=0; + NS_IMETHOD Writeln(const nsString& aText)=0; - NS_IMETHOD GetElementsByName(const nsAReadableString& aElementName, nsIDOMNodeList** aReturn)=0; + NS_IMETHOD GetElementsByName(const nsString& aElementName, nsIDOMNodeList** aReturn)=0; }; #define NS_DECL_IDOMHTMLDOCUMENT \ - NS_IMETHOD GetTitle(nsAWritableString& aTitle); \ - NS_IMETHOD SetTitle(const nsAReadableString& aTitle); \ - NS_IMETHOD GetReferrer(nsAWritableString& aReferrer); \ - NS_IMETHOD GetDomain(nsAWritableString& aDomain); \ - NS_IMETHOD SetDomain(const nsAReadableString& aDomain); \ - NS_IMETHOD GetURL(nsAWritableString& aURL); \ + NS_IMETHOD GetTitle(nsString& aTitle); \ + NS_IMETHOD SetTitle(const nsString& aTitle); \ + NS_IMETHOD GetReferrer(nsString& aReferrer); \ + NS_IMETHOD GetDomain(nsString& aDomain); \ + NS_IMETHOD SetDomain(const nsString& aDomain); \ + NS_IMETHOD GetURL(nsString& aURL); \ NS_IMETHOD GetBody(nsIDOMHTMLElement** aBody); \ NS_IMETHOD SetBody(nsIDOMHTMLElement* aBody); \ NS_IMETHOD GetImages(nsIDOMHTMLCollection** aImages); \ @@ -93,23 +93,23 @@ public: NS_IMETHOD GetLinks(nsIDOMHTMLCollection** aLinks); \ NS_IMETHOD GetForms(nsIDOMHTMLCollection** aForms); \ NS_IMETHOD GetAnchors(nsIDOMHTMLCollection** aAnchors); \ - NS_IMETHOD GetCookie(nsAWritableString& aCookie); \ - NS_IMETHOD SetCookie(const nsAReadableString& aCookie); \ + NS_IMETHOD GetCookie(nsString& aCookie); \ + NS_IMETHOD SetCookie(const nsString& aCookie); \ NS_IMETHOD Open(); \ NS_IMETHOD Close(); \ - NS_IMETHOD Write(const nsAReadableString& aText); \ - NS_IMETHOD Writeln(const nsAReadableString& aText); \ - NS_IMETHOD GetElementsByName(const nsAReadableString& aElementName, nsIDOMNodeList** aReturn); \ + NS_IMETHOD Write(const nsString& aText); \ + NS_IMETHOD Writeln(const nsString& aText); \ + NS_IMETHOD GetElementsByName(const nsString& aElementName, nsIDOMNodeList** aReturn); \ #define NS_FORWARD_IDOMHTMLDOCUMENT(_to) \ - NS_IMETHOD GetTitle(nsAWritableString& aTitle) { return _to GetTitle(aTitle); } \ - NS_IMETHOD SetTitle(const nsAReadableString& aTitle) { return _to SetTitle(aTitle); } \ - NS_IMETHOD GetReferrer(nsAWritableString& aReferrer) { return _to GetReferrer(aReferrer); } \ - NS_IMETHOD GetDomain(nsAWritableString& aDomain) { return _to GetDomain(aDomain); } \ - NS_IMETHOD SetDomain(const nsAReadableString& aDomain) { return _to SetDomain(aDomain); } \ - NS_IMETHOD GetURL(nsAWritableString& aURL) { return _to GetURL(aURL); } \ + NS_IMETHOD GetTitle(nsString& aTitle) { return _to GetTitle(aTitle); } \ + NS_IMETHOD SetTitle(const nsString& aTitle) { return _to SetTitle(aTitle); } \ + NS_IMETHOD GetReferrer(nsString& aReferrer) { return _to GetReferrer(aReferrer); } \ + NS_IMETHOD GetDomain(nsString& aDomain) { return _to GetDomain(aDomain); } \ + NS_IMETHOD SetDomain(const nsString& aDomain) { return _to SetDomain(aDomain); } \ + NS_IMETHOD GetURL(nsString& aURL) { return _to GetURL(aURL); } \ NS_IMETHOD GetBody(nsIDOMHTMLElement** aBody) { return _to GetBody(aBody); } \ NS_IMETHOD SetBody(nsIDOMHTMLElement* aBody) { return _to SetBody(aBody); } \ NS_IMETHOD GetImages(nsIDOMHTMLCollection** aImages) { return _to GetImages(aImages); } \ @@ -117,13 +117,13 @@ public: NS_IMETHOD GetLinks(nsIDOMHTMLCollection** aLinks) { return _to GetLinks(aLinks); } \ NS_IMETHOD GetForms(nsIDOMHTMLCollection** aForms) { return _to GetForms(aForms); } \ NS_IMETHOD GetAnchors(nsIDOMHTMLCollection** aAnchors) { return _to GetAnchors(aAnchors); } \ - NS_IMETHOD GetCookie(nsAWritableString& aCookie) { return _to GetCookie(aCookie); } \ - NS_IMETHOD SetCookie(const nsAReadableString& aCookie) { return _to SetCookie(aCookie); } \ + NS_IMETHOD GetCookie(nsString& aCookie) { return _to GetCookie(aCookie); } \ + NS_IMETHOD SetCookie(const nsString& aCookie) { return _to SetCookie(aCookie); } \ NS_IMETHOD Open() { return _to Open(); } \ NS_IMETHOD Close() { return _to Close(); } \ - NS_IMETHOD Write(const nsAReadableString& aText) { return _to Write(aText); } \ - NS_IMETHOD Writeln(const nsAReadableString& aText) { return _to Writeln(aText); } \ - NS_IMETHOD GetElementsByName(const nsAReadableString& aElementName, nsIDOMNodeList** aReturn) { return _to GetElementsByName(aElementName, aReturn); } \ + NS_IMETHOD Write(const nsString& aText) { return _to Write(aText); } \ + NS_IMETHOD Writeln(const nsString& aText) { return _to Writeln(aText); } \ + NS_IMETHOD GetElementsByName(const nsString& aElementName, nsIDOMNodeList** aReturn) { return _to GetElementsByName(aElementName, aReturn); } \ extern "C" NS_DOM nsresult NS_InitHTMLDocumentClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLElement.h b/dom/public/html/nsIDOMHTMLElement.h index 61dbf93354d..a5e2e143f03 100644 --- a/dom/public/html/nsIDOMHTMLElement.h +++ b/dom/public/html/nsIDOMHTMLElement.h @@ -40,20 +40,20 @@ class nsIDOMHTMLElement : public nsIDOMElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLELEMENT_IID; return iid; } - NS_IMETHOD GetId(nsAWritableString& aId)=0; - NS_IMETHOD SetId(const nsAReadableString& aId)=0; + NS_IMETHOD GetId(nsString& aId)=0; + NS_IMETHOD SetId(const nsString& aId)=0; - NS_IMETHOD GetTitle(nsAWritableString& aTitle)=0; - NS_IMETHOD SetTitle(const nsAReadableString& aTitle)=0; + NS_IMETHOD GetTitle(nsString& aTitle)=0; + NS_IMETHOD SetTitle(const nsString& aTitle)=0; - NS_IMETHOD GetLang(nsAWritableString& aLang)=0; - NS_IMETHOD SetLang(const nsAReadableString& aLang)=0; + NS_IMETHOD GetLang(nsString& aLang)=0; + NS_IMETHOD SetLang(const nsString& aLang)=0; - NS_IMETHOD GetDir(nsAWritableString& aDir)=0; - NS_IMETHOD SetDir(const nsAReadableString& aDir)=0; + NS_IMETHOD GetDir(nsString& aDir)=0; + NS_IMETHOD SetDir(const nsString& aDir)=0; - NS_IMETHOD GetClassName(nsAWritableString& aClassName)=0; - NS_IMETHOD SetClassName(const nsAReadableString& aClassName)=0; + NS_IMETHOD GetClassName(nsString& aClassName)=0; + NS_IMETHOD SetClassName(const nsString& aClassName)=0; NS_IMETHOD GetStyle(nsIDOMCSSStyleDeclaration** aStyle)=0; @@ -67,52 +67,52 @@ public: NS_IMETHOD GetOffsetParent(nsIDOMElement** aOffsetParent)=0; - NS_IMETHOD GetInnerHTML(nsAWritableString& aInnerHTML)=0; - NS_IMETHOD SetInnerHTML(const nsAReadableString& aInnerHTML)=0; + NS_IMETHOD GetInnerHTML(nsString& aInnerHTML)=0; + NS_IMETHOD SetInnerHTML(const nsString& aInnerHTML)=0; }; #define NS_DECL_IDOMHTMLELEMENT \ - NS_IMETHOD GetId(nsAWritableString& aId); \ - NS_IMETHOD SetId(const nsAReadableString& aId); \ - NS_IMETHOD GetTitle(nsAWritableString& aTitle); \ - NS_IMETHOD SetTitle(const nsAReadableString& aTitle); \ - NS_IMETHOD GetLang(nsAWritableString& aLang); \ - NS_IMETHOD SetLang(const nsAReadableString& aLang); \ - NS_IMETHOD GetDir(nsAWritableString& aDir); \ - NS_IMETHOD SetDir(const nsAReadableString& aDir); \ - NS_IMETHOD GetClassName(nsAWritableString& aClassName); \ - NS_IMETHOD SetClassName(const nsAReadableString& aClassName); \ + NS_IMETHOD GetId(nsString& aId); \ + NS_IMETHOD SetId(const nsString& aId); \ + NS_IMETHOD GetTitle(nsString& aTitle); \ + NS_IMETHOD SetTitle(const nsString& aTitle); \ + NS_IMETHOD GetLang(nsString& aLang); \ + NS_IMETHOD SetLang(const nsString& aLang); \ + NS_IMETHOD GetDir(nsString& aDir); \ + NS_IMETHOD SetDir(const nsString& aDir); \ + NS_IMETHOD GetClassName(nsString& aClassName); \ + NS_IMETHOD SetClassName(const nsString& aClassName); \ NS_IMETHOD GetStyle(nsIDOMCSSStyleDeclaration** aStyle); \ NS_IMETHOD GetOffsetTop(PRInt32* aOffsetTop); \ NS_IMETHOD GetOffsetLeft(PRInt32* aOffsetLeft); \ NS_IMETHOD GetOffsetWidth(PRInt32* aOffsetWidth); \ NS_IMETHOD GetOffsetHeight(PRInt32* aOffsetHeight); \ NS_IMETHOD GetOffsetParent(nsIDOMElement** aOffsetParent); \ - NS_IMETHOD GetInnerHTML(nsAWritableString& aInnerHTML); \ - NS_IMETHOD SetInnerHTML(const nsAReadableString& aInnerHTML); \ + NS_IMETHOD GetInnerHTML(nsString& aInnerHTML); \ + NS_IMETHOD SetInnerHTML(const nsString& aInnerHTML); \ #define NS_FORWARD_IDOMHTMLELEMENT(_to) \ - NS_IMETHOD GetId(nsAWritableString& aId) { return _to GetId(aId); } \ - NS_IMETHOD SetId(const nsAReadableString& aId) { return _to SetId(aId); } \ - NS_IMETHOD GetTitle(nsAWritableString& aTitle) { return _to GetTitle(aTitle); } \ - NS_IMETHOD SetTitle(const nsAReadableString& aTitle) { return _to SetTitle(aTitle); } \ - NS_IMETHOD GetLang(nsAWritableString& aLang) { return _to GetLang(aLang); } \ - NS_IMETHOD SetLang(const nsAReadableString& aLang) { return _to SetLang(aLang); } \ - NS_IMETHOD GetDir(nsAWritableString& aDir) { return _to GetDir(aDir); } \ - NS_IMETHOD SetDir(const nsAReadableString& aDir) { return _to SetDir(aDir); } \ - NS_IMETHOD GetClassName(nsAWritableString& aClassName) { return _to GetClassName(aClassName); } \ - NS_IMETHOD SetClassName(const nsAReadableString& aClassName) { return _to SetClassName(aClassName); } \ + NS_IMETHOD GetId(nsString& aId) { return _to GetId(aId); } \ + NS_IMETHOD SetId(const nsString& aId) { return _to SetId(aId); } \ + NS_IMETHOD GetTitle(nsString& aTitle) { return _to GetTitle(aTitle); } \ + NS_IMETHOD SetTitle(const nsString& aTitle) { return _to SetTitle(aTitle); } \ + NS_IMETHOD GetLang(nsString& aLang) { return _to GetLang(aLang); } \ + NS_IMETHOD SetLang(const nsString& aLang) { return _to SetLang(aLang); } \ + NS_IMETHOD GetDir(nsString& aDir) { return _to GetDir(aDir); } \ + NS_IMETHOD SetDir(const nsString& aDir) { return _to SetDir(aDir); } \ + NS_IMETHOD GetClassName(nsString& aClassName) { return _to GetClassName(aClassName); } \ + NS_IMETHOD SetClassName(const nsString& aClassName) { return _to SetClassName(aClassName); } \ NS_IMETHOD GetStyle(nsIDOMCSSStyleDeclaration** aStyle) { return _to GetStyle(aStyle); } \ NS_IMETHOD GetOffsetTop(PRInt32* aOffsetTop) { return _to GetOffsetTop(aOffsetTop); } \ NS_IMETHOD GetOffsetLeft(PRInt32* aOffsetLeft) { return _to GetOffsetLeft(aOffsetLeft); } \ NS_IMETHOD GetOffsetWidth(PRInt32* aOffsetWidth) { return _to GetOffsetWidth(aOffsetWidth); } \ NS_IMETHOD GetOffsetHeight(PRInt32* aOffsetHeight) { return _to GetOffsetHeight(aOffsetHeight); } \ NS_IMETHOD GetOffsetParent(nsIDOMElement** aOffsetParent) { return _to GetOffsetParent(aOffsetParent); } \ - NS_IMETHOD GetInnerHTML(nsAWritableString& aInnerHTML) { return _to GetInnerHTML(aInnerHTML); } \ - NS_IMETHOD SetInnerHTML(const nsAReadableString& aInnerHTML) { return _to SetInnerHTML(aInnerHTML); } \ + NS_IMETHOD GetInnerHTML(nsString& aInnerHTML) { return _to GetInnerHTML(aInnerHTML); } \ + NS_IMETHOD SetInnerHTML(const nsString& aInnerHTML) { return _to SetInnerHTML(aInnerHTML); } \ extern "C" NS_DOM nsresult NS_InitHTMLElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLEmbedElement.h b/dom/public/html/nsIDOMHTMLEmbedElement.h index a719fed220f..568e81ec2a2 100644 --- a/dom/public/html/nsIDOMHTMLEmbedElement.h +++ b/dom/public/html/nsIDOMHTMLEmbedElement.h @@ -38,55 +38,55 @@ class nsIDOMHTMLEmbedElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLEMBEDELEMENT_IID; return iid; } - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; - NS_IMETHOD GetHeight(nsAWritableString& aHeight)=0; - NS_IMETHOD SetHeight(const nsAReadableString& aHeight)=0; + NS_IMETHOD GetHeight(nsString& aHeight)=0; + NS_IMETHOD SetHeight(const nsString& aHeight)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; - NS_IMETHOD GetSrc(nsAWritableString& aSrc)=0; - NS_IMETHOD SetSrc(const nsAReadableString& aSrc)=0; + NS_IMETHOD GetSrc(nsString& aSrc)=0; + NS_IMETHOD SetSrc(const nsString& aSrc)=0; - NS_IMETHOD GetType(nsAWritableString& aType)=0; - NS_IMETHOD SetType(const nsAReadableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; + NS_IMETHOD SetType(const nsString& aType)=0; - NS_IMETHOD GetWidth(nsAWritableString& aWidth)=0; - NS_IMETHOD SetWidth(const nsAReadableString& aWidth)=0; + NS_IMETHOD GetWidth(nsString& aWidth)=0; + NS_IMETHOD SetWidth(const nsString& aWidth)=0; }; #define NS_DECL_IDOMHTMLEMBEDELEMENT \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight); \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ - NS_IMETHOD GetSrc(nsAWritableString& aSrc); \ - NS_IMETHOD SetSrc(const nsAReadableString& aSrc); \ - NS_IMETHOD GetType(nsAWritableString& aType); \ - NS_IMETHOD SetType(const nsAReadableString& aType); \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth); \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ + NS_IMETHOD GetHeight(nsString& aHeight); \ + NS_IMETHOD SetHeight(const nsString& aHeight); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ + NS_IMETHOD GetSrc(nsString& aSrc); \ + NS_IMETHOD SetSrc(const nsString& aSrc); \ + NS_IMETHOD GetType(nsString& aType); \ + NS_IMETHOD SetType(const nsString& aType); \ + NS_IMETHOD GetWidth(nsString& aWidth); \ + NS_IMETHOD SetWidth(const nsString& aWidth); \ #define NS_FORWARD_IDOMHTMLEMBEDELEMENT(_to) \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight) { return _to GetHeight(aHeight); } \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight) { return _to SetHeight(aHeight); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ - NS_IMETHOD GetSrc(nsAWritableString& aSrc) { return _to GetSrc(aSrc); } \ - NS_IMETHOD SetSrc(const nsAReadableString& aSrc) { return _to SetSrc(aSrc); } \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ - NS_IMETHOD SetType(const nsAReadableString& aType) { return _to SetType(aType); } \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth) { return _to GetWidth(aWidth); } \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth) { return _to SetWidth(aWidth); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetHeight(nsString& aHeight) { return _to GetHeight(aHeight); } \ + NS_IMETHOD SetHeight(const nsString& aHeight) { return _to SetHeight(aHeight); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetSrc(nsString& aSrc) { return _to GetSrc(aSrc); } \ + NS_IMETHOD SetSrc(const nsString& aSrc) { return _to SetSrc(aSrc); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ + NS_IMETHOD SetType(const nsString& aType) { return _to SetType(aType); } \ + NS_IMETHOD GetWidth(nsString& aWidth) { return _to GetWidth(aWidth); } \ + NS_IMETHOD SetWidth(const nsString& aWidth) { return _to SetWidth(aWidth); } \ extern "C" NS_DOM nsresult NS_InitHTMLEmbedElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLFontElement.h b/dom/public/html/nsIDOMHTMLFontElement.h index 72927b42425..ab0a8879930 100644 --- a/dom/public/html/nsIDOMHTMLFontElement.h +++ b/dom/public/html/nsIDOMHTMLFontElement.h @@ -38,34 +38,34 @@ class nsIDOMHTMLFontElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFONTELEMENT_IID; return iid; } - NS_IMETHOD GetColor(nsAWritableString& aColor)=0; - NS_IMETHOD SetColor(const nsAReadableString& aColor)=0; + NS_IMETHOD GetColor(nsString& aColor)=0; + NS_IMETHOD SetColor(const nsString& aColor)=0; - NS_IMETHOD GetFace(nsAWritableString& aFace)=0; - NS_IMETHOD SetFace(const nsAReadableString& aFace)=0; + NS_IMETHOD GetFace(nsString& aFace)=0; + NS_IMETHOD SetFace(const nsString& aFace)=0; - NS_IMETHOD GetSize(nsAWritableString& aSize)=0; - NS_IMETHOD SetSize(const nsAReadableString& aSize)=0; + NS_IMETHOD GetSize(nsString& aSize)=0; + NS_IMETHOD SetSize(const nsString& aSize)=0; }; #define NS_DECL_IDOMHTMLFONTELEMENT \ - NS_IMETHOD GetColor(nsAWritableString& aColor); \ - NS_IMETHOD SetColor(const nsAReadableString& aColor); \ - NS_IMETHOD GetFace(nsAWritableString& aFace); \ - NS_IMETHOD SetFace(const nsAReadableString& aFace); \ - NS_IMETHOD GetSize(nsAWritableString& aSize); \ - NS_IMETHOD SetSize(const nsAReadableString& aSize); \ + NS_IMETHOD GetColor(nsString& aColor); \ + NS_IMETHOD SetColor(const nsString& aColor); \ + NS_IMETHOD GetFace(nsString& aFace); \ + NS_IMETHOD SetFace(const nsString& aFace); \ + NS_IMETHOD GetSize(nsString& aSize); \ + NS_IMETHOD SetSize(const nsString& aSize); \ #define NS_FORWARD_IDOMHTMLFONTELEMENT(_to) \ - NS_IMETHOD GetColor(nsAWritableString& aColor) { return _to GetColor(aColor); } \ - NS_IMETHOD SetColor(const nsAReadableString& aColor) { return _to SetColor(aColor); } \ - NS_IMETHOD GetFace(nsAWritableString& aFace) { return _to GetFace(aFace); } \ - NS_IMETHOD SetFace(const nsAReadableString& aFace) { return _to SetFace(aFace); } \ - NS_IMETHOD GetSize(nsAWritableString& aSize) { return _to GetSize(aSize); } \ - NS_IMETHOD SetSize(const nsAReadableString& aSize) { return _to SetSize(aSize); } \ + NS_IMETHOD GetColor(nsString& aColor) { return _to GetColor(aColor); } \ + NS_IMETHOD SetColor(const nsString& aColor) { return _to SetColor(aColor); } \ + NS_IMETHOD GetFace(nsString& aFace) { return _to GetFace(aFace); } \ + NS_IMETHOD SetFace(const nsString& aFace) { return _to SetFace(aFace); } \ + NS_IMETHOD GetSize(nsString& aSize) { return _to GetSize(aSize); } \ + NS_IMETHOD SetSize(const nsString& aSize) { return _to SetSize(aSize); } \ extern "C" NS_DOM nsresult NS_InitHTMLFontElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLFormElement.h b/dom/public/html/nsIDOMHTMLFormElement.h index 924450c54ba..401bd8b96bb 100644 --- a/dom/public/html/nsIDOMHTMLFormElement.h +++ b/dom/public/html/nsIDOMHTMLFormElement.h @@ -43,23 +43,23 @@ public: NS_IMETHOD GetLength(PRInt32* aLength)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; - NS_IMETHOD GetAcceptCharset(nsAWritableString& aAcceptCharset)=0; - NS_IMETHOD SetAcceptCharset(const nsAReadableString& aAcceptCharset)=0; + NS_IMETHOD GetAcceptCharset(nsString& aAcceptCharset)=0; + NS_IMETHOD SetAcceptCharset(const nsString& aAcceptCharset)=0; - NS_IMETHOD GetAction(nsAWritableString& aAction)=0; - NS_IMETHOD SetAction(const nsAReadableString& aAction)=0; + NS_IMETHOD GetAction(nsString& aAction)=0; + NS_IMETHOD SetAction(const nsString& aAction)=0; - NS_IMETHOD GetEnctype(nsAWritableString& aEnctype)=0; - NS_IMETHOD SetEnctype(const nsAReadableString& aEnctype)=0; + NS_IMETHOD GetEnctype(nsString& aEnctype)=0; + NS_IMETHOD SetEnctype(const nsString& aEnctype)=0; - NS_IMETHOD GetMethod(nsAWritableString& aMethod)=0; - NS_IMETHOD SetMethod(const nsAReadableString& aMethod)=0; + NS_IMETHOD GetMethod(nsString& aMethod)=0; + NS_IMETHOD SetMethod(const nsString& aMethod)=0; - NS_IMETHOD GetTarget(nsAWritableString& aTarget)=0; - NS_IMETHOD SetTarget(const nsAReadableString& aTarget)=0; + NS_IMETHOD GetTarget(nsString& aTarget)=0; + NS_IMETHOD SetTarget(const nsString& aTarget)=0; NS_IMETHOD Submit()=0; @@ -70,18 +70,18 @@ public: #define NS_DECL_IDOMHTMLFORMELEMENT \ NS_IMETHOD GetElements(nsIDOMHTMLCollection** aElements); \ NS_IMETHOD GetLength(PRInt32* aLength); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ - NS_IMETHOD GetAcceptCharset(nsAWritableString& aAcceptCharset); \ - NS_IMETHOD SetAcceptCharset(const nsAReadableString& aAcceptCharset); \ - NS_IMETHOD GetAction(nsAWritableString& aAction); \ - NS_IMETHOD SetAction(const nsAReadableString& aAction); \ - NS_IMETHOD GetEnctype(nsAWritableString& aEnctype); \ - NS_IMETHOD SetEnctype(const nsAReadableString& aEnctype); \ - NS_IMETHOD GetMethod(nsAWritableString& aMethod); \ - NS_IMETHOD SetMethod(const nsAReadableString& aMethod); \ - NS_IMETHOD GetTarget(nsAWritableString& aTarget); \ - NS_IMETHOD SetTarget(const nsAReadableString& aTarget); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ + NS_IMETHOD GetAcceptCharset(nsString& aAcceptCharset); \ + NS_IMETHOD SetAcceptCharset(const nsString& aAcceptCharset); \ + NS_IMETHOD GetAction(nsString& aAction); \ + NS_IMETHOD SetAction(const nsString& aAction); \ + NS_IMETHOD GetEnctype(nsString& aEnctype); \ + NS_IMETHOD SetEnctype(const nsString& aEnctype); \ + NS_IMETHOD GetMethod(nsString& aMethod); \ + NS_IMETHOD SetMethod(const nsString& aMethod); \ + NS_IMETHOD GetTarget(nsString& aTarget); \ + NS_IMETHOD SetTarget(const nsString& aTarget); \ NS_IMETHOD Submit(); \ NS_IMETHOD Reset(); \ @@ -90,18 +90,18 @@ public: #define NS_FORWARD_IDOMHTMLFORMELEMENT(_to) \ NS_IMETHOD GetElements(nsIDOMHTMLCollection** aElements) { return _to GetElements(aElements); } \ NS_IMETHOD GetLength(PRInt32* aLength) { return _to GetLength(aLength); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ - NS_IMETHOD GetAcceptCharset(nsAWritableString& aAcceptCharset) { return _to GetAcceptCharset(aAcceptCharset); } \ - NS_IMETHOD SetAcceptCharset(const nsAReadableString& aAcceptCharset) { return _to SetAcceptCharset(aAcceptCharset); } \ - NS_IMETHOD GetAction(nsAWritableString& aAction) { return _to GetAction(aAction); } \ - NS_IMETHOD SetAction(const nsAReadableString& aAction) { return _to SetAction(aAction); } \ - NS_IMETHOD GetEnctype(nsAWritableString& aEnctype) { return _to GetEnctype(aEnctype); } \ - NS_IMETHOD SetEnctype(const nsAReadableString& aEnctype) { return _to SetEnctype(aEnctype); } \ - NS_IMETHOD GetMethod(nsAWritableString& aMethod) { return _to GetMethod(aMethod); } \ - NS_IMETHOD SetMethod(const nsAReadableString& aMethod) { return _to SetMethod(aMethod); } \ - NS_IMETHOD GetTarget(nsAWritableString& aTarget) { return _to GetTarget(aTarget); } \ - NS_IMETHOD SetTarget(const nsAReadableString& aTarget) { return _to SetTarget(aTarget); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetAcceptCharset(nsString& aAcceptCharset) { return _to GetAcceptCharset(aAcceptCharset); } \ + NS_IMETHOD SetAcceptCharset(const nsString& aAcceptCharset) { return _to SetAcceptCharset(aAcceptCharset); } \ + NS_IMETHOD GetAction(nsString& aAction) { return _to GetAction(aAction); } \ + NS_IMETHOD SetAction(const nsString& aAction) { return _to SetAction(aAction); } \ + NS_IMETHOD GetEnctype(nsString& aEnctype) { return _to GetEnctype(aEnctype); } \ + NS_IMETHOD SetEnctype(const nsString& aEnctype) { return _to SetEnctype(aEnctype); } \ + NS_IMETHOD GetMethod(nsString& aMethod) { return _to GetMethod(aMethod); } \ + NS_IMETHOD SetMethod(const nsString& aMethod) { return _to SetMethod(aMethod); } \ + NS_IMETHOD GetTarget(nsString& aTarget) { return _to GetTarget(aTarget); } \ + NS_IMETHOD SetTarget(const nsString& aTarget) { return _to SetTarget(aTarget); } \ NS_IMETHOD Submit() { return _to Submit(); } \ NS_IMETHOD Reset() { return _to Reset(); } \ diff --git a/dom/public/html/nsIDOMHTMLFrameElement.h b/dom/public/html/nsIDOMHTMLFrameElement.h index f70d7023dbe..cade524c1ab 100644 --- a/dom/public/html/nsIDOMHTMLFrameElement.h +++ b/dom/public/html/nsIDOMHTMLFrameElement.h @@ -39,29 +39,29 @@ class nsIDOMHTMLFrameElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFRAMEELEMENT_IID; return iid; } - NS_IMETHOD GetFrameBorder(nsAWritableString& aFrameBorder)=0; - NS_IMETHOD SetFrameBorder(const nsAReadableString& aFrameBorder)=0; + NS_IMETHOD GetFrameBorder(nsString& aFrameBorder)=0; + NS_IMETHOD SetFrameBorder(const nsString& aFrameBorder)=0; - NS_IMETHOD GetLongDesc(nsAWritableString& aLongDesc)=0; - NS_IMETHOD SetLongDesc(const nsAReadableString& aLongDesc)=0; + NS_IMETHOD GetLongDesc(nsString& aLongDesc)=0; + NS_IMETHOD SetLongDesc(const nsString& aLongDesc)=0; - NS_IMETHOD GetMarginHeight(nsAWritableString& aMarginHeight)=0; - NS_IMETHOD SetMarginHeight(const nsAReadableString& aMarginHeight)=0; + NS_IMETHOD GetMarginHeight(nsString& aMarginHeight)=0; + NS_IMETHOD SetMarginHeight(const nsString& aMarginHeight)=0; - NS_IMETHOD GetMarginWidth(nsAWritableString& aMarginWidth)=0; - NS_IMETHOD SetMarginWidth(const nsAReadableString& aMarginWidth)=0; + NS_IMETHOD GetMarginWidth(nsString& aMarginWidth)=0; + NS_IMETHOD SetMarginWidth(const nsString& aMarginWidth)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; NS_IMETHOD GetNoResize(PRBool* aNoResize)=0; NS_IMETHOD SetNoResize(PRBool aNoResize)=0; - NS_IMETHOD GetScrolling(nsAWritableString& aScrolling)=0; - NS_IMETHOD SetScrolling(const nsAReadableString& aScrolling)=0; + NS_IMETHOD GetScrolling(nsString& aScrolling)=0; + NS_IMETHOD SetScrolling(const nsString& aScrolling)=0; - NS_IMETHOD GetSrc(nsAWritableString& aSrc)=0; - NS_IMETHOD SetSrc(const nsAReadableString& aSrc)=0; + NS_IMETHOD GetSrc(nsString& aSrc)=0; + NS_IMETHOD SetSrc(const nsString& aSrc)=0; NS_IMETHOD GetContentDocument(nsIDOMDocument** aContentDocument)=0; NS_IMETHOD SetContentDocument(nsIDOMDocument* aContentDocument)=0; @@ -69,44 +69,44 @@ public: #define NS_DECL_IDOMHTMLFRAMEELEMENT \ - NS_IMETHOD GetFrameBorder(nsAWritableString& aFrameBorder); \ - NS_IMETHOD SetFrameBorder(const nsAReadableString& aFrameBorder); \ - NS_IMETHOD GetLongDesc(nsAWritableString& aLongDesc); \ - NS_IMETHOD SetLongDesc(const nsAReadableString& aLongDesc); \ - NS_IMETHOD GetMarginHeight(nsAWritableString& aMarginHeight); \ - NS_IMETHOD SetMarginHeight(const nsAReadableString& aMarginHeight); \ - NS_IMETHOD GetMarginWidth(nsAWritableString& aMarginWidth); \ - NS_IMETHOD SetMarginWidth(const nsAReadableString& aMarginWidth); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ + NS_IMETHOD GetFrameBorder(nsString& aFrameBorder); \ + NS_IMETHOD SetFrameBorder(const nsString& aFrameBorder); \ + NS_IMETHOD GetLongDesc(nsString& aLongDesc); \ + NS_IMETHOD SetLongDesc(const nsString& aLongDesc); \ + NS_IMETHOD GetMarginHeight(nsString& aMarginHeight); \ + NS_IMETHOD SetMarginHeight(const nsString& aMarginHeight); \ + NS_IMETHOD GetMarginWidth(nsString& aMarginWidth); \ + NS_IMETHOD SetMarginWidth(const nsString& aMarginWidth); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ NS_IMETHOD GetNoResize(PRBool* aNoResize); \ NS_IMETHOD SetNoResize(PRBool aNoResize); \ - NS_IMETHOD GetScrolling(nsAWritableString& aScrolling); \ - NS_IMETHOD SetScrolling(const nsAReadableString& aScrolling); \ - NS_IMETHOD GetSrc(nsAWritableString& aSrc); \ - NS_IMETHOD SetSrc(const nsAReadableString& aSrc); \ + NS_IMETHOD GetScrolling(nsString& aScrolling); \ + NS_IMETHOD SetScrolling(const nsString& aScrolling); \ + NS_IMETHOD GetSrc(nsString& aSrc); \ + NS_IMETHOD SetSrc(const nsString& aSrc); \ NS_IMETHOD GetContentDocument(nsIDOMDocument** aContentDocument); \ NS_IMETHOD SetContentDocument(nsIDOMDocument* aContentDocument); \ #define NS_FORWARD_IDOMHTMLFRAMEELEMENT(_to) \ - NS_IMETHOD GetFrameBorder(nsAWritableString& aFrameBorder) { return _to GetFrameBorder(aFrameBorder); } \ - NS_IMETHOD SetFrameBorder(const nsAReadableString& aFrameBorder) { return _to SetFrameBorder(aFrameBorder); } \ - NS_IMETHOD GetLongDesc(nsAWritableString& aLongDesc) { return _to GetLongDesc(aLongDesc); } \ - NS_IMETHOD SetLongDesc(const nsAReadableString& aLongDesc) { return _to SetLongDesc(aLongDesc); } \ - NS_IMETHOD GetMarginHeight(nsAWritableString& aMarginHeight) { return _to GetMarginHeight(aMarginHeight); } \ - NS_IMETHOD SetMarginHeight(const nsAReadableString& aMarginHeight) { return _to SetMarginHeight(aMarginHeight); } \ - NS_IMETHOD GetMarginWidth(nsAWritableString& aMarginWidth) { return _to GetMarginWidth(aMarginWidth); } \ - NS_IMETHOD SetMarginWidth(const nsAReadableString& aMarginWidth) { return _to SetMarginWidth(aMarginWidth); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetFrameBorder(nsString& aFrameBorder) { return _to GetFrameBorder(aFrameBorder); } \ + NS_IMETHOD SetFrameBorder(const nsString& aFrameBorder) { return _to SetFrameBorder(aFrameBorder); } \ + NS_IMETHOD GetLongDesc(nsString& aLongDesc) { return _to GetLongDesc(aLongDesc); } \ + NS_IMETHOD SetLongDesc(const nsString& aLongDesc) { return _to SetLongDesc(aLongDesc); } \ + NS_IMETHOD GetMarginHeight(nsString& aMarginHeight) { return _to GetMarginHeight(aMarginHeight); } \ + NS_IMETHOD SetMarginHeight(const nsString& aMarginHeight) { return _to SetMarginHeight(aMarginHeight); } \ + NS_IMETHOD GetMarginWidth(nsString& aMarginWidth) { return _to GetMarginWidth(aMarginWidth); } \ + NS_IMETHOD SetMarginWidth(const nsString& aMarginWidth) { return _to SetMarginWidth(aMarginWidth); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ NS_IMETHOD GetNoResize(PRBool* aNoResize) { return _to GetNoResize(aNoResize); } \ NS_IMETHOD SetNoResize(PRBool aNoResize) { return _to SetNoResize(aNoResize); } \ - NS_IMETHOD GetScrolling(nsAWritableString& aScrolling) { return _to GetScrolling(aScrolling); } \ - NS_IMETHOD SetScrolling(const nsAReadableString& aScrolling) { return _to SetScrolling(aScrolling); } \ - NS_IMETHOD GetSrc(nsAWritableString& aSrc) { return _to GetSrc(aSrc); } \ - NS_IMETHOD SetSrc(const nsAReadableString& aSrc) { return _to SetSrc(aSrc); } \ + NS_IMETHOD GetScrolling(nsString& aScrolling) { return _to GetScrolling(aScrolling); } \ + NS_IMETHOD SetScrolling(const nsString& aScrolling) { return _to SetScrolling(aScrolling); } \ + NS_IMETHOD GetSrc(nsString& aSrc) { return _to GetSrc(aSrc); } \ + NS_IMETHOD SetSrc(const nsString& aSrc) { return _to SetSrc(aSrc); } \ NS_IMETHOD GetContentDocument(nsIDOMDocument** aContentDocument) { return _to GetContentDocument(aContentDocument); } \ NS_IMETHOD SetContentDocument(nsIDOMDocument* aContentDocument) { return _to SetContentDocument(aContentDocument); } \ diff --git a/dom/public/html/nsIDOMHTMLFrameSetElement.h b/dom/public/html/nsIDOMHTMLFrameSetElement.h index bd3ee1da3d1..4a6370ce7de 100644 --- a/dom/public/html/nsIDOMHTMLFrameSetElement.h +++ b/dom/public/html/nsIDOMHTMLFrameSetElement.h @@ -38,27 +38,27 @@ class nsIDOMHTMLFrameSetElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLFRAMESETELEMENT_IID; return iid; } - NS_IMETHOD GetCols(nsAWritableString& aCols)=0; - NS_IMETHOD SetCols(const nsAReadableString& aCols)=0; + NS_IMETHOD GetCols(nsString& aCols)=0; + NS_IMETHOD SetCols(const nsString& aCols)=0; - NS_IMETHOD GetRows(nsAWritableString& aRows)=0; - NS_IMETHOD SetRows(const nsAReadableString& aRows)=0; + NS_IMETHOD GetRows(nsString& aRows)=0; + NS_IMETHOD SetRows(const nsString& aRows)=0; }; #define NS_DECL_IDOMHTMLFRAMESETELEMENT \ - NS_IMETHOD GetCols(nsAWritableString& aCols); \ - NS_IMETHOD SetCols(const nsAReadableString& aCols); \ - NS_IMETHOD GetRows(nsAWritableString& aRows); \ - NS_IMETHOD SetRows(const nsAReadableString& aRows); \ + NS_IMETHOD GetCols(nsString& aCols); \ + NS_IMETHOD SetCols(const nsString& aCols); \ + NS_IMETHOD GetRows(nsString& aRows); \ + NS_IMETHOD SetRows(const nsString& aRows); \ #define NS_FORWARD_IDOMHTMLFRAMESETELEMENT(_to) \ - NS_IMETHOD GetCols(nsAWritableString& aCols) { return _to GetCols(aCols); } \ - NS_IMETHOD SetCols(const nsAReadableString& aCols) { return _to SetCols(aCols); } \ - NS_IMETHOD GetRows(nsAWritableString& aRows) { return _to GetRows(aRows); } \ - NS_IMETHOD SetRows(const nsAReadableString& aRows) { return _to SetRows(aRows); } \ + NS_IMETHOD GetCols(nsString& aCols) { return _to GetCols(aCols); } \ + NS_IMETHOD SetCols(const nsString& aCols) { return _to SetCols(aCols); } \ + NS_IMETHOD GetRows(nsString& aRows) { return _to GetRows(aRows); } \ + NS_IMETHOD SetRows(const nsString& aRows) { return _to SetRows(aRows); } \ extern "C" NS_DOM nsresult NS_InitHTMLFrameSetElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLHRElement.h b/dom/public/html/nsIDOMHTMLHRElement.h index af7d166b6a9..40ec965342b 100644 --- a/dom/public/html/nsIDOMHTMLHRElement.h +++ b/dom/public/html/nsIDOMHTMLHRElement.h @@ -38,41 +38,41 @@ class nsIDOMHTMLHRElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLHRELEMENT_IID; return iid; } - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; NS_IMETHOD GetNoShade(PRBool* aNoShade)=0; NS_IMETHOD SetNoShade(PRBool aNoShade)=0; - NS_IMETHOD GetSize(nsAWritableString& aSize)=0; - NS_IMETHOD SetSize(const nsAReadableString& aSize)=0; + NS_IMETHOD GetSize(nsString& aSize)=0; + NS_IMETHOD SetSize(const nsString& aSize)=0; - NS_IMETHOD GetWidth(nsAWritableString& aWidth)=0; - NS_IMETHOD SetWidth(const nsAReadableString& aWidth)=0; + NS_IMETHOD GetWidth(nsString& aWidth)=0; + NS_IMETHOD SetWidth(const nsString& aWidth)=0; }; #define NS_DECL_IDOMHTMLHRELEMENT \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ NS_IMETHOD GetNoShade(PRBool* aNoShade); \ NS_IMETHOD SetNoShade(PRBool aNoShade); \ - NS_IMETHOD GetSize(nsAWritableString& aSize); \ - NS_IMETHOD SetSize(const nsAReadableString& aSize); \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth); \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth); \ + NS_IMETHOD GetSize(nsString& aSize); \ + NS_IMETHOD SetSize(const nsString& aSize); \ + NS_IMETHOD GetWidth(nsString& aWidth); \ + NS_IMETHOD SetWidth(const nsString& aWidth); \ #define NS_FORWARD_IDOMHTMLHRELEMENT(_to) \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ NS_IMETHOD GetNoShade(PRBool* aNoShade) { return _to GetNoShade(aNoShade); } \ NS_IMETHOD SetNoShade(PRBool aNoShade) { return _to SetNoShade(aNoShade); } \ - NS_IMETHOD GetSize(nsAWritableString& aSize) { return _to GetSize(aSize); } \ - NS_IMETHOD SetSize(const nsAReadableString& aSize) { return _to SetSize(aSize); } \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth) { return _to GetWidth(aWidth); } \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth) { return _to SetWidth(aWidth); } \ + NS_IMETHOD GetSize(nsString& aSize) { return _to GetSize(aSize); } \ + NS_IMETHOD SetSize(const nsString& aSize) { return _to SetSize(aSize); } \ + NS_IMETHOD GetWidth(nsString& aWidth) { return _to GetWidth(aWidth); } \ + NS_IMETHOD SetWidth(const nsString& aWidth) { return _to SetWidth(aWidth); } \ extern "C" NS_DOM nsresult NS_InitHTMLHRElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLHeadElement.h b/dom/public/html/nsIDOMHTMLHeadElement.h index bd7a0e7f510..af538154c0a 100644 --- a/dom/public/html/nsIDOMHTMLHeadElement.h +++ b/dom/public/html/nsIDOMHTMLHeadElement.h @@ -38,20 +38,20 @@ class nsIDOMHTMLHeadElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLHEADELEMENT_IID; return iid; } - NS_IMETHOD GetProfile(nsAWritableString& aProfile)=0; - NS_IMETHOD SetProfile(const nsAReadableString& aProfile)=0; + NS_IMETHOD GetProfile(nsString& aProfile)=0; + NS_IMETHOD SetProfile(const nsString& aProfile)=0; }; #define NS_DECL_IDOMHTMLHEADELEMENT \ - NS_IMETHOD GetProfile(nsAWritableString& aProfile); \ - NS_IMETHOD SetProfile(const nsAReadableString& aProfile); \ + NS_IMETHOD GetProfile(nsString& aProfile); \ + NS_IMETHOD SetProfile(const nsString& aProfile); \ #define NS_FORWARD_IDOMHTMLHEADELEMENT(_to) \ - NS_IMETHOD GetProfile(nsAWritableString& aProfile) { return _to GetProfile(aProfile); } \ - NS_IMETHOD SetProfile(const nsAReadableString& aProfile) { return _to SetProfile(aProfile); } \ + NS_IMETHOD GetProfile(nsString& aProfile) { return _to GetProfile(aProfile); } \ + NS_IMETHOD SetProfile(const nsString& aProfile) { return _to SetProfile(aProfile); } \ extern "C" NS_DOM nsresult NS_InitHTMLHeadElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLHeadingElement.h b/dom/public/html/nsIDOMHTMLHeadingElement.h index 6636ed1040b..ff4dc598b2d 100644 --- a/dom/public/html/nsIDOMHTMLHeadingElement.h +++ b/dom/public/html/nsIDOMHTMLHeadingElement.h @@ -38,20 +38,20 @@ class nsIDOMHTMLHeadingElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLHEADINGELEMENT_IID; return iid; } - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; }; #define NS_DECL_IDOMHTMLHEADINGELEMENT \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ #define NS_FORWARD_IDOMHTMLHEADINGELEMENT(_to) \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ extern "C" NS_DOM nsresult NS_InitHTMLHeadingElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLHtmlElement.h b/dom/public/html/nsIDOMHTMLHtmlElement.h index d14ca78bdee..d9dd3c6ab36 100644 --- a/dom/public/html/nsIDOMHTMLHtmlElement.h +++ b/dom/public/html/nsIDOMHTMLHtmlElement.h @@ -38,20 +38,20 @@ class nsIDOMHTMLHtmlElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLHTMLELEMENT_IID; return iid; } - NS_IMETHOD GetVersion(nsAWritableString& aVersion)=0; - NS_IMETHOD SetVersion(const nsAReadableString& aVersion)=0; + NS_IMETHOD GetVersion(nsString& aVersion)=0; + NS_IMETHOD SetVersion(const nsString& aVersion)=0; }; #define NS_DECL_IDOMHTMLHTMLELEMENT \ - NS_IMETHOD GetVersion(nsAWritableString& aVersion); \ - NS_IMETHOD SetVersion(const nsAReadableString& aVersion); \ + NS_IMETHOD GetVersion(nsString& aVersion); \ + NS_IMETHOD SetVersion(const nsString& aVersion); \ #define NS_FORWARD_IDOMHTMLHTMLELEMENT(_to) \ - NS_IMETHOD GetVersion(nsAWritableString& aVersion) { return _to GetVersion(aVersion); } \ - NS_IMETHOD SetVersion(const nsAReadableString& aVersion) { return _to SetVersion(aVersion); } \ + NS_IMETHOD GetVersion(nsString& aVersion) { return _to GetVersion(aVersion); } \ + NS_IMETHOD SetVersion(const nsString& aVersion) { return _to SetVersion(aVersion); } \ extern "C" NS_DOM nsresult NS_InitHTMLHtmlElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLIFrameElement.h b/dom/public/html/nsIDOMHTMLIFrameElement.h index dc7e48180cf..6d8bd97641f 100644 --- a/dom/public/html/nsIDOMHTMLIFrameElement.h +++ b/dom/public/html/nsIDOMHTMLIFrameElement.h @@ -39,35 +39,35 @@ class nsIDOMHTMLIFrameElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLIFRAMEELEMENT_IID; return iid; } - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; - NS_IMETHOD GetFrameBorder(nsAWritableString& aFrameBorder)=0; - NS_IMETHOD SetFrameBorder(const nsAReadableString& aFrameBorder)=0; + NS_IMETHOD GetFrameBorder(nsString& aFrameBorder)=0; + NS_IMETHOD SetFrameBorder(const nsString& aFrameBorder)=0; - NS_IMETHOD GetHeight(nsAWritableString& aHeight)=0; - NS_IMETHOD SetHeight(const nsAReadableString& aHeight)=0; + NS_IMETHOD GetHeight(nsString& aHeight)=0; + NS_IMETHOD SetHeight(const nsString& aHeight)=0; - NS_IMETHOD GetLongDesc(nsAWritableString& aLongDesc)=0; - NS_IMETHOD SetLongDesc(const nsAReadableString& aLongDesc)=0; + NS_IMETHOD GetLongDesc(nsString& aLongDesc)=0; + NS_IMETHOD SetLongDesc(const nsString& aLongDesc)=0; - NS_IMETHOD GetMarginHeight(nsAWritableString& aMarginHeight)=0; - NS_IMETHOD SetMarginHeight(const nsAReadableString& aMarginHeight)=0; + NS_IMETHOD GetMarginHeight(nsString& aMarginHeight)=0; + NS_IMETHOD SetMarginHeight(const nsString& aMarginHeight)=0; - NS_IMETHOD GetMarginWidth(nsAWritableString& aMarginWidth)=0; - NS_IMETHOD SetMarginWidth(const nsAReadableString& aMarginWidth)=0; + NS_IMETHOD GetMarginWidth(nsString& aMarginWidth)=0; + NS_IMETHOD SetMarginWidth(const nsString& aMarginWidth)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; - NS_IMETHOD GetScrolling(nsAWritableString& aScrolling)=0; - NS_IMETHOD SetScrolling(const nsAReadableString& aScrolling)=0; + NS_IMETHOD GetScrolling(nsString& aScrolling)=0; + NS_IMETHOD SetScrolling(const nsString& aScrolling)=0; - NS_IMETHOD GetSrc(nsAWritableString& aSrc)=0; - NS_IMETHOD SetSrc(const nsAReadableString& aSrc)=0; + NS_IMETHOD GetSrc(nsString& aSrc)=0; + NS_IMETHOD SetSrc(const nsString& aSrc)=0; - NS_IMETHOD GetWidth(nsAWritableString& aWidth)=0; - NS_IMETHOD SetWidth(const nsAReadableString& aWidth)=0; + NS_IMETHOD GetWidth(nsString& aWidth)=0; + NS_IMETHOD SetWidth(const nsString& aWidth)=0; NS_IMETHOD GetContentDocument(nsIDOMDocument** aContentDocument)=0; NS_IMETHOD SetContentDocument(nsIDOMDocument* aContentDocument)=0; @@ -75,52 +75,52 @@ public: #define NS_DECL_IDOMHTMLIFRAMEELEMENT \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ - NS_IMETHOD GetFrameBorder(nsAWritableString& aFrameBorder); \ - NS_IMETHOD SetFrameBorder(const nsAReadableString& aFrameBorder); \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight); \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight); \ - NS_IMETHOD GetLongDesc(nsAWritableString& aLongDesc); \ - NS_IMETHOD SetLongDesc(const nsAReadableString& aLongDesc); \ - NS_IMETHOD GetMarginHeight(nsAWritableString& aMarginHeight); \ - NS_IMETHOD SetMarginHeight(const nsAReadableString& aMarginHeight); \ - NS_IMETHOD GetMarginWidth(nsAWritableString& aMarginWidth); \ - NS_IMETHOD SetMarginWidth(const nsAReadableString& aMarginWidth); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ - NS_IMETHOD GetScrolling(nsAWritableString& aScrolling); \ - NS_IMETHOD SetScrolling(const nsAReadableString& aScrolling); \ - NS_IMETHOD GetSrc(nsAWritableString& aSrc); \ - NS_IMETHOD SetSrc(const nsAReadableString& aSrc); \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth); \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ + NS_IMETHOD GetFrameBorder(nsString& aFrameBorder); \ + NS_IMETHOD SetFrameBorder(const nsString& aFrameBorder); \ + NS_IMETHOD GetHeight(nsString& aHeight); \ + NS_IMETHOD SetHeight(const nsString& aHeight); \ + NS_IMETHOD GetLongDesc(nsString& aLongDesc); \ + NS_IMETHOD SetLongDesc(const nsString& aLongDesc); \ + NS_IMETHOD GetMarginHeight(nsString& aMarginHeight); \ + NS_IMETHOD SetMarginHeight(const nsString& aMarginHeight); \ + NS_IMETHOD GetMarginWidth(nsString& aMarginWidth); \ + NS_IMETHOD SetMarginWidth(const nsString& aMarginWidth); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ + NS_IMETHOD GetScrolling(nsString& aScrolling); \ + NS_IMETHOD SetScrolling(const nsString& aScrolling); \ + NS_IMETHOD GetSrc(nsString& aSrc); \ + NS_IMETHOD SetSrc(const nsString& aSrc); \ + NS_IMETHOD GetWidth(nsString& aWidth); \ + NS_IMETHOD SetWidth(const nsString& aWidth); \ NS_IMETHOD GetContentDocument(nsIDOMDocument** aContentDocument); \ NS_IMETHOD SetContentDocument(nsIDOMDocument* aContentDocument); \ #define NS_FORWARD_IDOMHTMLIFRAMEELEMENT(_to) \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ - NS_IMETHOD GetFrameBorder(nsAWritableString& aFrameBorder) { return _to GetFrameBorder(aFrameBorder); } \ - NS_IMETHOD SetFrameBorder(const nsAReadableString& aFrameBorder) { return _to SetFrameBorder(aFrameBorder); } \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight) { return _to GetHeight(aHeight); } \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight) { return _to SetHeight(aHeight); } \ - NS_IMETHOD GetLongDesc(nsAWritableString& aLongDesc) { return _to GetLongDesc(aLongDesc); } \ - NS_IMETHOD SetLongDesc(const nsAReadableString& aLongDesc) { return _to SetLongDesc(aLongDesc); } \ - NS_IMETHOD GetMarginHeight(nsAWritableString& aMarginHeight) { return _to GetMarginHeight(aMarginHeight); } \ - NS_IMETHOD SetMarginHeight(const nsAReadableString& aMarginHeight) { return _to SetMarginHeight(aMarginHeight); } \ - NS_IMETHOD GetMarginWidth(nsAWritableString& aMarginWidth) { return _to GetMarginWidth(aMarginWidth); } \ - NS_IMETHOD SetMarginWidth(const nsAReadableString& aMarginWidth) { return _to SetMarginWidth(aMarginWidth); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ - NS_IMETHOD GetScrolling(nsAWritableString& aScrolling) { return _to GetScrolling(aScrolling); } \ - NS_IMETHOD SetScrolling(const nsAReadableString& aScrolling) { return _to SetScrolling(aScrolling); } \ - NS_IMETHOD GetSrc(nsAWritableString& aSrc) { return _to GetSrc(aSrc); } \ - NS_IMETHOD SetSrc(const nsAReadableString& aSrc) { return _to SetSrc(aSrc); } \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth) { return _to GetWidth(aWidth); } \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth) { return _to SetWidth(aWidth); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetFrameBorder(nsString& aFrameBorder) { return _to GetFrameBorder(aFrameBorder); } \ + NS_IMETHOD SetFrameBorder(const nsString& aFrameBorder) { return _to SetFrameBorder(aFrameBorder); } \ + NS_IMETHOD GetHeight(nsString& aHeight) { return _to GetHeight(aHeight); } \ + NS_IMETHOD SetHeight(const nsString& aHeight) { return _to SetHeight(aHeight); } \ + NS_IMETHOD GetLongDesc(nsString& aLongDesc) { return _to GetLongDesc(aLongDesc); } \ + NS_IMETHOD SetLongDesc(const nsString& aLongDesc) { return _to SetLongDesc(aLongDesc); } \ + NS_IMETHOD GetMarginHeight(nsString& aMarginHeight) { return _to GetMarginHeight(aMarginHeight); } \ + NS_IMETHOD SetMarginHeight(const nsString& aMarginHeight) { return _to SetMarginHeight(aMarginHeight); } \ + NS_IMETHOD GetMarginWidth(nsString& aMarginWidth) { return _to GetMarginWidth(aMarginWidth); } \ + NS_IMETHOD SetMarginWidth(const nsString& aMarginWidth) { return _to SetMarginWidth(aMarginWidth); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetScrolling(nsString& aScrolling) { return _to GetScrolling(aScrolling); } \ + NS_IMETHOD SetScrolling(const nsString& aScrolling) { return _to SetScrolling(aScrolling); } \ + NS_IMETHOD GetSrc(nsString& aSrc) { return _to GetSrc(aSrc); } \ + NS_IMETHOD SetSrc(const nsString& aSrc) { return _to SetSrc(aSrc); } \ + NS_IMETHOD GetWidth(nsString& aWidth) { return _to GetWidth(aWidth); } \ + NS_IMETHOD SetWidth(const nsString& aWidth) { return _to SetWidth(aWidth); } \ NS_IMETHOD GetContentDocument(nsIDOMDocument** aContentDocument) { return _to GetContentDocument(aContentDocument); } \ NS_IMETHOD SetContentDocument(nsIDOMDocument* aContentDocument) { return _to SetContentDocument(aContentDocument); } \ diff --git a/dom/public/html/nsIDOMHTMLImageElement.h b/dom/public/html/nsIDOMHTMLImageElement.h index 02c775237de..ac7497f4497 100644 --- a/dom/public/html/nsIDOMHTMLImageElement.h +++ b/dom/public/html/nsIDOMHTMLImageElement.h @@ -38,104 +38,104 @@ class nsIDOMHTMLImageElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLIMAGEELEMENT_IID; return iid; } - NS_IMETHOD GetLowSrc(nsAWritableString& aLowSrc)=0; - NS_IMETHOD SetLowSrc(const nsAReadableString& aLowSrc)=0; + NS_IMETHOD GetLowSrc(nsString& aLowSrc)=0; + NS_IMETHOD SetLowSrc(const nsString& aLowSrc)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; - NS_IMETHOD GetAlt(nsAWritableString& aAlt)=0; - NS_IMETHOD SetAlt(const nsAReadableString& aAlt)=0; + NS_IMETHOD GetAlt(nsString& aAlt)=0; + NS_IMETHOD SetAlt(const nsString& aAlt)=0; - NS_IMETHOD GetBorder(nsAWritableString& aBorder)=0; - NS_IMETHOD SetBorder(const nsAReadableString& aBorder)=0; + NS_IMETHOD GetBorder(nsString& aBorder)=0; + NS_IMETHOD SetBorder(const nsString& aBorder)=0; - NS_IMETHOD GetHeight(nsAWritableString& aHeight)=0; - NS_IMETHOD SetHeight(const nsAReadableString& aHeight)=0; + NS_IMETHOD GetHeight(nsString& aHeight)=0; + NS_IMETHOD SetHeight(const nsString& aHeight)=0; - NS_IMETHOD GetHspace(nsAWritableString& aHspace)=0; - NS_IMETHOD SetHspace(const nsAReadableString& aHspace)=0; + NS_IMETHOD GetHspace(nsString& aHspace)=0; + NS_IMETHOD SetHspace(const nsString& aHspace)=0; NS_IMETHOD GetIsMap(PRBool* aIsMap)=0; NS_IMETHOD SetIsMap(PRBool aIsMap)=0; - NS_IMETHOD GetLongDesc(nsAWritableString& aLongDesc)=0; - NS_IMETHOD SetLongDesc(const nsAReadableString& aLongDesc)=0; + NS_IMETHOD GetLongDesc(nsString& aLongDesc)=0; + NS_IMETHOD SetLongDesc(const nsString& aLongDesc)=0; - NS_IMETHOD GetSrc(nsAWritableString& aSrc)=0; - NS_IMETHOD SetSrc(const nsAReadableString& aSrc)=0; + NS_IMETHOD GetSrc(nsString& aSrc)=0; + NS_IMETHOD SetSrc(const nsString& aSrc)=0; - NS_IMETHOD GetVspace(nsAWritableString& aVspace)=0; - NS_IMETHOD SetVspace(const nsAReadableString& aVspace)=0; + NS_IMETHOD GetVspace(nsString& aVspace)=0; + NS_IMETHOD SetVspace(const nsString& aVspace)=0; - NS_IMETHOD GetWidth(nsAWritableString& aWidth)=0; - NS_IMETHOD SetWidth(const nsAReadableString& aWidth)=0; + NS_IMETHOD GetWidth(nsString& aWidth)=0; + NS_IMETHOD SetWidth(const nsString& aWidth)=0; - NS_IMETHOD GetUseMap(nsAWritableString& aUseMap)=0; - NS_IMETHOD SetUseMap(const nsAReadableString& aUseMap)=0; + NS_IMETHOD GetUseMap(nsString& aUseMap)=0; + NS_IMETHOD SetUseMap(const nsString& aUseMap)=0; }; #define NS_DECL_IDOMHTMLIMAGEELEMENT \ - NS_IMETHOD GetLowSrc(nsAWritableString& aLowSrc); \ - NS_IMETHOD SetLowSrc(const nsAReadableString& aLowSrc); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ - NS_IMETHOD GetAlt(nsAWritableString& aAlt); \ - NS_IMETHOD SetAlt(const nsAReadableString& aAlt); \ - NS_IMETHOD GetBorder(nsAWritableString& aBorder); \ - NS_IMETHOD SetBorder(const nsAReadableString& aBorder); \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight); \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight); \ - NS_IMETHOD GetHspace(nsAWritableString& aHspace); \ - NS_IMETHOD SetHspace(const nsAReadableString& aHspace); \ + NS_IMETHOD GetLowSrc(nsString& aLowSrc); \ + NS_IMETHOD SetLowSrc(const nsString& aLowSrc); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ + NS_IMETHOD GetAlt(nsString& aAlt); \ + NS_IMETHOD SetAlt(const nsString& aAlt); \ + NS_IMETHOD GetBorder(nsString& aBorder); \ + NS_IMETHOD SetBorder(const nsString& aBorder); \ + NS_IMETHOD GetHeight(nsString& aHeight); \ + NS_IMETHOD SetHeight(const nsString& aHeight); \ + NS_IMETHOD GetHspace(nsString& aHspace); \ + NS_IMETHOD SetHspace(const nsString& aHspace); \ NS_IMETHOD GetIsMap(PRBool* aIsMap); \ NS_IMETHOD SetIsMap(PRBool aIsMap); \ - NS_IMETHOD GetLongDesc(nsAWritableString& aLongDesc); \ - NS_IMETHOD SetLongDesc(const nsAReadableString& aLongDesc); \ - NS_IMETHOD GetSrc(nsAWritableString& aSrc); \ - NS_IMETHOD SetSrc(const nsAReadableString& aSrc); \ - NS_IMETHOD GetVspace(nsAWritableString& aVspace); \ - NS_IMETHOD SetVspace(const nsAReadableString& aVspace); \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth); \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth); \ - NS_IMETHOD GetUseMap(nsAWritableString& aUseMap); \ - NS_IMETHOD SetUseMap(const nsAReadableString& aUseMap); \ + NS_IMETHOD GetLongDesc(nsString& aLongDesc); \ + NS_IMETHOD SetLongDesc(const nsString& aLongDesc); \ + NS_IMETHOD GetSrc(nsString& aSrc); \ + NS_IMETHOD SetSrc(const nsString& aSrc); \ + NS_IMETHOD GetVspace(nsString& aVspace); \ + NS_IMETHOD SetVspace(const nsString& aVspace); \ + NS_IMETHOD GetWidth(nsString& aWidth); \ + NS_IMETHOD SetWidth(const nsString& aWidth); \ + NS_IMETHOD GetUseMap(nsString& aUseMap); \ + NS_IMETHOD SetUseMap(const nsString& aUseMap); \ #define NS_FORWARD_IDOMHTMLIMAGEELEMENT(_to) \ - NS_IMETHOD GetLowSrc(nsAWritableString& aLowSrc) { return _to GetLowSrc(aLowSrc); } \ - NS_IMETHOD SetLowSrc(const nsAReadableString& aLowSrc) { return _to SetLowSrc(aLowSrc); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ - NS_IMETHOD GetAlt(nsAWritableString& aAlt) { return _to GetAlt(aAlt); } \ - NS_IMETHOD SetAlt(const nsAReadableString& aAlt) { return _to SetAlt(aAlt); } \ - NS_IMETHOD GetBorder(nsAWritableString& aBorder) { return _to GetBorder(aBorder); } \ - NS_IMETHOD SetBorder(const nsAReadableString& aBorder) { return _to SetBorder(aBorder); } \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight) { return _to GetHeight(aHeight); } \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight) { return _to SetHeight(aHeight); } \ - NS_IMETHOD GetHspace(nsAWritableString& aHspace) { return _to GetHspace(aHspace); } \ - NS_IMETHOD SetHspace(const nsAReadableString& aHspace) { return _to SetHspace(aHspace); } \ + NS_IMETHOD GetLowSrc(nsString& aLowSrc) { return _to GetLowSrc(aLowSrc); } \ + NS_IMETHOD SetLowSrc(const nsString& aLowSrc) { return _to SetLowSrc(aLowSrc); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetAlt(nsString& aAlt) { return _to GetAlt(aAlt); } \ + NS_IMETHOD SetAlt(const nsString& aAlt) { return _to SetAlt(aAlt); } \ + NS_IMETHOD GetBorder(nsString& aBorder) { return _to GetBorder(aBorder); } \ + NS_IMETHOD SetBorder(const nsString& aBorder) { return _to SetBorder(aBorder); } \ + NS_IMETHOD GetHeight(nsString& aHeight) { return _to GetHeight(aHeight); } \ + NS_IMETHOD SetHeight(const nsString& aHeight) { return _to SetHeight(aHeight); } \ + NS_IMETHOD GetHspace(nsString& aHspace) { return _to GetHspace(aHspace); } \ + NS_IMETHOD SetHspace(const nsString& aHspace) { return _to SetHspace(aHspace); } \ NS_IMETHOD GetIsMap(PRBool* aIsMap) { return _to GetIsMap(aIsMap); } \ NS_IMETHOD SetIsMap(PRBool aIsMap) { return _to SetIsMap(aIsMap); } \ - NS_IMETHOD GetLongDesc(nsAWritableString& aLongDesc) { return _to GetLongDesc(aLongDesc); } \ - NS_IMETHOD SetLongDesc(const nsAReadableString& aLongDesc) { return _to SetLongDesc(aLongDesc); } \ - NS_IMETHOD GetSrc(nsAWritableString& aSrc) { return _to GetSrc(aSrc); } \ - NS_IMETHOD SetSrc(const nsAReadableString& aSrc) { return _to SetSrc(aSrc); } \ - NS_IMETHOD GetVspace(nsAWritableString& aVspace) { return _to GetVspace(aVspace); } \ - NS_IMETHOD SetVspace(const nsAReadableString& aVspace) { return _to SetVspace(aVspace); } \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth) { return _to GetWidth(aWidth); } \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth) { return _to SetWidth(aWidth); } \ - NS_IMETHOD GetUseMap(nsAWritableString& aUseMap) { return _to GetUseMap(aUseMap); } \ - NS_IMETHOD SetUseMap(const nsAReadableString& aUseMap) { return _to SetUseMap(aUseMap); } \ + NS_IMETHOD GetLongDesc(nsString& aLongDesc) { return _to GetLongDesc(aLongDesc); } \ + NS_IMETHOD SetLongDesc(const nsString& aLongDesc) { return _to SetLongDesc(aLongDesc); } \ + NS_IMETHOD GetSrc(nsString& aSrc) { return _to GetSrc(aSrc); } \ + NS_IMETHOD SetSrc(const nsString& aSrc) { return _to SetSrc(aSrc); } \ + NS_IMETHOD GetVspace(nsString& aVspace) { return _to GetVspace(aVspace); } \ + NS_IMETHOD SetVspace(const nsString& aVspace) { return _to SetVspace(aVspace); } \ + NS_IMETHOD GetWidth(nsString& aWidth) { return _to GetWidth(aWidth); } \ + NS_IMETHOD SetWidth(const nsString& aWidth) { return _to SetWidth(aWidth); } \ + NS_IMETHOD GetUseMap(nsString& aUseMap) { return _to GetUseMap(aUseMap); } \ + NS_IMETHOD SetUseMap(const nsString& aUseMap) { return _to SetUseMap(aUseMap); } \ extern "C" NS_DOM nsresult NS_InitHTMLImageElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLInputElement.h b/dom/public/html/nsIDOMHTMLInputElement.h index dd80becf6e8..44566bdf1c1 100644 --- a/dom/public/html/nsIDOMHTMLInputElement.h +++ b/dom/public/html/nsIDOMHTMLInputElement.h @@ -39,25 +39,25 @@ class nsIDOMHTMLInputElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLINPUTELEMENT_IID; return iid; } - NS_IMETHOD GetDefaultValue(nsAWritableString& aDefaultValue)=0; - NS_IMETHOD SetDefaultValue(const nsAReadableString& aDefaultValue)=0; + NS_IMETHOD GetDefaultValue(nsString& aDefaultValue)=0; + NS_IMETHOD SetDefaultValue(const nsString& aDefaultValue)=0; NS_IMETHOD GetDefaultChecked(PRBool* aDefaultChecked)=0; NS_IMETHOD SetDefaultChecked(PRBool aDefaultChecked)=0; NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; - NS_IMETHOD GetAccept(nsAWritableString& aAccept)=0; - NS_IMETHOD SetAccept(const nsAReadableString& aAccept)=0; + NS_IMETHOD GetAccept(nsString& aAccept)=0; + NS_IMETHOD SetAccept(const nsString& aAccept)=0; - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey)=0; - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey)=0; + NS_IMETHOD GetAccessKey(nsString& aAccessKey)=0; + NS_IMETHOD SetAccessKey(const nsString& aAccessKey)=0; - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; - NS_IMETHOD GetAlt(nsAWritableString& aAlt)=0; - NS_IMETHOD SetAlt(const nsAReadableString& aAlt)=0; + NS_IMETHOD GetAlt(nsString& aAlt)=0; + NS_IMETHOD SetAlt(const nsString& aAlt)=0; NS_IMETHOD GetChecked(PRBool* aChecked)=0; NS_IMETHOD SetChecked(PRBool aChecked)=0; @@ -68,29 +68,29 @@ public: NS_IMETHOD GetMaxLength(PRInt32* aMaxLength)=0; NS_IMETHOD SetMaxLength(PRInt32 aMaxLength)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; NS_IMETHOD GetReadOnly(PRBool* aReadOnly)=0; NS_IMETHOD SetReadOnly(PRBool aReadOnly)=0; - NS_IMETHOD GetSize(nsAWritableString& aSize)=0; - NS_IMETHOD SetSize(const nsAReadableString& aSize)=0; + NS_IMETHOD GetSize(nsString& aSize)=0; + NS_IMETHOD SetSize(const nsString& aSize)=0; - NS_IMETHOD GetSrc(nsAWritableString& aSrc)=0; - NS_IMETHOD SetSrc(const nsAReadableString& aSrc)=0; + NS_IMETHOD GetSrc(nsString& aSrc)=0; + NS_IMETHOD SetSrc(const nsString& aSrc)=0; NS_IMETHOD GetTabIndex(PRInt32* aTabIndex)=0; NS_IMETHOD SetTabIndex(PRInt32 aTabIndex)=0; - NS_IMETHOD GetType(nsAWritableString& aType)=0; - NS_IMETHOD SetType(const nsAReadableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; + NS_IMETHOD SetType(const nsString& aType)=0; - NS_IMETHOD GetUseMap(nsAWritableString& aUseMap)=0; - NS_IMETHOD SetUseMap(const nsAReadableString& aUseMap)=0; + NS_IMETHOD GetUseMap(nsString& aUseMap)=0; + NS_IMETHOD SetUseMap(const nsString& aUseMap)=0; - NS_IMETHOD GetValue(nsAWritableString& aValue)=0; - NS_IMETHOD SetValue(const nsAReadableString& aValue)=0; + NS_IMETHOD GetValue(nsString& aValue)=0; + NS_IMETHOD SetValue(const nsString& aValue)=0; NS_IMETHOD Blur()=0; @@ -103,41 +103,41 @@ public: #define NS_DECL_IDOMHTMLINPUTELEMENT \ - NS_IMETHOD GetDefaultValue(nsAWritableString& aDefaultValue); \ - NS_IMETHOD SetDefaultValue(const nsAReadableString& aDefaultValue); \ + NS_IMETHOD GetDefaultValue(nsString& aDefaultValue); \ + NS_IMETHOD SetDefaultValue(const nsString& aDefaultValue); \ NS_IMETHOD GetDefaultChecked(PRBool* aDefaultChecked); \ NS_IMETHOD SetDefaultChecked(PRBool aDefaultChecked); \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm); \ - NS_IMETHOD GetAccept(nsAWritableString& aAccept); \ - NS_IMETHOD SetAccept(const nsAReadableString& aAccept); \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey); \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey); \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ - NS_IMETHOD GetAlt(nsAWritableString& aAlt); \ - NS_IMETHOD SetAlt(const nsAReadableString& aAlt); \ + NS_IMETHOD GetAccept(nsString& aAccept); \ + NS_IMETHOD SetAccept(const nsString& aAccept); \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey); \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ + NS_IMETHOD GetAlt(nsString& aAlt); \ + NS_IMETHOD SetAlt(const nsString& aAlt); \ NS_IMETHOD GetChecked(PRBool* aChecked); \ NS_IMETHOD SetChecked(PRBool aChecked); \ NS_IMETHOD GetDisabled(PRBool* aDisabled); \ NS_IMETHOD SetDisabled(PRBool aDisabled); \ NS_IMETHOD GetMaxLength(PRInt32* aMaxLength); \ NS_IMETHOD SetMaxLength(PRInt32 aMaxLength); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ NS_IMETHOD GetReadOnly(PRBool* aReadOnly); \ NS_IMETHOD SetReadOnly(PRBool aReadOnly); \ - NS_IMETHOD GetSize(nsAWritableString& aSize); \ - NS_IMETHOD SetSize(const nsAReadableString& aSize); \ - NS_IMETHOD GetSrc(nsAWritableString& aSrc); \ - NS_IMETHOD SetSrc(const nsAReadableString& aSrc); \ + NS_IMETHOD GetSize(nsString& aSize); \ + NS_IMETHOD SetSize(const nsString& aSize); \ + NS_IMETHOD GetSrc(nsString& aSrc); \ + NS_IMETHOD SetSrc(const nsString& aSrc); \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex); \ NS_IMETHOD SetTabIndex(PRInt32 aTabIndex); \ - NS_IMETHOD GetType(nsAWritableString& aType); \ - NS_IMETHOD SetType(const nsAReadableString& aType); \ - NS_IMETHOD GetUseMap(nsAWritableString& aUseMap); \ - NS_IMETHOD SetUseMap(const nsAReadableString& aUseMap); \ - NS_IMETHOD GetValue(nsAWritableString& aValue); \ - NS_IMETHOD SetValue(const nsAReadableString& aValue); \ + NS_IMETHOD GetType(nsString& aType); \ + NS_IMETHOD SetType(const nsString& aType); \ + NS_IMETHOD GetUseMap(nsString& aUseMap); \ + NS_IMETHOD SetUseMap(const nsString& aUseMap); \ + NS_IMETHOD GetValue(nsString& aValue); \ + NS_IMETHOD SetValue(const nsString& aValue); \ NS_IMETHOD Blur(); \ NS_IMETHOD Focus(); \ NS_IMETHOD Select(); \ @@ -146,41 +146,41 @@ public: #define NS_FORWARD_IDOMHTMLINPUTELEMENT(_to) \ - NS_IMETHOD GetDefaultValue(nsAWritableString& aDefaultValue) { return _to GetDefaultValue(aDefaultValue); } \ - NS_IMETHOD SetDefaultValue(const nsAReadableString& aDefaultValue) { return _to SetDefaultValue(aDefaultValue); } \ + NS_IMETHOD GetDefaultValue(nsString& aDefaultValue) { return _to GetDefaultValue(aDefaultValue); } \ + NS_IMETHOD SetDefaultValue(const nsString& aDefaultValue) { return _to SetDefaultValue(aDefaultValue); } \ NS_IMETHOD GetDefaultChecked(PRBool* aDefaultChecked) { return _to GetDefaultChecked(aDefaultChecked); } \ NS_IMETHOD SetDefaultChecked(PRBool aDefaultChecked) { return _to SetDefaultChecked(aDefaultChecked); } \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm) { return _to GetForm(aForm); } \ - NS_IMETHOD GetAccept(nsAWritableString& aAccept) { return _to GetAccept(aAccept); } \ - NS_IMETHOD SetAccept(const nsAReadableString& aAccept) { return _to SetAccept(aAccept); } \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ - NS_IMETHOD GetAlt(nsAWritableString& aAlt) { return _to GetAlt(aAlt); } \ - NS_IMETHOD SetAlt(const nsAReadableString& aAlt) { return _to SetAlt(aAlt); } \ + NS_IMETHOD GetAccept(nsString& aAccept) { return _to GetAccept(aAccept); } \ + NS_IMETHOD SetAccept(const nsString& aAccept) { return _to SetAccept(aAccept); } \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetAlt(nsString& aAlt) { return _to GetAlt(aAlt); } \ + NS_IMETHOD SetAlt(const nsString& aAlt) { return _to SetAlt(aAlt); } \ NS_IMETHOD GetChecked(PRBool* aChecked) { return _to GetChecked(aChecked); } \ NS_IMETHOD SetChecked(PRBool aChecked) { return _to SetChecked(aChecked); } \ NS_IMETHOD GetDisabled(PRBool* aDisabled) { return _to GetDisabled(aDisabled); } \ NS_IMETHOD SetDisabled(PRBool aDisabled) { return _to SetDisabled(aDisabled); } \ NS_IMETHOD GetMaxLength(PRInt32* aMaxLength) { return _to GetMaxLength(aMaxLength); } \ NS_IMETHOD SetMaxLength(PRInt32 aMaxLength) { return _to SetMaxLength(aMaxLength); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ NS_IMETHOD GetReadOnly(PRBool* aReadOnly) { return _to GetReadOnly(aReadOnly); } \ NS_IMETHOD SetReadOnly(PRBool aReadOnly) { return _to SetReadOnly(aReadOnly); } \ - NS_IMETHOD GetSize(nsAWritableString& aSize) { return _to GetSize(aSize); } \ - NS_IMETHOD SetSize(const nsAReadableString& aSize) { return _to SetSize(aSize); } \ - NS_IMETHOD GetSrc(nsAWritableString& aSrc) { return _to GetSrc(aSrc); } \ - NS_IMETHOD SetSrc(const nsAReadableString& aSrc) { return _to SetSrc(aSrc); } \ + NS_IMETHOD GetSize(nsString& aSize) { return _to GetSize(aSize); } \ + NS_IMETHOD SetSize(const nsString& aSize) { return _to SetSize(aSize); } \ + NS_IMETHOD GetSrc(nsString& aSrc) { return _to GetSrc(aSrc); } \ + NS_IMETHOD SetSrc(const nsString& aSrc) { return _to SetSrc(aSrc); } \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex) { return _to GetTabIndex(aTabIndex); } \ NS_IMETHOD SetTabIndex(PRInt32 aTabIndex) { return _to SetTabIndex(aTabIndex); } \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ - NS_IMETHOD SetType(const nsAReadableString& aType) { return _to SetType(aType); } \ - NS_IMETHOD GetUseMap(nsAWritableString& aUseMap) { return _to GetUseMap(aUseMap); } \ - NS_IMETHOD SetUseMap(const nsAReadableString& aUseMap) { return _to SetUseMap(aUseMap); } \ - NS_IMETHOD GetValue(nsAWritableString& aValue) { return _to GetValue(aValue); } \ - NS_IMETHOD SetValue(const nsAReadableString& aValue) { return _to SetValue(aValue); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ + NS_IMETHOD SetType(const nsString& aType) { return _to SetType(aType); } \ + NS_IMETHOD GetUseMap(nsString& aUseMap) { return _to GetUseMap(aUseMap); } \ + NS_IMETHOD SetUseMap(const nsString& aUseMap) { return _to SetUseMap(aUseMap); } \ + NS_IMETHOD GetValue(nsString& aValue) { return _to GetValue(aValue); } \ + NS_IMETHOD SetValue(const nsString& aValue) { return _to SetValue(aValue); } \ NS_IMETHOD Blur() { return _to Blur(); } \ NS_IMETHOD Focus() { return _to Focus(); } \ NS_IMETHOD Select() { return _to Select(); } \ diff --git a/dom/public/html/nsIDOMHTMLIsIndexElement.h b/dom/public/html/nsIDOMHTMLIsIndexElement.h index 1604b633cb1..9b316f3efcb 100644 --- a/dom/public/html/nsIDOMHTMLIsIndexElement.h +++ b/dom/public/html/nsIDOMHTMLIsIndexElement.h @@ -41,22 +41,22 @@ public: NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; - NS_IMETHOD GetPrompt(nsAWritableString& aPrompt)=0; - NS_IMETHOD SetPrompt(const nsAReadableString& aPrompt)=0; + NS_IMETHOD GetPrompt(nsString& aPrompt)=0; + NS_IMETHOD SetPrompt(const nsString& aPrompt)=0; }; #define NS_DECL_IDOMHTMLISINDEXELEMENT \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm); \ - NS_IMETHOD GetPrompt(nsAWritableString& aPrompt); \ - NS_IMETHOD SetPrompt(const nsAReadableString& aPrompt); \ + NS_IMETHOD GetPrompt(nsString& aPrompt); \ + NS_IMETHOD SetPrompt(const nsString& aPrompt); \ #define NS_FORWARD_IDOMHTMLISINDEXELEMENT(_to) \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm) { return _to GetForm(aForm); } \ - NS_IMETHOD GetPrompt(nsAWritableString& aPrompt) { return _to GetPrompt(aPrompt); } \ - NS_IMETHOD SetPrompt(const nsAReadableString& aPrompt) { return _to SetPrompt(aPrompt); } \ + NS_IMETHOD GetPrompt(nsString& aPrompt) { return _to GetPrompt(aPrompt); } \ + NS_IMETHOD SetPrompt(const nsString& aPrompt) { return _to SetPrompt(aPrompt); } \ extern "C" NS_DOM nsresult NS_InitHTMLIsIndexElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLLIElement.h b/dom/public/html/nsIDOMHTMLLIElement.h index dea6088c9a4..f7cc7b895dc 100644 --- a/dom/public/html/nsIDOMHTMLLIElement.h +++ b/dom/public/html/nsIDOMHTMLLIElement.h @@ -38,8 +38,8 @@ class nsIDOMHTMLLIElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLLIELEMENT_IID; return iid; } - NS_IMETHOD GetType(nsAWritableString& aType)=0; - NS_IMETHOD SetType(const nsAReadableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; + NS_IMETHOD SetType(const nsString& aType)=0; NS_IMETHOD GetValue(PRInt32* aValue)=0; NS_IMETHOD SetValue(PRInt32 aValue)=0; @@ -47,16 +47,16 @@ public: #define NS_DECL_IDOMHTMLLIELEMENT \ - NS_IMETHOD GetType(nsAWritableString& aType); \ - NS_IMETHOD SetType(const nsAReadableString& aType); \ + NS_IMETHOD GetType(nsString& aType); \ + NS_IMETHOD SetType(const nsString& aType); \ NS_IMETHOD GetValue(PRInt32* aValue); \ NS_IMETHOD SetValue(PRInt32 aValue); \ #define NS_FORWARD_IDOMHTMLLIELEMENT(_to) \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ - NS_IMETHOD SetType(const nsAReadableString& aType) { return _to SetType(aType); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ + NS_IMETHOD SetType(const nsString& aType) { return _to SetType(aType); } \ NS_IMETHOD GetValue(PRInt32* aValue) { return _to GetValue(aValue); } \ NS_IMETHOD SetValue(PRInt32 aValue) { return _to SetValue(aValue); } \ diff --git a/dom/public/html/nsIDOMHTMLLabelElement.h b/dom/public/html/nsIDOMHTMLLabelElement.h index 714ea9ea17f..afdf9d7483a 100644 --- a/dom/public/html/nsIDOMHTMLLabelElement.h +++ b/dom/public/html/nsIDOMHTMLLabelElement.h @@ -41,29 +41,29 @@ public: NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey)=0; - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey)=0; + NS_IMETHOD GetAccessKey(nsString& aAccessKey)=0; + NS_IMETHOD SetAccessKey(const nsString& aAccessKey)=0; - NS_IMETHOD GetHtmlFor(nsAWritableString& aHtmlFor)=0; - NS_IMETHOD SetHtmlFor(const nsAReadableString& aHtmlFor)=0; + NS_IMETHOD GetHtmlFor(nsString& aHtmlFor)=0; + NS_IMETHOD SetHtmlFor(const nsString& aHtmlFor)=0; }; #define NS_DECL_IDOMHTMLLABELELEMENT \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm); \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey); \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey); \ - NS_IMETHOD GetHtmlFor(nsAWritableString& aHtmlFor); \ - NS_IMETHOD SetHtmlFor(const nsAReadableString& aHtmlFor); \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey); \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey); \ + NS_IMETHOD GetHtmlFor(nsString& aHtmlFor); \ + NS_IMETHOD SetHtmlFor(const nsString& aHtmlFor); \ #define NS_FORWARD_IDOMHTMLLABELELEMENT(_to) \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm) { return _to GetForm(aForm); } \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ - NS_IMETHOD GetHtmlFor(nsAWritableString& aHtmlFor) { return _to GetHtmlFor(aHtmlFor); } \ - NS_IMETHOD SetHtmlFor(const nsAReadableString& aHtmlFor) { return _to SetHtmlFor(aHtmlFor); } \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ + NS_IMETHOD GetHtmlFor(nsString& aHtmlFor) { return _to GetHtmlFor(aHtmlFor); } \ + NS_IMETHOD SetHtmlFor(const nsString& aHtmlFor) { return _to SetHtmlFor(aHtmlFor); } \ extern "C" NS_DOM nsresult NS_InitHTMLLabelElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLLayerElement.h b/dom/public/html/nsIDOMHTMLLayerElement.h index a5a09b68ee2..efad0d6d258 100644 --- a/dom/public/html/nsIDOMHTMLLayerElement.h +++ b/dom/public/html/nsIDOMHTMLLayerElement.h @@ -45,17 +45,17 @@ public: NS_IMETHOD GetLeft(PRInt32* aLeft)=0; NS_IMETHOD SetLeft(PRInt32 aLeft)=0; - NS_IMETHOD GetVisibility(nsAWritableString& aVisibility)=0; - NS_IMETHOD SetVisibility(const nsAReadableString& aVisibility)=0; + NS_IMETHOD GetVisibility(nsString& aVisibility)=0; + NS_IMETHOD SetVisibility(const nsString& aVisibility)=0; - NS_IMETHOD GetBackground(nsAWritableString& aBackground)=0; - NS_IMETHOD SetBackground(const nsAReadableString& aBackground)=0; + NS_IMETHOD GetBackground(nsString& aBackground)=0; + NS_IMETHOD SetBackground(const nsString& aBackground)=0; - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor)=0; - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor)=0; + NS_IMETHOD GetBgColor(nsString& aBgColor)=0; + NS_IMETHOD SetBgColor(const nsString& aBgColor)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; NS_IMETHOD GetZIndex(PRInt32* aZIndex)=0; NS_IMETHOD SetZIndex(PRInt32 aZIndex)=0; @@ -69,14 +69,14 @@ public: NS_IMETHOD SetTop(PRInt32 aTop); \ NS_IMETHOD GetLeft(PRInt32* aLeft); \ NS_IMETHOD SetLeft(PRInt32 aLeft); \ - NS_IMETHOD GetVisibility(nsAWritableString& aVisibility); \ - NS_IMETHOD SetVisibility(const nsAReadableString& aVisibility); \ - NS_IMETHOD GetBackground(nsAWritableString& aBackground); \ - NS_IMETHOD SetBackground(const nsAReadableString& aBackground); \ - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor); \ - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ + NS_IMETHOD GetVisibility(nsString& aVisibility); \ + NS_IMETHOD SetVisibility(const nsString& aVisibility); \ + NS_IMETHOD GetBackground(nsString& aBackground); \ + NS_IMETHOD SetBackground(const nsString& aBackground); \ + NS_IMETHOD GetBgColor(nsString& aBgColor); \ + NS_IMETHOD SetBgColor(const nsString& aBgColor); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ NS_IMETHOD GetZIndex(PRInt32* aZIndex); \ NS_IMETHOD SetZIndex(PRInt32 aZIndex); \ NS_IMETHOD GetDocument(nsIDOMDocument** aDocument); \ @@ -88,14 +88,14 @@ public: NS_IMETHOD SetTop(PRInt32 aTop) { return _to SetTop(aTop); } \ NS_IMETHOD GetLeft(PRInt32* aLeft) { return _to GetLeft(aLeft); } \ NS_IMETHOD SetLeft(PRInt32 aLeft) { return _to SetLeft(aLeft); } \ - NS_IMETHOD GetVisibility(nsAWritableString& aVisibility) { return _to GetVisibility(aVisibility); } \ - NS_IMETHOD SetVisibility(const nsAReadableString& aVisibility) { return _to SetVisibility(aVisibility); } \ - NS_IMETHOD GetBackground(nsAWritableString& aBackground) { return _to GetBackground(aBackground); } \ - NS_IMETHOD SetBackground(const nsAReadableString& aBackground) { return _to SetBackground(aBackground); } \ - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor) { return _to GetBgColor(aBgColor); } \ - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor) { return _to SetBgColor(aBgColor); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetVisibility(nsString& aVisibility) { return _to GetVisibility(aVisibility); } \ + NS_IMETHOD SetVisibility(const nsString& aVisibility) { return _to SetVisibility(aVisibility); } \ + NS_IMETHOD GetBackground(nsString& aBackground) { return _to GetBackground(aBackground); } \ + NS_IMETHOD SetBackground(const nsString& aBackground) { return _to SetBackground(aBackground); } \ + NS_IMETHOD GetBgColor(nsString& aBgColor) { return _to GetBgColor(aBgColor); } \ + NS_IMETHOD SetBgColor(const nsString& aBgColor) { return _to SetBgColor(aBgColor); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ NS_IMETHOD GetZIndex(PRInt32* aZIndex) { return _to GetZIndex(aZIndex); } \ NS_IMETHOD SetZIndex(PRInt32 aZIndex) { return _to SetZIndex(aZIndex); } \ NS_IMETHOD GetDocument(nsIDOMDocument** aDocument) { return _to GetDocument(aDocument); } \ diff --git a/dom/public/html/nsIDOMHTMLLegendElement.h b/dom/public/html/nsIDOMHTMLLegendElement.h index 77d1799c089..6b7c893c045 100644 --- a/dom/public/html/nsIDOMHTMLLegendElement.h +++ b/dom/public/html/nsIDOMHTMLLegendElement.h @@ -41,29 +41,29 @@ public: NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey)=0; - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey)=0; + NS_IMETHOD GetAccessKey(nsString& aAccessKey)=0; + NS_IMETHOD SetAccessKey(const nsString& aAccessKey)=0; - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; }; #define NS_DECL_IDOMHTMLLEGENDELEMENT \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm); \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey); \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey); \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey); \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ #define NS_FORWARD_IDOMHTMLLEGENDELEMENT(_to) \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm) { return _to GetForm(aForm); } \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ extern "C" NS_DOM nsresult NS_InitHTMLLegendElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLLinkElement.h b/dom/public/html/nsIDOMHTMLLinkElement.h index c62afee1e8a..e617b6cf6ef 100644 --- a/dom/public/html/nsIDOMHTMLLinkElement.h +++ b/dom/public/html/nsIDOMHTMLLinkElement.h @@ -41,73 +41,73 @@ public: NS_IMETHOD GetDisabled(PRBool* aDisabled)=0; NS_IMETHOD SetDisabled(PRBool aDisabled)=0; - NS_IMETHOD GetCharset(nsAWritableString& aCharset)=0; - NS_IMETHOD SetCharset(const nsAReadableString& aCharset)=0; + NS_IMETHOD GetCharset(nsString& aCharset)=0; + NS_IMETHOD SetCharset(const nsString& aCharset)=0; - NS_IMETHOD GetHref(nsAWritableString& aHref)=0; - NS_IMETHOD SetHref(const nsAReadableString& aHref)=0; + NS_IMETHOD GetHref(nsString& aHref)=0; + NS_IMETHOD SetHref(const nsString& aHref)=0; - NS_IMETHOD GetHreflang(nsAWritableString& aHreflang)=0; - NS_IMETHOD SetHreflang(const nsAReadableString& aHreflang)=0; + NS_IMETHOD GetHreflang(nsString& aHreflang)=0; + NS_IMETHOD SetHreflang(const nsString& aHreflang)=0; - NS_IMETHOD GetMedia(nsAWritableString& aMedia)=0; - NS_IMETHOD SetMedia(const nsAReadableString& aMedia)=0; + NS_IMETHOD GetMedia(nsString& aMedia)=0; + NS_IMETHOD SetMedia(const nsString& aMedia)=0; - NS_IMETHOD GetRel(nsAWritableString& aRel)=0; - NS_IMETHOD SetRel(const nsAReadableString& aRel)=0; + NS_IMETHOD GetRel(nsString& aRel)=0; + NS_IMETHOD SetRel(const nsString& aRel)=0; - NS_IMETHOD GetRev(nsAWritableString& aRev)=0; - NS_IMETHOD SetRev(const nsAReadableString& aRev)=0; + NS_IMETHOD GetRev(nsString& aRev)=0; + NS_IMETHOD SetRev(const nsString& aRev)=0; - NS_IMETHOD GetTarget(nsAWritableString& aTarget)=0; - NS_IMETHOD SetTarget(const nsAReadableString& aTarget)=0; + NS_IMETHOD GetTarget(nsString& aTarget)=0; + NS_IMETHOD SetTarget(const nsString& aTarget)=0; - NS_IMETHOD GetType(nsAWritableString& aType)=0; - NS_IMETHOD SetType(const nsAReadableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; + NS_IMETHOD SetType(const nsString& aType)=0; }; #define NS_DECL_IDOMHTMLLINKELEMENT \ NS_IMETHOD GetDisabled(PRBool* aDisabled); \ NS_IMETHOD SetDisabled(PRBool aDisabled); \ - NS_IMETHOD GetCharset(nsAWritableString& aCharset); \ - NS_IMETHOD SetCharset(const nsAReadableString& aCharset); \ - NS_IMETHOD GetHref(nsAWritableString& aHref); \ - NS_IMETHOD SetHref(const nsAReadableString& aHref); \ - NS_IMETHOD GetHreflang(nsAWritableString& aHreflang); \ - NS_IMETHOD SetHreflang(const nsAReadableString& aHreflang); \ - NS_IMETHOD GetMedia(nsAWritableString& aMedia); \ - NS_IMETHOD SetMedia(const nsAReadableString& aMedia); \ - NS_IMETHOD GetRel(nsAWritableString& aRel); \ - NS_IMETHOD SetRel(const nsAReadableString& aRel); \ - NS_IMETHOD GetRev(nsAWritableString& aRev); \ - NS_IMETHOD SetRev(const nsAReadableString& aRev); \ - NS_IMETHOD GetTarget(nsAWritableString& aTarget); \ - NS_IMETHOD SetTarget(const nsAReadableString& aTarget); \ - NS_IMETHOD GetType(nsAWritableString& aType); \ - NS_IMETHOD SetType(const nsAReadableString& aType); \ + NS_IMETHOD GetCharset(nsString& aCharset); \ + NS_IMETHOD SetCharset(const nsString& aCharset); \ + NS_IMETHOD GetHref(nsString& aHref); \ + NS_IMETHOD SetHref(const nsString& aHref); \ + NS_IMETHOD GetHreflang(nsString& aHreflang); \ + NS_IMETHOD SetHreflang(const nsString& aHreflang); \ + NS_IMETHOD GetMedia(nsString& aMedia); \ + NS_IMETHOD SetMedia(const nsString& aMedia); \ + NS_IMETHOD GetRel(nsString& aRel); \ + NS_IMETHOD SetRel(const nsString& aRel); \ + NS_IMETHOD GetRev(nsString& aRev); \ + NS_IMETHOD SetRev(const nsString& aRev); \ + NS_IMETHOD GetTarget(nsString& aTarget); \ + NS_IMETHOD SetTarget(const nsString& aTarget); \ + NS_IMETHOD GetType(nsString& aType); \ + NS_IMETHOD SetType(const nsString& aType); \ #define NS_FORWARD_IDOMHTMLLINKELEMENT(_to) \ NS_IMETHOD GetDisabled(PRBool* aDisabled) { return _to GetDisabled(aDisabled); } \ NS_IMETHOD SetDisabled(PRBool aDisabled) { return _to SetDisabled(aDisabled); } \ - NS_IMETHOD GetCharset(nsAWritableString& aCharset) { return _to GetCharset(aCharset); } \ - NS_IMETHOD SetCharset(const nsAReadableString& aCharset) { return _to SetCharset(aCharset); } \ - NS_IMETHOD GetHref(nsAWritableString& aHref) { return _to GetHref(aHref); } \ - NS_IMETHOD SetHref(const nsAReadableString& aHref) { return _to SetHref(aHref); } \ - NS_IMETHOD GetHreflang(nsAWritableString& aHreflang) { return _to GetHreflang(aHreflang); } \ - NS_IMETHOD SetHreflang(const nsAReadableString& aHreflang) { return _to SetHreflang(aHreflang); } \ - NS_IMETHOD GetMedia(nsAWritableString& aMedia) { return _to GetMedia(aMedia); } \ - NS_IMETHOD SetMedia(const nsAReadableString& aMedia) { return _to SetMedia(aMedia); } \ - NS_IMETHOD GetRel(nsAWritableString& aRel) { return _to GetRel(aRel); } \ - NS_IMETHOD SetRel(const nsAReadableString& aRel) { return _to SetRel(aRel); } \ - NS_IMETHOD GetRev(nsAWritableString& aRev) { return _to GetRev(aRev); } \ - NS_IMETHOD SetRev(const nsAReadableString& aRev) { return _to SetRev(aRev); } \ - NS_IMETHOD GetTarget(nsAWritableString& aTarget) { return _to GetTarget(aTarget); } \ - NS_IMETHOD SetTarget(const nsAReadableString& aTarget) { return _to SetTarget(aTarget); } \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ - NS_IMETHOD SetType(const nsAReadableString& aType) { return _to SetType(aType); } \ + NS_IMETHOD GetCharset(nsString& aCharset) { return _to GetCharset(aCharset); } \ + NS_IMETHOD SetCharset(const nsString& aCharset) { return _to SetCharset(aCharset); } \ + NS_IMETHOD GetHref(nsString& aHref) { return _to GetHref(aHref); } \ + NS_IMETHOD SetHref(const nsString& aHref) { return _to SetHref(aHref); } \ + NS_IMETHOD GetHreflang(nsString& aHreflang) { return _to GetHreflang(aHreflang); } \ + NS_IMETHOD SetHreflang(const nsString& aHreflang) { return _to SetHreflang(aHreflang); } \ + NS_IMETHOD GetMedia(nsString& aMedia) { return _to GetMedia(aMedia); } \ + NS_IMETHOD SetMedia(const nsString& aMedia) { return _to SetMedia(aMedia); } \ + NS_IMETHOD GetRel(nsString& aRel) { return _to GetRel(aRel); } \ + NS_IMETHOD SetRel(const nsString& aRel) { return _to SetRel(aRel); } \ + NS_IMETHOD GetRev(nsString& aRev) { return _to GetRev(aRev); } \ + NS_IMETHOD SetRev(const nsString& aRev) { return _to SetRev(aRev); } \ + NS_IMETHOD GetTarget(nsString& aTarget) { return _to GetTarget(aTarget); } \ + NS_IMETHOD SetTarget(const nsString& aTarget) { return _to SetTarget(aTarget); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ + NS_IMETHOD SetType(const nsString& aType) { return _to SetType(aType); } \ extern "C" NS_DOM nsresult NS_InitHTMLLinkElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLMapElement.h b/dom/public/html/nsIDOMHTMLMapElement.h index f1775cb7024..36ff67f1b6a 100644 --- a/dom/public/html/nsIDOMHTMLMapElement.h +++ b/dom/public/html/nsIDOMHTMLMapElement.h @@ -41,22 +41,22 @@ public: NS_IMETHOD GetAreas(nsIDOMHTMLCollection** aAreas)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; }; #define NS_DECL_IDOMHTMLMAPELEMENT \ NS_IMETHOD GetAreas(nsIDOMHTMLCollection** aAreas); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ #define NS_FORWARD_IDOMHTMLMAPELEMENT(_to) \ NS_IMETHOD GetAreas(nsIDOMHTMLCollection** aAreas) { return _to GetAreas(aAreas); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ extern "C" NS_DOM nsresult NS_InitHTMLMapElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLMetaElement.h b/dom/public/html/nsIDOMHTMLMetaElement.h index 66cc1d3d3b6..b4ff801fb65 100644 --- a/dom/public/html/nsIDOMHTMLMetaElement.h +++ b/dom/public/html/nsIDOMHTMLMetaElement.h @@ -38,41 +38,41 @@ class nsIDOMHTMLMetaElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLMETAELEMENT_IID; return iid; } - NS_IMETHOD GetContent(nsAWritableString& aContent)=0; - NS_IMETHOD SetContent(const nsAReadableString& aContent)=0; + NS_IMETHOD GetContent(nsString& aContent)=0; + NS_IMETHOD SetContent(const nsString& aContent)=0; - NS_IMETHOD GetHttpEquiv(nsAWritableString& aHttpEquiv)=0; - NS_IMETHOD SetHttpEquiv(const nsAReadableString& aHttpEquiv)=0; + NS_IMETHOD GetHttpEquiv(nsString& aHttpEquiv)=0; + NS_IMETHOD SetHttpEquiv(const nsString& aHttpEquiv)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; - NS_IMETHOD GetScheme(nsAWritableString& aScheme)=0; - NS_IMETHOD SetScheme(const nsAReadableString& aScheme)=0; + NS_IMETHOD GetScheme(nsString& aScheme)=0; + NS_IMETHOD SetScheme(const nsString& aScheme)=0; }; #define NS_DECL_IDOMHTMLMETAELEMENT \ - NS_IMETHOD GetContent(nsAWritableString& aContent); \ - NS_IMETHOD SetContent(const nsAReadableString& aContent); \ - NS_IMETHOD GetHttpEquiv(nsAWritableString& aHttpEquiv); \ - NS_IMETHOD SetHttpEquiv(const nsAReadableString& aHttpEquiv); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ - NS_IMETHOD GetScheme(nsAWritableString& aScheme); \ - NS_IMETHOD SetScheme(const nsAReadableString& aScheme); \ + NS_IMETHOD GetContent(nsString& aContent); \ + NS_IMETHOD SetContent(const nsString& aContent); \ + NS_IMETHOD GetHttpEquiv(nsString& aHttpEquiv); \ + NS_IMETHOD SetHttpEquiv(const nsString& aHttpEquiv); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ + NS_IMETHOD GetScheme(nsString& aScheme); \ + NS_IMETHOD SetScheme(const nsString& aScheme); \ #define NS_FORWARD_IDOMHTMLMETAELEMENT(_to) \ - NS_IMETHOD GetContent(nsAWritableString& aContent) { return _to GetContent(aContent); } \ - NS_IMETHOD SetContent(const nsAReadableString& aContent) { return _to SetContent(aContent); } \ - NS_IMETHOD GetHttpEquiv(nsAWritableString& aHttpEquiv) { return _to GetHttpEquiv(aHttpEquiv); } \ - NS_IMETHOD SetHttpEquiv(const nsAReadableString& aHttpEquiv) { return _to SetHttpEquiv(aHttpEquiv); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ - NS_IMETHOD GetScheme(nsAWritableString& aScheme) { return _to GetScheme(aScheme); } \ - NS_IMETHOD SetScheme(const nsAReadableString& aScheme) { return _to SetScheme(aScheme); } \ + NS_IMETHOD GetContent(nsString& aContent) { return _to GetContent(aContent); } \ + NS_IMETHOD SetContent(const nsString& aContent) { return _to SetContent(aContent); } \ + NS_IMETHOD GetHttpEquiv(nsString& aHttpEquiv) { return _to GetHttpEquiv(aHttpEquiv); } \ + NS_IMETHOD SetHttpEquiv(const nsString& aHttpEquiv) { return _to SetHttpEquiv(aHttpEquiv); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetScheme(nsString& aScheme) { return _to GetScheme(aScheme); } \ + NS_IMETHOD SetScheme(const nsString& aScheme) { return _to SetScheme(aScheme); } \ extern "C" NS_DOM nsresult NS_InitHTMLMetaElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLModElement.h b/dom/public/html/nsIDOMHTMLModElement.h index 3d7816da9dd..671d7ed056a 100644 --- a/dom/public/html/nsIDOMHTMLModElement.h +++ b/dom/public/html/nsIDOMHTMLModElement.h @@ -38,27 +38,27 @@ class nsIDOMHTMLModElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLMODELEMENT_IID; return iid; } - NS_IMETHOD GetCite(nsAWritableString& aCite)=0; - NS_IMETHOD SetCite(const nsAReadableString& aCite)=0; + NS_IMETHOD GetCite(nsString& aCite)=0; + NS_IMETHOD SetCite(const nsString& aCite)=0; - NS_IMETHOD GetDateTime(nsAWritableString& aDateTime)=0; - NS_IMETHOD SetDateTime(const nsAReadableString& aDateTime)=0; + NS_IMETHOD GetDateTime(nsString& aDateTime)=0; + NS_IMETHOD SetDateTime(const nsString& aDateTime)=0; }; #define NS_DECL_IDOMHTMLMODELEMENT \ - NS_IMETHOD GetCite(nsAWritableString& aCite); \ - NS_IMETHOD SetCite(const nsAReadableString& aCite); \ - NS_IMETHOD GetDateTime(nsAWritableString& aDateTime); \ - NS_IMETHOD SetDateTime(const nsAReadableString& aDateTime); \ + NS_IMETHOD GetCite(nsString& aCite); \ + NS_IMETHOD SetCite(const nsString& aCite); \ + NS_IMETHOD GetDateTime(nsString& aDateTime); \ + NS_IMETHOD SetDateTime(const nsString& aDateTime); \ #define NS_FORWARD_IDOMHTMLMODELEMENT(_to) \ - NS_IMETHOD GetCite(nsAWritableString& aCite) { return _to GetCite(aCite); } \ - NS_IMETHOD SetCite(const nsAReadableString& aCite) { return _to SetCite(aCite); } \ - NS_IMETHOD GetDateTime(nsAWritableString& aDateTime) { return _to GetDateTime(aDateTime); } \ - NS_IMETHOD SetDateTime(const nsAReadableString& aDateTime) { return _to SetDateTime(aDateTime); } \ + NS_IMETHOD GetCite(nsString& aCite) { return _to GetCite(aCite); } \ + NS_IMETHOD SetCite(const nsString& aCite) { return _to SetCite(aCite); } \ + NS_IMETHOD GetDateTime(nsString& aDateTime) { return _to GetDateTime(aDateTime); } \ + NS_IMETHOD SetDateTime(const nsString& aDateTime) { return _to SetDateTime(aDateTime); } \ extern "C" NS_DOM nsresult NS_InitHTMLModElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLOListElement.h b/dom/public/html/nsIDOMHTMLOListElement.h index 9023e77562c..102e65448bc 100644 --- a/dom/public/html/nsIDOMHTMLOListElement.h +++ b/dom/public/html/nsIDOMHTMLOListElement.h @@ -44,8 +44,8 @@ public: NS_IMETHOD GetStart(PRInt32* aStart)=0; NS_IMETHOD SetStart(PRInt32 aStart)=0; - NS_IMETHOD GetType(nsAWritableString& aType)=0; - NS_IMETHOD SetType(const nsAReadableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; + NS_IMETHOD SetType(const nsString& aType)=0; }; @@ -54,8 +54,8 @@ public: NS_IMETHOD SetCompact(PRBool aCompact); \ NS_IMETHOD GetStart(PRInt32* aStart); \ NS_IMETHOD SetStart(PRInt32 aStart); \ - NS_IMETHOD GetType(nsAWritableString& aType); \ - NS_IMETHOD SetType(const nsAReadableString& aType); \ + NS_IMETHOD GetType(nsString& aType); \ + NS_IMETHOD SetType(const nsString& aType); \ @@ -64,8 +64,8 @@ public: NS_IMETHOD SetCompact(PRBool aCompact) { return _to SetCompact(aCompact); } \ NS_IMETHOD GetStart(PRInt32* aStart) { return _to GetStart(aStart); } \ NS_IMETHOD SetStart(PRInt32 aStart) { return _to SetStart(aStart); } \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ - NS_IMETHOD SetType(const nsAReadableString& aType) { return _to SetType(aType); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ + NS_IMETHOD SetType(const nsString& aType) { return _to SetType(aType); } \ extern "C" NS_DOM nsresult NS_InitHTMLOListElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLObjectElement.h b/dom/public/html/nsIDOMHTMLObjectElement.h index 339c02e632c..c333983b8ac 100644 --- a/dom/public/html/nsIDOMHTMLObjectElement.h +++ b/dom/public/html/nsIDOMHTMLObjectElement.h @@ -42,56 +42,56 @@ public: NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; - NS_IMETHOD GetCode(nsAWritableString& aCode)=0; - NS_IMETHOD SetCode(const nsAReadableString& aCode)=0; + NS_IMETHOD GetCode(nsString& aCode)=0; + NS_IMETHOD SetCode(const nsString& aCode)=0; - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; - NS_IMETHOD GetArchive(nsAWritableString& aArchive)=0; - NS_IMETHOD SetArchive(const nsAReadableString& aArchive)=0; + NS_IMETHOD GetArchive(nsString& aArchive)=0; + NS_IMETHOD SetArchive(const nsString& aArchive)=0; - NS_IMETHOD GetBorder(nsAWritableString& aBorder)=0; - NS_IMETHOD SetBorder(const nsAReadableString& aBorder)=0; + NS_IMETHOD GetBorder(nsString& aBorder)=0; + NS_IMETHOD SetBorder(const nsString& aBorder)=0; - NS_IMETHOD GetCodeBase(nsAWritableString& aCodeBase)=0; - NS_IMETHOD SetCodeBase(const nsAReadableString& aCodeBase)=0; + NS_IMETHOD GetCodeBase(nsString& aCodeBase)=0; + NS_IMETHOD SetCodeBase(const nsString& aCodeBase)=0; - NS_IMETHOD GetCodeType(nsAWritableString& aCodeType)=0; - NS_IMETHOD SetCodeType(const nsAReadableString& aCodeType)=0; + NS_IMETHOD GetCodeType(nsString& aCodeType)=0; + NS_IMETHOD SetCodeType(const nsString& aCodeType)=0; - NS_IMETHOD GetData(nsAWritableString& aData)=0; - NS_IMETHOD SetData(const nsAReadableString& aData)=0; + NS_IMETHOD GetData(nsString& aData)=0; + NS_IMETHOD SetData(const nsString& aData)=0; NS_IMETHOD GetDeclare(PRBool* aDeclare)=0; NS_IMETHOD SetDeclare(PRBool aDeclare)=0; - NS_IMETHOD GetHeight(nsAWritableString& aHeight)=0; - NS_IMETHOD SetHeight(const nsAReadableString& aHeight)=0; + NS_IMETHOD GetHeight(nsString& aHeight)=0; + NS_IMETHOD SetHeight(const nsString& aHeight)=0; - NS_IMETHOD GetHspace(nsAWritableString& aHspace)=0; - NS_IMETHOD SetHspace(const nsAReadableString& aHspace)=0; + NS_IMETHOD GetHspace(nsString& aHspace)=0; + NS_IMETHOD SetHspace(const nsString& aHspace)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; - NS_IMETHOD GetStandby(nsAWritableString& aStandby)=0; - NS_IMETHOD SetStandby(const nsAReadableString& aStandby)=0; + NS_IMETHOD GetStandby(nsString& aStandby)=0; + NS_IMETHOD SetStandby(const nsString& aStandby)=0; NS_IMETHOD GetTabIndex(PRInt32* aTabIndex)=0; NS_IMETHOD SetTabIndex(PRInt32 aTabIndex)=0; - NS_IMETHOD GetType(nsAWritableString& aType)=0; - NS_IMETHOD SetType(const nsAReadableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; + NS_IMETHOD SetType(const nsString& aType)=0; - NS_IMETHOD GetUseMap(nsAWritableString& aUseMap)=0; - NS_IMETHOD SetUseMap(const nsAReadableString& aUseMap)=0; + NS_IMETHOD GetUseMap(nsString& aUseMap)=0; + NS_IMETHOD SetUseMap(const nsString& aUseMap)=0; - NS_IMETHOD GetVspace(nsAWritableString& aVspace)=0; - NS_IMETHOD SetVspace(const nsAReadableString& aVspace)=0; + NS_IMETHOD GetVspace(nsString& aVspace)=0; + NS_IMETHOD SetVspace(const nsString& aVspace)=0; - NS_IMETHOD GetWidth(nsAWritableString& aWidth)=0; - NS_IMETHOD SetWidth(const nsAReadableString& aWidth)=0; + NS_IMETHOD GetWidth(nsString& aWidth)=0; + NS_IMETHOD SetWidth(const nsString& aWidth)=0; NS_IMETHOD GetContentDocument(nsIDOMDocument** aContentDocument)=0; NS_IMETHOD SetContentDocument(nsIDOMDocument* aContentDocument)=0; @@ -100,40 +100,40 @@ public: #define NS_DECL_IDOMHTMLOBJECTELEMENT \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm); \ - NS_IMETHOD GetCode(nsAWritableString& aCode); \ - NS_IMETHOD SetCode(const nsAReadableString& aCode); \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ - NS_IMETHOD GetArchive(nsAWritableString& aArchive); \ - NS_IMETHOD SetArchive(const nsAReadableString& aArchive); \ - NS_IMETHOD GetBorder(nsAWritableString& aBorder); \ - NS_IMETHOD SetBorder(const nsAReadableString& aBorder); \ - NS_IMETHOD GetCodeBase(nsAWritableString& aCodeBase); \ - NS_IMETHOD SetCodeBase(const nsAReadableString& aCodeBase); \ - NS_IMETHOD GetCodeType(nsAWritableString& aCodeType); \ - NS_IMETHOD SetCodeType(const nsAReadableString& aCodeType); \ - NS_IMETHOD GetData(nsAWritableString& aData); \ - NS_IMETHOD SetData(const nsAReadableString& aData); \ + NS_IMETHOD GetCode(nsString& aCode); \ + NS_IMETHOD SetCode(const nsString& aCode); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ + NS_IMETHOD GetArchive(nsString& aArchive); \ + NS_IMETHOD SetArchive(const nsString& aArchive); \ + NS_IMETHOD GetBorder(nsString& aBorder); \ + NS_IMETHOD SetBorder(const nsString& aBorder); \ + NS_IMETHOD GetCodeBase(nsString& aCodeBase); \ + NS_IMETHOD SetCodeBase(const nsString& aCodeBase); \ + NS_IMETHOD GetCodeType(nsString& aCodeType); \ + NS_IMETHOD SetCodeType(const nsString& aCodeType); \ + NS_IMETHOD GetData(nsString& aData); \ + NS_IMETHOD SetData(const nsString& aData); \ NS_IMETHOD GetDeclare(PRBool* aDeclare); \ NS_IMETHOD SetDeclare(PRBool aDeclare); \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight); \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight); \ - NS_IMETHOD GetHspace(nsAWritableString& aHspace); \ - NS_IMETHOD SetHspace(const nsAReadableString& aHspace); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ - NS_IMETHOD GetStandby(nsAWritableString& aStandby); \ - NS_IMETHOD SetStandby(const nsAReadableString& aStandby); \ + NS_IMETHOD GetHeight(nsString& aHeight); \ + NS_IMETHOD SetHeight(const nsString& aHeight); \ + NS_IMETHOD GetHspace(nsString& aHspace); \ + NS_IMETHOD SetHspace(const nsString& aHspace); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ + NS_IMETHOD GetStandby(nsString& aStandby); \ + NS_IMETHOD SetStandby(const nsString& aStandby); \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex); \ NS_IMETHOD SetTabIndex(PRInt32 aTabIndex); \ - NS_IMETHOD GetType(nsAWritableString& aType); \ - NS_IMETHOD SetType(const nsAReadableString& aType); \ - NS_IMETHOD GetUseMap(nsAWritableString& aUseMap); \ - NS_IMETHOD SetUseMap(const nsAReadableString& aUseMap); \ - NS_IMETHOD GetVspace(nsAWritableString& aVspace); \ - NS_IMETHOD SetVspace(const nsAReadableString& aVspace); \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth); \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth); \ + NS_IMETHOD GetType(nsString& aType); \ + NS_IMETHOD SetType(const nsString& aType); \ + NS_IMETHOD GetUseMap(nsString& aUseMap); \ + NS_IMETHOD SetUseMap(const nsString& aUseMap); \ + NS_IMETHOD GetVspace(nsString& aVspace); \ + NS_IMETHOD SetVspace(const nsString& aVspace); \ + NS_IMETHOD GetWidth(nsString& aWidth); \ + NS_IMETHOD SetWidth(const nsString& aWidth); \ NS_IMETHOD GetContentDocument(nsIDOMDocument** aContentDocument); \ NS_IMETHOD SetContentDocument(nsIDOMDocument* aContentDocument); \ @@ -141,40 +141,40 @@ public: #define NS_FORWARD_IDOMHTMLOBJECTELEMENT(_to) \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm) { return _to GetForm(aForm); } \ - NS_IMETHOD GetCode(nsAWritableString& aCode) { return _to GetCode(aCode); } \ - NS_IMETHOD SetCode(const nsAReadableString& aCode) { return _to SetCode(aCode); } \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ - NS_IMETHOD GetArchive(nsAWritableString& aArchive) { return _to GetArchive(aArchive); } \ - NS_IMETHOD SetArchive(const nsAReadableString& aArchive) { return _to SetArchive(aArchive); } \ - NS_IMETHOD GetBorder(nsAWritableString& aBorder) { return _to GetBorder(aBorder); } \ - NS_IMETHOD SetBorder(const nsAReadableString& aBorder) { return _to SetBorder(aBorder); } \ - NS_IMETHOD GetCodeBase(nsAWritableString& aCodeBase) { return _to GetCodeBase(aCodeBase); } \ - NS_IMETHOD SetCodeBase(const nsAReadableString& aCodeBase) { return _to SetCodeBase(aCodeBase); } \ - NS_IMETHOD GetCodeType(nsAWritableString& aCodeType) { return _to GetCodeType(aCodeType); } \ - NS_IMETHOD SetCodeType(const nsAReadableString& aCodeType) { return _to SetCodeType(aCodeType); } \ - NS_IMETHOD GetData(nsAWritableString& aData) { return _to GetData(aData); } \ - NS_IMETHOD SetData(const nsAReadableString& aData) { return _to SetData(aData); } \ + NS_IMETHOD GetCode(nsString& aCode) { return _to GetCode(aCode); } \ + NS_IMETHOD SetCode(const nsString& aCode) { return _to SetCode(aCode); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetArchive(nsString& aArchive) { return _to GetArchive(aArchive); } \ + NS_IMETHOD SetArchive(const nsString& aArchive) { return _to SetArchive(aArchive); } \ + NS_IMETHOD GetBorder(nsString& aBorder) { return _to GetBorder(aBorder); } \ + NS_IMETHOD SetBorder(const nsString& aBorder) { return _to SetBorder(aBorder); } \ + NS_IMETHOD GetCodeBase(nsString& aCodeBase) { return _to GetCodeBase(aCodeBase); } \ + NS_IMETHOD SetCodeBase(const nsString& aCodeBase) { return _to SetCodeBase(aCodeBase); } \ + NS_IMETHOD GetCodeType(nsString& aCodeType) { return _to GetCodeType(aCodeType); } \ + NS_IMETHOD SetCodeType(const nsString& aCodeType) { return _to SetCodeType(aCodeType); } \ + NS_IMETHOD GetData(nsString& aData) { return _to GetData(aData); } \ + NS_IMETHOD SetData(const nsString& aData) { return _to SetData(aData); } \ NS_IMETHOD GetDeclare(PRBool* aDeclare) { return _to GetDeclare(aDeclare); } \ NS_IMETHOD SetDeclare(PRBool aDeclare) { return _to SetDeclare(aDeclare); } \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight) { return _to GetHeight(aHeight); } \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight) { return _to SetHeight(aHeight); } \ - NS_IMETHOD GetHspace(nsAWritableString& aHspace) { return _to GetHspace(aHspace); } \ - NS_IMETHOD SetHspace(const nsAReadableString& aHspace) { return _to SetHspace(aHspace); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ - NS_IMETHOD GetStandby(nsAWritableString& aStandby) { return _to GetStandby(aStandby); } \ - NS_IMETHOD SetStandby(const nsAReadableString& aStandby) { return _to SetStandby(aStandby); } \ + NS_IMETHOD GetHeight(nsString& aHeight) { return _to GetHeight(aHeight); } \ + NS_IMETHOD SetHeight(const nsString& aHeight) { return _to SetHeight(aHeight); } \ + NS_IMETHOD GetHspace(nsString& aHspace) { return _to GetHspace(aHspace); } \ + NS_IMETHOD SetHspace(const nsString& aHspace) { return _to SetHspace(aHspace); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetStandby(nsString& aStandby) { return _to GetStandby(aStandby); } \ + NS_IMETHOD SetStandby(const nsString& aStandby) { return _to SetStandby(aStandby); } \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex) { return _to GetTabIndex(aTabIndex); } \ NS_IMETHOD SetTabIndex(PRInt32 aTabIndex) { return _to SetTabIndex(aTabIndex); } \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ - NS_IMETHOD SetType(const nsAReadableString& aType) { return _to SetType(aType); } \ - NS_IMETHOD GetUseMap(nsAWritableString& aUseMap) { return _to GetUseMap(aUseMap); } \ - NS_IMETHOD SetUseMap(const nsAReadableString& aUseMap) { return _to SetUseMap(aUseMap); } \ - NS_IMETHOD GetVspace(nsAWritableString& aVspace) { return _to GetVspace(aVspace); } \ - NS_IMETHOD SetVspace(const nsAReadableString& aVspace) { return _to SetVspace(aVspace); } \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth) { return _to GetWidth(aWidth); } \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth) { return _to SetWidth(aWidth); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ + NS_IMETHOD SetType(const nsString& aType) { return _to SetType(aType); } \ + NS_IMETHOD GetUseMap(nsString& aUseMap) { return _to GetUseMap(aUseMap); } \ + NS_IMETHOD SetUseMap(const nsString& aUseMap) { return _to SetUseMap(aUseMap); } \ + NS_IMETHOD GetVspace(nsString& aVspace) { return _to GetVspace(aVspace); } \ + NS_IMETHOD SetVspace(const nsString& aVspace) { return _to SetVspace(aVspace); } \ + NS_IMETHOD GetWidth(nsString& aWidth) { return _to GetWidth(aWidth); } \ + NS_IMETHOD SetWidth(const nsString& aWidth) { return _to SetWidth(aWidth); } \ NS_IMETHOD GetContentDocument(nsIDOMDocument** aContentDocument) { return _to GetContentDocument(aContentDocument); } \ NS_IMETHOD SetContentDocument(nsIDOMDocument* aContentDocument) { return _to SetContentDocument(aContentDocument); } \ diff --git a/dom/public/html/nsIDOMHTMLOptGroupElement.h b/dom/public/html/nsIDOMHTMLOptGroupElement.h index c97fed629f7..a3c6508c107 100644 --- a/dom/public/html/nsIDOMHTMLOptGroupElement.h +++ b/dom/public/html/nsIDOMHTMLOptGroupElement.h @@ -41,24 +41,24 @@ public: NS_IMETHOD GetDisabled(PRBool* aDisabled)=0; NS_IMETHOD SetDisabled(PRBool aDisabled)=0; - NS_IMETHOD GetLabel(nsAWritableString& aLabel)=0; - NS_IMETHOD SetLabel(const nsAReadableString& aLabel)=0; + NS_IMETHOD GetLabel(nsString& aLabel)=0; + NS_IMETHOD SetLabel(const nsString& aLabel)=0; }; #define NS_DECL_IDOMHTMLOPTGROUPELEMENT \ NS_IMETHOD GetDisabled(PRBool* aDisabled); \ NS_IMETHOD SetDisabled(PRBool aDisabled); \ - NS_IMETHOD GetLabel(nsAWritableString& aLabel); \ - NS_IMETHOD SetLabel(const nsAReadableString& aLabel); \ + NS_IMETHOD GetLabel(nsString& aLabel); \ + NS_IMETHOD SetLabel(const nsString& aLabel); \ #define NS_FORWARD_IDOMHTMLOPTGROUPELEMENT(_to) \ NS_IMETHOD GetDisabled(PRBool* aDisabled) { return _to GetDisabled(aDisabled); } \ NS_IMETHOD SetDisabled(PRBool aDisabled) { return _to SetDisabled(aDisabled); } \ - NS_IMETHOD GetLabel(nsAWritableString& aLabel) { return _to GetLabel(aLabel); } \ - NS_IMETHOD SetLabel(const nsAReadableString& aLabel) { return _to SetLabel(aLabel); } \ + NS_IMETHOD GetLabel(nsString& aLabel) { return _to GetLabel(aLabel); } \ + NS_IMETHOD SetLabel(const nsString& aLabel) { return _to SetLabel(aLabel); } \ extern "C" NS_DOM nsresult NS_InitHTMLOptGroupElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLOptionElement.h b/dom/public/html/nsIDOMHTMLOptionElement.h index 36fba7b9162..1281d8bc316 100644 --- a/dom/public/html/nsIDOMHTMLOptionElement.h +++ b/dom/public/html/nsIDOMHTMLOptionElement.h @@ -44,22 +44,22 @@ public: NS_IMETHOD GetDefaultSelected(PRBool* aDefaultSelected)=0; NS_IMETHOD SetDefaultSelected(PRBool aDefaultSelected)=0; - NS_IMETHOD GetText(nsAWritableString& aText)=0; - NS_IMETHOD SetText(const nsAReadableString& aText)=0; + NS_IMETHOD GetText(nsString& aText)=0; + NS_IMETHOD SetText(const nsString& aText)=0; NS_IMETHOD GetIndex(PRInt32* aIndex)=0; NS_IMETHOD GetDisabled(PRBool* aDisabled)=0; NS_IMETHOD SetDisabled(PRBool aDisabled)=0; - NS_IMETHOD GetLabel(nsAWritableString& aLabel)=0; - NS_IMETHOD SetLabel(const nsAReadableString& aLabel)=0; + NS_IMETHOD GetLabel(nsString& aLabel)=0; + NS_IMETHOD SetLabel(const nsString& aLabel)=0; NS_IMETHOD GetSelected(PRBool* aSelected)=0; NS_IMETHOD SetSelected(PRBool aSelected)=0; - NS_IMETHOD GetValue(nsAWritableString& aValue)=0; - NS_IMETHOD SetValue(const nsAReadableString& aValue)=0; + NS_IMETHOD GetValue(nsString& aValue)=0; + NS_IMETHOD SetValue(const nsString& aValue)=0; }; @@ -67,17 +67,17 @@ public: NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm); \ NS_IMETHOD GetDefaultSelected(PRBool* aDefaultSelected); \ NS_IMETHOD SetDefaultSelected(PRBool aDefaultSelected); \ - NS_IMETHOD GetText(nsAWritableString& aText); \ - NS_IMETHOD SetText(const nsAReadableString& aText); \ + NS_IMETHOD GetText(nsString& aText); \ + NS_IMETHOD SetText(const nsString& aText); \ NS_IMETHOD GetIndex(PRInt32* aIndex); \ NS_IMETHOD GetDisabled(PRBool* aDisabled); \ NS_IMETHOD SetDisabled(PRBool aDisabled); \ - NS_IMETHOD GetLabel(nsAWritableString& aLabel); \ - NS_IMETHOD SetLabel(const nsAReadableString& aLabel); \ + NS_IMETHOD GetLabel(nsString& aLabel); \ + NS_IMETHOD SetLabel(const nsString& aLabel); \ NS_IMETHOD GetSelected(PRBool* aSelected); \ NS_IMETHOD SetSelected(PRBool aSelected); \ - NS_IMETHOD GetValue(nsAWritableString& aValue); \ - NS_IMETHOD SetValue(const nsAReadableString& aValue); \ + NS_IMETHOD GetValue(nsString& aValue); \ + NS_IMETHOD SetValue(const nsString& aValue); \ @@ -85,17 +85,17 @@ public: NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm) { return _to GetForm(aForm); } \ NS_IMETHOD GetDefaultSelected(PRBool* aDefaultSelected) { return _to GetDefaultSelected(aDefaultSelected); } \ NS_IMETHOD SetDefaultSelected(PRBool aDefaultSelected) { return _to SetDefaultSelected(aDefaultSelected); } \ - NS_IMETHOD GetText(nsAWritableString& aText) { return _to GetText(aText); } \ - NS_IMETHOD SetText(const nsAReadableString& aText) { return _to SetText(aText); } \ + NS_IMETHOD GetText(nsString& aText) { return _to GetText(aText); } \ + NS_IMETHOD SetText(const nsString& aText) { return _to SetText(aText); } \ NS_IMETHOD GetIndex(PRInt32* aIndex) { return _to GetIndex(aIndex); } \ NS_IMETHOD GetDisabled(PRBool* aDisabled) { return _to GetDisabled(aDisabled); } \ NS_IMETHOD SetDisabled(PRBool aDisabled) { return _to SetDisabled(aDisabled); } \ - NS_IMETHOD GetLabel(nsAWritableString& aLabel) { return _to GetLabel(aLabel); } \ - NS_IMETHOD SetLabel(const nsAReadableString& aLabel) { return _to SetLabel(aLabel); } \ + NS_IMETHOD GetLabel(nsString& aLabel) { return _to GetLabel(aLabel); } \ + NS_IMETHOD SetLabel(const nsString& aLabel) { return _to SetLabel(aLabel); } \ NS_IMETHOD GetSelected(PRBool* aSelected) { return _to GetSelected(aSelected); } \ NS_IMETHOD SetSelected(PRBool aSelected) { return _to SetSelected(aSelected); } \ - NS_IMETHOD GetValue(nsAWritableString& aValue) { return _to GetValue(aValue); } \ - NS_IMETHOD SetValue(const nsAReadableString& aValue) { return _to SetValue(aValue); } \ + NS_IMETHOD GetValue(nsString& aValue) { return _to GetValue(aValue); } \ + NS_IMETHOD SetValue(const nsString& aValue) { return _to SetValue(aValue); } \ extern "C" NS_DOM nsresult NS_InitHTMLOptionElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLParagraphElement.h b/dom/public/html/nsIDOMHTMLParagraphElement.h index a93ecbd6baf..35a03a82f07 100644 --- a/dom/public/html/nsIDOMHTMLParagraphElement.h +++ b/dom/public/html/nsIDOMHTMLParagraphElement.h @@ -38,20 +38,20 @@ class nsIDOMHTMLParagraphElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLPARAGRAPHELEMENT_IID; return iid; } - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; }; #define NS_DECL_IDOMHTMLPARAGRAPHELEMENT \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ #define NS_FORWARD_IDOMHTMLPARAGRAPHELEMENT(_to) \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ extern "C" NS_DOM nsresult NS_InitHTMLParagraphElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLParamElement.h b/dom/public/html/nsIDOMHTMLParamElement.h index d0dfa7b81c6..cf8e3bb28ef 100644 --- a/dom/public/html/nsIDOMHTMLParamElement.h +++ b/dom/public/html/nsIDOMHTMLParamElement.h @@ -38,41 +38,41 @@ class nsIDOMHTMLParamElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLPARAMELEMENT_IID; return iid; } - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; - NS_IMETHOD GetType(nsAWritableString& aType)=0; - NS_IMETHOD SetType(const nsAReadableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; + NS_IMETHOD SetType(const nsString& aType)=0; - NS_IMETHOD GetValue(nsAWritableString& aValue)=0; - NS_IMETHOD SetValue(const nsAReadableString& aValue)=0; + NS_IMETHOD GetValue(nsString& aValue)=0; + NS_IMETHOD SetValue(const nsString& aValue)=0; - NS_IMETHOD GetValueType(nsAWritableString& aValueType)=0; - NS_IMETHOD SetValueType(const nsAReadableString& aValueType)=0; + NS_IMETHOD GetValueType(nsString& aValueType)=0; + NS_IMETHOD SetValueType(const nsString& aValueType)=0; }; #define NS_DECL_IDOMHTMLPARAMELEMENT \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ - NS_IMETHOD GetType(nsAWritableString& aType); \ - NS_IMETHOD SetType(const nsAReadableString& aType); \ - NS_IMETHOD GetValue(nsAWritableString& aValue); \ - NS_IMETHOD SetValue(const nsAReadableString& aValue); \ - NS_IMETHOD GetValueType(nsAWritableString& aValueType); \ - NS_IMETHOD SetValueType(const nsAReadableString& aValueType); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ + NS_IMETHOD GetType(nsString& aType); \ + NS_IMETHOD SetType(const nsString& aType); \ + NS_IMETHOD GetValue(nsString& aValue); \ + NS_IMETHOD SetValue(const nsString& aValue); \ + NS_IMETHOD GetValueType(nsString& aValueType); \ + NS_IMETHOD SetValueType(const nsString& aValueType); \ #define NS_FORWARD_IDOMHTMLPARAMELEMENT(_to) \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ - NS_IMETHOD SetType(const nsAReadableString& aType) { return _to SetType(aType); } \ - NS_IMETHOD GetValue(nsAWritableString& aValue) { return _to GetValue(aValue); } \ - NS_IMETHOD SetValue(const nsAReadableString& aValue) { return _to SetValue(aValue); } \ - NS_IMETHOD GetValueType(nsAWritableString& aValueType) { return _to GetValueType(aValueType); } \ - NS_IMETHOD SetValueType(const nsAReadableString& aValueType) { return _to SetValueType(aValueType); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ + NS_IMETHOD SetType(const nsString& aType) { return _to SetType(aType); } \ + NS_IMETHOD GetValue(nsString& aValue) { return _to GetValue(aValue); } \ + NS_IMETHOD SetValue(const nsString& aValue) { return _to SetValue(aValue); } \ + NS_IMETHOD GetValueType(nsString& aValueType) { return _to GetValueType(aValueType); } \ + NS_IMETHOD SetValueType(const nsString& aValueType) { return _to SetValueType(aValueType); } \ extern "C" NS_DOM nsresult NS_InitHTMLParamElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLQuoteElement.h b/dom/public/html/nsIDOMHTMLQuoteElement.h index 35821ace73b..3cd27fe811f 100644 --- a/dom/public/html/nsIDOMHTMLQuoteElement.h +++ b/dom/public/html/nsIDOMHTMLQuoteElement.h @@ -38,20 +38,20 @@ class nsIDOMHTMLQuoteElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLQUOTEELEMENT_IID; return iid; } - NS_IMETHOD GetCite(nsAWritableString& aCite)=0; - NS_IMETHOD SetCite(const nsAReadableString& aCite)=0; + NS_IMETHOD GetCite(nsString& aCite)=0; + NS_IMETHOD SetCite(const nsString& aCite)=0; }; #define NS_DECL_IDOMHTMLQUOTEELEMENT \ - NS_IMETHOD GetCite(nsAWritableString& aCite); \ - NS_IMETHOD SetCite(const nsAReadableString& aCite); \ + NS_IMETHOD GetCite(nsString& aCite); \ + NS_IMETHOD SetCite(const nsString& aCite); \ #define NS_FORWARD_IDOMHTMLQUOTEELEMENT(_to) \ - NS_IMETHOD GetCite(nsAWritableString& aCite) { return _to GetCite(aCite); } \ - NS_IMETHOD SetCite(const nsAReadableString& aCite) { return _to SetCite(aCite); } \ + NS_IMETHOD GetCite(nsString& aCite) { return _to GetCite(aCite); } \ + NS_IMETHOD SetCite(const nsString& aCite) { return _to SetCite(aCite); } \ extern "C" NS_DOM nsresult NS_InitHTMLQuoteElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLScriptElement.h b/dom/public/html/nsIDOMHTMLScriptElement.h index 5650f4c703c..1268aeb4148 100644 --- a/dom/public/html/nsIDOMHTMLScriptElement.h +++ b/dom/public/html/nsIDOMHTMLScriptElement.h @@ -38,62 +38,62 @@ class nsIDOMHTMLScriptElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLSCRIPTELEMENT_IID; return iid; } - NS_IMETHOD GetText(nsAWritableString& aText)=0; - NS_IMETHOD SetText(const nsAReadableString& aText)=0; + NS_IMETHOD GetText(nsString& aText)=0; + NS_IMETHOD SetText(const nsString& aText)=0; - NS_IMETHOD GetHtmlFor(nsAWritableString& aHtmlFor)=0; - NS_IMETHOD SetHtmlFor(const nsAReadableString& aHtmlFor)=0; + NS_IMETHOD GetHtmlFor(nsString& aHtmlFor)=0; + NS_IMETHOD SetHtmlFor(const nsString& aHtmlFor)=0; - NS_IMETHOD GetEvent(nsAWritableString& aEvent)=0; - NS_IMETHOD SetEvent(const nsAReadableString& aEvent)=0; + NS_IMETHOD GetEvent(nsString& aEvent)=0; + NS_IMETHOD SetEvent(const nsString& aEvent)=0; - NS_IMETHOD GetCharset(nsAWritableString& aCharset)=0; - NS_IMETHOD SetCharset(const nsAReadableString& aCharset)=0; + NS_IMETHOD GetCharset(nsString& aCharset)=0; + NS_IMETHOD SetCharset(const nsString& aCharset)=0; NS_IMETHOD GetDefer(PRBool* aDefer)=0; NS_IMETHOD SetDefer(PRBool aDefer)=0; - NS_IMETHOD GetSrc(nsAWritableString& aSrc)=0; - NS_IMETHOD SetSrc(const nsAReadableString& aSrc)=0; + NS_IMETHOD GetSrc(nsString& aSrc)=0; + NS_IMETHOD SetSrc(const nsString& aSrc)=0; - NS_IMETHOD GetType(nsAWritableString& aType)=0; - NS_IMETHOD SetType(const nsAReadableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; + NS_IMETHOD SetType(const nsString& aType)=0; }; #define NS_DECL_IDOMHTMLSCRIPTELEMENT \ - NS_IMETHOD GetText(nsAWritableString& aText); \ - NS_IMETHOD SetText(const nsAReadableString& aText); \ - NS_IMETHOD GetHtmlFor(nsAWritableString& aHtmlFor); \ - NS_IMETHOD SetHtmlFor(const nsAReadableString& aHtmlFor); \ - NS_IMETHOD GetEvent(nsAWritableString& aEvent); \ - NS_IMETHOD SetEvent(const nsAReadableString& aEvent); \ - NS_IMETHOD GetCharset(nsAWritableString& aCharset); \ - NS_IMETHOD SetCharset(const nsAReadableString& aCharset); \ + NS_IMETHOD GetText(nsString& aText); \ + NS_IMETHOD SetText(const nsString& aText); \ + NS_IMETHOD GetHtmlFor(nsString& aHtmlFor); \ + NS_IMETHOD SetHtmlFor(const nsString& aHtmlFor); \ + NS_IMETHOD GetEvent(nsString& aEvent); \ + NS_IMETHOD SetEvent(const nsString& aEvent); \ + NS_IMETHOD GetCharset(nsString& aCharset); \ + NS_IMETHOD SetCharset(const nsString& aCharset); \ NS_IMETHOD GetDefer(PRBool* aDefer); \ NS_IMETHOD SetDefer(PRBool aDefer); \ - NS_IMETHOD GetSrc(nsAWritableString& aSrc); \ - NS_IMETHOD SetSrc(const nsAReadableString& aSrc); \ - NS_IMETHOD GetType(nsAWritableString& aType); \ - NS_IMETHOD SetType(const nsAReadableString& aType); \ + NS_IMETHOD GetSrc(nsString& aSrc); \ + NS_IMETHOD SetSrc(const nsString& aSrc); \ + NS_IMETHOD GetType(nsString& aType); \ + NS_IMETHOD SetType(const nsString& aType); \ #define NS_FORWARD_IDOMHTMLSCRIPTELEMENT(_to) \ - NS_IMETHOD GetText(nsAWritableString& aText) { return _to GetText(aText); } \ - NS_IMETHOD SetText(const nsAReadableString& aText) { return _to SetText(aText); } \ - NS_IMETHOD GetHtmlFor(nsAWritableString& aHtmlFor) { return _to GetHtmlFor(aHtmlFor); } \ - NS_IMETHOD SetHtmlFor(const nsAReadableString& aHtmlFor) { return _to SetHtmlFor(aHtmlFor); } \ - NS_IMETHOD GetEvent(nsAWritableString& aEvent) { return _to GetEvent(aEvent); } \ - NS_IMETHOD SetEvent(const nsAReadableString& aEvent) { return _to SetEvent(aEvent); } \ - NS_IMETHOD GetCharset(nsAWritableString& aCharset) { return _to GetCharset(aCharset); } \ - NS_IMETHOD SetCharset(const nsAReadableString& aCharset) { return _to SetCharset(aCharset); } \ + NS_IMETHOD GetText(nsString& aText) { return _to GetText(aText); } \ + NS_IMETHOD SetText(const nsString& aText) { return _to SetText(aText); } \ + NS_IMETHOD GetHtmlFor(nsString& aHtmlFor) { return _to GetHtmlFor(aHtmlFor); } \ + NS_IMETHOD SetHtmlFor(const nsString& aHtmlFor) { return _to SetHtmlFor(aHtmlFor); } \ + NS_IMETHOD GetEvent(nsString& aEvent) { return _to GetEvent(aEvent); } \ + NS_IMETHOD SetEvent(const nsString& aEvent) { return _to SetEvent(aEvent); } \ + NS_IMETHOD GetCharset(nsString& aCharset) { return _to GetCharset(aCharset); } \ + NS_IMETHOD SetCharset(const nsString& aCharset) { return _to SetCharset(aCharset); } \ NS_IMETHOD GetDefer(PRBool* aDefer) { return _to GetDefer(aDefer); } \ NS_IMETHOD SetDefer(PRBool aDefer) { return _to SetDefer(aDefer); } \ - NS_IMETHOD GetSrc(nsAWritableString& aSrc) { return _to GetSrc(aSrc); } \ - NS_IMETHOD SetSrc(const nsAReadableString& aSrc) { return _to SetSrc(aSrc); } \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ - NS_IMETHOD SetType(const nsAReadableString& aType) { return _to SetType(aType); } \ + NS_IMETHOD GetSrc(nsString& aSrc) { return _to GetSrc(aSrc); } \ + NS_IMETHOD SetSrc(const nsString& aSrc) { return _to SetSrc(aSrc); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ + NS_IMETHOD SetType(const nsString& aType) { return _to SetType(aType); } \ extern "C" NS_DOM nsresult NS_InitHTMLScriptElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLSelectElement.h b/dom/public/html/nsIDOMHTMLSelectElement.h index bb729aa30df..121547a9132 100644 --- a/dom/public/html/nsIDOMHTMLSelectElement.h +++ b/dom/public/html/nsIDOMHTMLSelectElement.h @@ -41,13 +41,13 @@ class nsIDOMHTMLSelectElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLSELECTELEMENT_IID; return iid; } - NS_IMETHOD GetType(nsAWritableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; NS_IMETHOD GetSelectedIndex(PRInt32* aSelectedIndex)=0; NS_IMETHOD SetSelectedIndex(PRInt32 aSelectedIndex)=0; - NS_IMETHOD GetValue(nsAWritableString& aValue)=0; - NS_IMETHOD SetValue(const nsAReadableString& aValue)=0; + NS_IMETHOD GetValue(nsString& aValue)=0; + NS_IMETHOD SetValue(const nsString& aValue)=0; NS_IMETHOD GetLength(PRUint32* aLength)=0; NS_IMETHOD SetLength(PRUint32 aLength)=0; @@ -62,8 +62,8 @@ public: NS_IMETHOD GetMultiple(PRBool* aMultiple)=0; NS_IMETHOD SetMultiple(PRBool aMultiple)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; NS_IMETHOD GetSize(PRInt32* aSize)=0; NS_IMETHOD SetSize(PRInt32 aSize)=0; @@ -82,11 +82,11 @@ public: #define NS_DECL_IDOMHTMLSELECTELEMENT \ - NS_IMETHOD GetType(nsAWritableString& aType); \ + NS_IMETHOD GetType(nsString& aType); \ NS_IMETHOD GetSelectedIndex(PRInt32* aSelectedIndex); \ NS_IMETHOD SetSelectedIndex(PRInt32 aSelectedIndex); \ - NS_IMETHOD GetValue(nsAWritableString& aValue); \ - NS_IMETHOD SetValue(const nsAReadableString& aValue); \ + NS_IMETHOD GetValue(nsString& aValue); \ + NS_IMETHOD SetValue(const nsString& aValue); \ NS_IMETHOD GetLength(PRUint32* aLength); \ NS_IMETHOD SetLength(PRUint32 aLength); \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm); \ @@ -95,8 +95,8 @@ public: NS_IMETHOD SetDisabled(PRBool aDisabled); \ NS_IMETHOD GetMultiple(PRBool* aMultiple); \ NS_IMETHOD SetMultiple(PRBool aMultiple); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ NS_IMETHOD GetSize(PRInt32* aSize); \ NS_IMETHOD SetSize(PRInt32 aSize); \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex); \ @@ -109,11 +109,11 @@ public: #define NS_FORWARD_IDOMHTMLSELECTELEMENT(_to) \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ NS_IMETHOD GetSelectedIndex(PRInt32* aSelectedIndex) { return _to GetSelectedIndex(aSelectedIndex); } \ NS_IMETHOD SetSelectedIndex(PRInt32 aSelectedIndex) { return _to SetSelectedIndex(aSelectedIndex); } \ - NS_IMETHOD GetValue(nsAWritableString& aValue) { return _to GetValue(aValue); } \ - NS_IMETHOD SetValue(const nsAReadableString& aValue) { return _to SetValue(aValue); } \ + NS_IMETHOD GetValue(nsString& aValue) { return _to GetValue(aValue); } \ + NS_IMETHOD SetValue(const nsString& aValue) { return _to SetValue(aValue); } \ NS_IMETHOD GetLength(PRUint32* aLength) { return _to GetLength(aLength); } \ NS_IMETHOD SetLength(PRUint32 aLength) { return _to SetLength(aLength); } \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm) { return _to GetForm(aForm); } \ @@ -122,8 +122,8 @@ public: NS_IMETHOD SetDisabled(PRBool aDisabled) { return _to SetDisabled(aDisabled); } \ NS_IMETHOD GetMultiple(PRBool* aMultiple) { return _to GetMultiple(aMultiple); } \ NS_IMETHOD SetMultiple(PRBool aMultiple) { return _to SetMultiple(aMultiple); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ NS_IMETHOD GetSize(PRInt32* aSize) { return _to GetSize(aSize); } \ NS_IMETHOD SetSize(PRInt32 aSize) { return _to SetSize(aSize); } \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex) { return _to GetTabIndex(aTabIndex); } \ diff --git a/dom/public/html/nsIDOMHTMLStyleElement.h b/dom/public/html/nsIDOMHTMLStyleElement.h index 81d6cd18059..583103c640e 100644 --- a/dom/public/html/nsIDOMHTMLStyleElement.h +++ b/dom/public/html/nsIDOMHTMLStyleElement.h @@ -41,31 +41,31 @@ public: NS_IMETHOD GetDisabled(PRBool* aDisabled)=0; NS_IMETHOD SetDisabled(PRBool aDisabled)=0; - NS_IMETHOD GetMedia(nsAWritableString& aMedia)=0; - NS_IMETHOD SetMedia(const nsAReadableString& aMedia)=0; + NS_IMETHOD GetMedia(nsString& aMedia)=0; + NS_IMETHOD SetMedia(const nsString& aMedia)=0; - NS_IMETHOD GetType(nsAWritableString& aType)=0; - NS_IMETHOD SetType(const nsAReadableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; + NS_IMETHOD SetType(const nsString& aType)=0; }; #define NS_DECL_IDOMHTMLSTYLEELEMENT \ NS_IMETHOD GetDisabled(PRBool* aDisabled); \ NS_IMETHOD SetDisabled(PRBool aDisabled); \ - NS_IMETHOD GetMedia(nsAWritableString& aMedia); \ - NS_IMETHOD SetMedia(const nsAReadableString& aMedia); \ - NS_IMETHOD GetType(nsAWritableString& aType); \ - NS_IMETHOD SetType(const nsAReadableString& aType); \ + NS_IMETHOD GetMedia(nsString& aMedia); \ + NS_IMETHOD SetMedia(const nsString& aMedia); \ + NS_IMETHOD GetType(nsString& aType); \ + NS_IMETHOD SetType(const nsString& aType); \ #define NS_FORWARD_IDOMHTMLSTYLEELEMENT(_to) \ NS_IMETHOD GetDisabled(PRBool* aDisabled) { return _to GetDisabled(aDisabled); } \ NS_IMETHOD SetDisabled(PRBool aDisabled) { return _to SetDisabled(aDisabled); } \ - NS_IMETHOD GetMedia(nsAWritableString& aMedia) { return _to GetMedia(aMedia); } \ - NS_IMETHOD SetMedia(const nsAReadableString& aMedia) { return _to SetMedia(aMedia); } \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ - NS_IMETHOD SetType(const nsAReadableString& aType) { return _to SetType(aType); } \ + NS_IMETHOD GetMedia(nsString& aMedia) { return _to GetMedia(aMedia); } \ + NS_IMETHOD SetMedia(const nsString& aMedia) { return _to SetMedia(aMedia); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ + NS_IMETHOD SetType(const nsString& aType) { return _to SetType(aType); } \ extern "C" NS_DOM nsresult NS_InitHTMLStyleElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLTableCaptionElement.h b/dom/public/html/nsIDOMHTMLTableCaptionElement.h index fbf7b80289d..4ec5e23ea32 100644 --- a/dom/public/html/nsIDOMHTMLTableCaptionElement.h +++ b/dom/public/html/nsIDOMHTMLTableCaptionElement.h @@ -38,20 +38,20 @@ class nsIDOMHTMLTableCaptionElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLECAPTIONELEMENT_IID; return iid; } - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; }; #define NS_DECL_IDOMHTMLTABLECAPTIONELEMENT \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ #define NS_FORWARD_IDOMHTMLTABLECAPTIONELEMENT(_to) \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ extern "C" NS_DOM nsresult NS_InitHTMLTableCaptionElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLTableCellElement.h b/dom/public/html/nsIDOMHTMLTableCellElement.h index 66574316c65..ba34e5eb7a3 100644 --- a/dom/public/html/nsIDOMHTMLTableCellElement.h +++ b/dom/public/html/nsIDOMHTMLTableCellElement.h @@ -41,32 +41,32 @@ public: NS_IMETHOD GetCellIndex(PRInt32* aCellIndex)=0; NS_IMETHOD SetCellIndex(PRInt32 aCellIndex)=0; - NS_IMETHOD GetAbbr(nsAWritableString& aAbbr)=0; - NS_IMETHOD SetAbbr(const nsAReadableString& aAbbr)=0; + NS_IMETHOD GetAbbr(nsString& aAbbr)=0; + NS_IMETHOD SetAbbr(const nsString& aAbbr)=0; - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; - NS_IMETHOD GetAxis(nsAWritableString& aAxis)=0; - NS_IMETHOD SetAxis(const nsAReadableString& aAxis)=0; + NS_IMETHOD GetAxis(nsString& aAxis)=0; + NS_IMETHOD SetAxis(const nsString& aAxis)=0; - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor)=0; - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor)=0; + NS_IMETHOD GetBgColor(nsString& aBgColor)=0; + NS_IMETHOD SetBgColor(const nsString& aBgColor)=0; - NS_IMETHOD GetCh(nsAWritableString& aCh)=0; - NS_IMETHOD SetCh(const nsAReadableString& aCh)=0; + NS_IMETHOD GetCh(nsString& aCh)=0; + NS_IMETHOD SetCh(const nsString& aCh)=0; - NS_IMETHOD GetChOff(nsAWritableString& aChOff)=0; - NS_IMETHOD SetChOff(const nsAReadableString& aChOff)=0; + NS_IMETHOD GetChOff(nsString& aChOff)=0; + NS_IMETHOD SetChOff(const nsString& aChOff)=0; NS_IMETHOD GetColSpan(PRInt32* aColSpan)=0; NS_IMETHOD SetColSpan(PRInt32 aColSpan)=0; - NS_IMETHOD GetHeaders(nsAWritableString& aHeaders)=0; - NS_IMETHOD SetHeaders(const nsAReadableString& aHeaders)=0; + NS_IMETHOD GetHeaders(nsString& aHeaders)=0; + NS_IMETHOD SetHeaders(const nsString& aHeaders)=0; - NS_IMETHOD GetHeight(nsAWritableString& aHeight)=0; - NS_IMETHOD SetHeight(const nsAReadableString& aHeight)=0; + NS_IMETHOD GetHeight(nsString& aHeight)=0; + NS_IMETHOD SetHeight(const nsString& aHeight)=0; NS_IMETHOD GetNoWrap(PRBool* aNoWrap)=0; NS_IMETHOD SetNoWrap(PRBool aNoWrap)=0; @@ -74,82 +74,82 @@ public: NS_IMETHOD GetRowSpan(PRInt32* aRowSpan)=0; NS_IMETHOD SetRowSpan(PRInt32 aRowSpan)=0; - NS_IMETHOD GetScope(nsAWritableString& aScope)=0; - NS_IMETHOD SetScope(const nsAReadableString& aScope)=0; + NS_IMETHOD GetScope(nsString& aScope)=0; + NS_IMETHOD SetScope(const nsString& aScope)=0; - NS_IMETHOD GetVAlign(nsAWritableString& aVAlign)=0; - NS_IMETHOD SetVAlign(const nsAReadableString& aVAlign)=0; + NS_IMETHOD GetVAlign(nsString& aVAlign)=0; + NS_IMETHOD SetVAlign(const nsString& aVAlign)=0; - NS_IMETHOD GetWidth(nsAWritableString& aWidth)=0; - NS_IMETHOD SetWidth(const nsAReadableString& aWidth)=0; + NS_IMETHOD GetWidth(nsString& aWidth)=0; + NS_IMETHOD SetWidth(const nsString& aWidth)=0; }; #define NS_DECL_IDOMHTMLTABLECELLELEMENT \ NS_IMETHOD GetCellIndex(PRInt32* aCellIndex); \ NS_IMETHOD SetCellIndex(PRInt32 aCellIndex); \ - NS_IMETHOD GetAbbr(nsAWritableString& aAbbr); \ - NS_IMETHOD SetAbbr(const nsAReadableString& aAbbr); \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ - NS_IMETHOD GetAxis(nsAWritableString& aAxis); \ - NS_IMETHOD SetAxis(const nsAReadableString& aAxis); \ - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor); \ - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor); \ - NS_IMETHOD GetCh(nsAWritableString& aCh); \ - NS_IMETHOD SetCh(const nsAReadableString& aCh); \ - NS_IMETHOD GetChOff(nsAWritableString& aChOff); \ - NS_IMETHOD SetChOff(const nsAReadableString& aChOff); \ + NS_IMETHOD GetAbbr(nsString& aAbbr); \ + NS_IMETHOD SetAbbr(const nsString& aAbbr); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ + NS_IMETHOD GetAxis(nsString& aAxis); \ + NS_IMETHOD SetAxis(const nsString& aAxis); \ + NS_IMETHOD GetBgColor(nsString& aBgColor); \ + NS_IMETHOD SetBgColor(const nsString& aBgColor); \ + NS_IMETHOD GetCh(nsString& aCh); \ + NS_IMETHOD SetCh(const nsString& aCh); \ + NS_IMETHOD GetChOff(nsString& aChOff); \ + NS_IMETHOD SetChOff(const nsString& aChOff); \ NS_IMETHOD GetColSpan(PRInt32* aColSpan); \ NS_IMETHOD SetColSpan(PRInt32 aColSpan); \ - NS_IMETHOD GetHeaders(nsAWritableString& aHeaders); \ - NS_IMETHOD SetHeaders(const nsAReadableString& aHeaders); \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight); \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight); \ + NS_IMETHOD GetHeaders(nsString& aHeaders); \ + NS_IMETHOD SetHeaders(const nsString& aHeaders); \ + NS_IMETHOD GetHeight(nsString& aHeight); \ + NS_IMETHOD SetHeight(const nsString& aHeight); \ NS_IMETHOD GetNoWrap(PRBool* aNoWrap); \ NS_IMETHOD SetNoWrap(PRBool aNoWrap); \ NS_IMETHOD GetRowSpan(PRInt32* aRowSpan); \ NS_IMETHOD SetRowSpan(PRInt32 aRowSpan); \ - NS_IMETHOD GetScope(nsAWritableString& aScope); \ - NS_IMETHOD SetScope(const nsAReadableString& aScope); \ - NS_IMETHOD GetVAlign(nsAWritableString& aVAlign); \ - NS_IMETHOD SetVAlign(const nsAReadableString& aVAlign); \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth); \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth); \ + NS_IMETHOD GetScope(nsString& aScope); \ + NS_IMETHOD SetScope(const nsString& aScope); \ + NS_IMETHOD GetVAlign(nsString& aVAlign); \ + NS_IMETHOD SetVAlign(const nsString& aVAlign); \ + NS_IMETHOD GetWidth(nsString& aWidth); \ + NS_IMETHOD SetWidth(const nsString& aWidth); \ #define NS_FORWARD_IDOMHTMLTABLECELLELEMENT(_to) \ NS_IMETHOD GetCellIndex(PRInt32* aCellIndex) { return _to GetCellIndex(aCellIndex); } \ NS_IMETHOD SetCellIndex(PRInt32 aCellIndex) { return _to SetCellIndex(aCellIndex); } \ - NS_IMETHOD GetAbbr(nsAWritableString& aAbbr) { return _to GetAbbr(aAbbr); } \ - NS_IMETHOD SetAbbr(const nsAReadableString& aAbbr) { return _to SetAbbr(aAbbr); } \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ - NS_IMETHOD GetAxis(nsAWritableString& aAxis) { return _to GetAxis(aAxis); } \ - NS_IMETHOD SetAxis(const nsAReadableString& aAxis) { return _to SetAxis(aAxis); } \ - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor) { return _to GetBgColor(aBgColor); } \ - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor) { return _to SetBgColor(aBgColor); } \ - NS_IMETHOD GetCh(nsAWritableString& aCh) { return _to GetCh(aCh); } \ - NS_IMETHOD SetCh(const nsAReadableString& aCh) { return _to SetCh(aCh); } \ - NS_IMETHOD GetChOff(nsAWritableString& aChOff) { return _to GetChOff(aChOff); } \ - NS_IMETHOD SetChOff(const nsAReadableString& aChOff) { return _to SetChOff(aChOff); } \ + NS_IMETHOD GetAbbr(nsString& aAbbr) { return _to GetAbbr(aAbbr); } \ + NS_IMETHOD SetAbbr(const nsString& aAbbr) { return _to SetAbbr(aAbbr); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetAxis(nsString& aAxis) { return _to GetAxis(aAxis); } \ + NS_IMETHOD SetAxis(const nsString& aAxis) { return _to SetAxis(aAxis); } \ + NS_IMETHOD GetBgColor(nsString& aBgColor) { return _to GetBgColor(aBgColor); } \ + NS_IMETHOD SetBgColor(const nsString& aBgColor) { return _to SetBgColor(aBgColor); } \ + NS_IMETHOD GetCh(nsString& aCh) { return _to GetCh(aCh); } \ + NS_IMETHOD SetCh(const nsString& aCh) { return _to SetCh(aCh); } \ + NS_IMETHOD GetChOff(nsString& aChOff) { return _to GetChOff(aChOff); } \ + NS_IMETHOD SetChOff(const nsString& aChOff) { return _to SetChOff(aChOff); } \ NS_IMETHOD GetColSpan(PRInt32* aColSpan) { return _to GetColSpan(aColSpan); } \ NS_IMETHOD SetColSpan(PRInt32 aColSpan) { return _to SetColSpan(aColSpan); } \ - NS_IMETHOD GetHeaders(nsAWritableString& aHeaders) { return _to GetHeaders(aHeaders); } \ - NS_IMETHOD SetHeaders(const nsAReadableString& aHeaders) { return _to SetHeaders(aHeaders); } \ - NS_IMETHOD GetHeight(nsAWritableString& aHeight) { return _to GetHeight(aHeight); } \ - NS_IMETHOD SetHeight(const nsAReadableString& aHeight) { return _to SetHeight(aHeight); } \ + NS_IMETHOD GetHeaders(nsString& aHeaders) { return _to GetHeaders(aHeaders); } \ + NS_IMETHOD SetHeaders(const nsString& aHeaders) { return _to SetHeaders(aHeaders); } \ + NS_IMETHOD GetHeight(nsString& aHeight) { return _to GetHeight(aHeight); } \ + NS_IMETHOD SetHeight(const nsString& aHeight) { return _to SetHeight(aHeight); } \ NS_IMETHOD GetNoWrap(PRBool* aNoWrap) { return _to GetNoWrap(aNoWrap); } \ NS_IMETHOD SetNoWrap(PRBool aNoWrap) { return _to SetNoWrap(aNoWrap); } \ NS_IMETHOD GetRowSpan(PRInt32* aRowSpan) { return _to GetRowSpan(aRowSpan); } \ NS_IMETHOD SetRowSpan(PRInt32 aRowSpan) { return _to SetRowSpan(aRowSpan); } \ - NS_IMETHOD GetScope(nsAWritableString& aScope) { return _to GetScope(aScope); } \ - NS_IMETHOD SetScope(const nsAReadableString& aScope) { return _to SetScope(aScope); } \ - NS_IMETHOD GetVAlign(nsAWritableString& aVAlign) { return _to GetVAlign(aVAlign); } \ - NS_IMETHOD SetVAlign(const nsAReadableString& aVAlign) { return _to SetVAlign(aVAlign); } \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth) { return _to GetWidth(aWidth); } \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth) { return _to SetWidth(aWidth); } \ + NS_IMETHOD GetScope(nsString& aScope) { return _to GetScope(aScope); } \ + NS_IMETHOD SetScope(const nsString& aScope) { return _to SetScope(aScope); } \ + NS_IMETHOD GetVAlign(nsString& aVAlign) { return _to GetVAlign(aVAlign); } \ + NS_IMETHOD SetVAlign(const nsString& aVAlign) { return _to SetVAlign(aVAlign); } \ + NS_IMETHOD GetWidth(nsString& aWidth) { return _to GetWidth(aWidth); } \ + NS_IMETHOD SetWidth(const nsString& aWidth) { return _to SetWidth(aWidth); } \ extern "C" NS_DOM nsresult NS_InitHTMLTableCellElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLTableColElement.h b/dom/public/html/nsIDOMHTMLTableColElement.h index 78796946c94..fc821d700a4 100644 --- a/dom/public/html/nsIDOMHTMLTableColElement.h +++ b/dom/public/html/nsIDOMHTMLTableColElement.h @@ -38,55 +38,55 @@ class nsIDOMHTMLTableColElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLECOLELEMENT_IID; return iid; } - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; - NS_IMETHOD GetCh(nsAWritableString& aCh)=0; - NS_IMETHOD SetCh(const nsAReadableString& aCh)=0; + NS_IMETHOD GetCh(nsString& aCh)=0; + NS_IMETHOD SetCh(const nsString& aCh)=0; - NS_IMETHOD GetChOff(nsAWritableString& aChOff)=0; - NS_IMETHOD SetChOff(const nsAReadableString& aChOff)=0; + NS_IMETHOD GetChOff(nsString& aChOff)=0; + NS_IMETHOD SetChOff(const nsString& aChOff)=0; NS_IMETHOD GetSpan(PRInt32* aSpan)=0; NS_IMETHOD SetSpan(PRInt32 aSpan)=0; - NS_IMETHOD GetVAlign(nsAWritableString& aVAlign)=0; - NS_IMETHOD SetVAlign(const nsAReadableString& aVAlign)=0; + NS_IMETHOD GetVAlign(nsString& aVAlign)=0; + NS_IMETHOD SetVAlign(const nsString& aVAlign)=0; - NS_IMETHOD GetWidth(nsAWritableString& aWidth)=0; - NS_IMETHOD SetWidth(const nsAReadableString& aWidth)=0; + NS_IMETHOD GetWidth(nsString& aWidth)=0; + NS_IMETHOD SetWidth(const nsString& aWidth)=0; }; #define NS_DECL_IDOMHTMLTABLECOLELEMENT \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ - NS_IMETHOD GetCh(nsAWritableString& aCh); \ - NS_IMETHOD SetCh(const nsAReadableString& aCh); \ - NS_IMETHOD GetChOff(nsAWritableString& aChOff); \ - NS_IMETHOD SetChOff(const nsAReadableString& aChOff); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ + NS_IMETHOD GetCh(nsString& aCh); \ + NS_IMETHOD SetCh(const nsString& aCh); \ + NS_IMETHOD GetChOff(nsString& aChOff); \ + NS_IMETHOD SetChOff(const nsString& aChOff); \ NS_IMETHOD GetSpan(PRInt32* aSpan); \ NS_IMETHOD SetSpan(PRInt32 aSpan); \ - NS_IMETHOD GetVAlign(nsAWritableString& aVAlign); \ - NS_IMETHOD SetVAlign(const nsAReadableString& aVAlign); \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth); \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth); \ + NS_IMETHOD GetVAlign(nsString& aVAlign); \ + NS_IMETHOD SetVAlign(const nsString& aVAlign); \ + NS_IMETHOD GetWidth(nsString& aWidth); \ + NS_IMETHOD SetWidth(const nsString& aWidth); \ #define NS_FORWARD_IDOMHTMLTABLECOLELEMENT(_to) \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ - NS_IMETHOD GetCh(nsAWritableString& aCh) { return _to GetCh(aCh); } \ - NS_IMETHOD SetCh(const nsAReadableString& aCh) { return _to SetCh(aCh); } \ - NS_IMETHOD GetChOff(nsAWritableString& aChOff) { return _to GetChOff(aChOff); } \ - NS_IMETHOD SetChOff(const nsAReadableString& aChOff) { return _to SetChOff(aChOff); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetCh(nsString& aCh) { return _to GetCh(aCh); } \ + NS_IMETHOD SetCh(const nsString& aCh) { return _to SetCh(aCh); } \ + NS_IMETHOD GetChOff(nsString& aChOff) { return _to GetChOff(aChOff); } \ + NS_IMETHOD SetChOff(const nsString& aChOff) { return _to SetChOff(aChOff); } \ NS_IMETHOD GetSpan(PRInt32* aSpan) { return _to GetSpan(aSpan); } \ NS_IMETHOD SetSpan(PRInt32 aSpan) { return _to SetSpan(aSpan); } \ - NS_IMETHOD GetVAlign(nsAWritableString& aVAlign) { return _to GetVAlign(aVAlign); } \ - NS_IMETHOD SetVAlign(const nsAReadableString& aVAlign) { return _to SetVAlign(aVAlign); } \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth) { return _to GetWidth(aWidth); } \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth) { return _to SetWidth(aWidth); } \ + NS_IMETHOD GetVAlign(nsString& aVAlign) { return _to GetVAlign(aVAlign); } \ + NS_IMETHOD SetVAlign(const nsString& aVAlign) { return _to SetVAlign(aVAlign); } \ + NS_IMETHOD GetWidth(nsString& aWidth) { return _to GetWidth(aWidth); } \ + NS_IMETHOD SetWidth(const nsString& aWidth) { return _to SetWidth(aWidth); } \ extern "C" NS_DOM nsresult NS_InitHTMLTableColElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLTableElement.h b/dom/public/html/nsIDOMHTMLTableElement.h index 16765e6b3c1..55f6b78d148 100644 --- a/dom/public/html/nsIDOMHTMLTableElement.h +++ b/dom/public/html/nsIDOMHTMLTableElement.h @@ -55,32 +55,32 @@ public: NS_IMETHOD GetTBodies(nsIDOMHTMLCollection** aTBodies)=0; - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor)=0; - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor)=0; + NS_IMETHOD GetBgColor(nsString& aBgColor)=0; + NS_IMETHOD SetBgColor(const nsString& aBgColor)=0; - NS_IMETHOD GetBorder(nsAWritableString& aBorder)=0; - NS_IMETHOD SetBorder(const nsAReadableString& aBorder)=0; + NS_IMETHOD GetBorder(nsString& aBorder)=0; + NS_IMETHOD SetBorder(const nsString& aBorder)=0; - NS_IMETHOD GetCellPadding(nsAWritableString& aCellPadding)=0; - NS_IMETHOD SetCellPadding(const nsAReadableString& aCellPadding)=0; + NS_IMETHOD GetCellPadding(nsString& aCellPadding)=0; + NS_IMETHOD SetCellPadding(const nsString& aCellPadding)=0; - NS_IMETHOD GetCellSpacing(nsAWritableString& aCellSpacing)=0; - NS_IMETHOD SetCellSpacing(const nsAReadableString& aCellSpacing)=0; + NS_IMETHOD GetCellSpacing(nsString& aCellSpacing)=0; + NS_IMETHOD SetCellSpacing(const nsString& aCellSpacing)=0; - NS_IMETHOD GetFrame(nsAWritableString& aFrame)=0; - NS_IMETHOD SetFrame(const nsAReadableString& aFrame)=0; + NS_IMETHOD GetFrame(nsString& aFrame)=0; + NS_IMETHOD SetFrame(const nsString& aFrame)=0; - NS_IMETHOD GetRules(nsAWritableString& aRules)=0; - NS_IMETHOD SetRules(const nsAReadableString& aRules)=0; + NS_IMETHOD GetRules(nsString& aRules)=0; + NS_IMETHOD SetRules(const nsString& aRules)=0; - NS_IMETHOD GetSummary(nsAWritableString& aSummary)=0; - NS_IMETHOD SetSummary(const nsAReadableString& aSummary)=0; + NS_IMETHOD GetSummary(nsString& aSummary)=0; + NS_IMETHOD SetSummary(const nsString& aSummary)=0; - NS_IMETHOD GetWidth(nsAWritableString& aWidth)=0; - NS_IMETHOD SetWidth(const nsAReadableString& aWidth)=0; + NS_IMETHOD GetWidth(nsString& aWidth)=0; + NS_IMETHOD SetWidth(const nsString& aWidth)=0; NS_IMETHOD CreateTHead(nsIDOMHTMLElement** aReturn)=0; @@ -109,24 +109,24 @@ public: NS_IMETHOD SetTFoot(nsIDOMHTMLTableSectionElement* aTFoot); \ NS_IMETHOD GetRows(nsIDOMHTMLCollection** aRows); \ NS_IMETHOD GetTBodies(nsIDOMHTMLCollection** aTBodies); \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor); \ - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor); \ - NS_IMETHOD GetBorder(nsAWritableString& aBorder); \ - NS_IMETHOD SetBorder(const nsAReadableString& aBorder); \ - NS_IMETHOD GetCellPadding(nsAWritableString& aCellPadding); \ - NS_IMETHOD SetCellPadding(const nsAReadableString& aCellPadding); \ - NS_IMETHOD GetCellSpacing(nsAWritableString& aCellSpacing); \ - NS_IMETHOD SetCellSpacing(const nsAReadableString& aCellSpacing); \ - NS_IMETHOD GetFrame(nsAWritableString& aFrame); \ - NS_IMETHOD SetFrame(const nsAReadableString& aFrame); \ - NS_IMETHOD GetRules(nsAWritableString& aRules); \ - NS_IMETHOD SetRules(const nsAReadableString& aRules); \ - NS_IMETHOD GetSummary(nsAWritableString& aSummary); \ - NS_IMETHOD SetSummary(const nsAReadableString& aSummary); \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth); \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ + NS_IMETHOD GetBgColor(nsString& aBgColor); \ + NS_IMETHOD SetBgColor(const nsString& aBgColor); \ + NS_IMETHOD GetBorder(nsString& aBorder); \ + NS_IMETHOD SetBorder(const nsString& aBorder); \ + NS_IMETHOD GetCellPadding(nsString& aCellPadding); \ + NS_IMETHOD SetCellPadding(const nsString& aCellPadding); \ + NS_IMETHOD GetCellSpacing(nsString& aCellSpacing); \ + NS_IMETHOD SetCellSpacing(const nsString& aCellSpacing); \ + NS_IMETHOD GetFrame(nsString& aFrame); \ + NS_IMETHOD SetFrame(const nsString& aFrame); \ + NS_IMETHOD GetRules(nsString& aRules); \ + NS_IMETHOD SetRules(const nsString& aRules); \ + NS_IMETHOD GetSummary(nsString& aSummary); \ + NS_IMETHOD SetSummary(const nsString& aSummary); \ + NS_IMETHOD GetWidth(nsString& aWidth); \ + NS_IMETHOD SetWidth(const nsString& aWidth); \ NS_IMETHOD CreateTHead(nsIDOMHTMLElement** aReturn); \ NS_IMETHOD DeleteTHead(); \ NS_IMETHOD CreateTFoot(nsIDOMHTMLElement** aReturn); \ @@ -147,24 +147,24 @@ public: NS_IMETHOD SetTFoot(nsIDOMHTMLTableSectionElement* aTFoot) { return _to SetTFoot(aTFoot); } \ NS_IMETHOD GetRows(nsIDOMHTMLCollection** aRows) { return _to GetRows(aRows); } \ NS_IMETHOD GetTBodies(nsIDOMHTMLCollection** aTBodies) { return _to GetTBodies(aTBodies); } \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor) { return _to GetBgColor(aBgColor); } \ - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor) { return _to SetBgColor(aBgColor); } \ - NS_IMETHOD GetBorder(nsAWritableString& aBorder) { return _to GetBorder(aBorder); } \ - NS_IMETHOD SetBorder(const nsAReadableString& aBorder) { return _to SetBorder(aBorder); } \ - NS_IMETHOD GetCellPadding(nsAWritableString& aCellPadding) { return _to GetCellPadding(aCellPadding); } \ - NS_IMETHOD SetCellPadding(const nsAReadableString& aCellPadding) { return _to SetCellPadding(aCellPadding); } \ - NS_IMETHOD GetCellSpacing(nsAWritableString& aCellSpacing) { return _to GetCellSpacing(aCellSpacing); } \ - NS_IMETHOD SetCellSpacing(const nsAReadableString& aCellSpacing) { return _to SetCellSpacing(aCellSpacing); } \ - NS_IMETHOD GetFrame(nsAWritableString& aFrame) { return _to GetFrame(aFrame); } \ - NS_IMETHOD SetFrame(const nsAReadableString& aFrame) { return _to SetFrame(aFrame); } \ - NS_IMETHOD GetRules(nsAWritableString& aRules) { return _to GetRules(aRules); } \ - NS_IMETHOD SetRules(const nsAReadableString& aRules) { return _to SetRules(aRules); } \ - NS_IMETHOD GetSummary(nsAWritableString& aSummary) { return _to GetSummary(aSummary); } \ - NS_IMETHOD SetSummary(const nsAReadableString& aSummary) { return _to SetSummary(aSummary); } \ - NS_IMETHOD GetWidth(nsAWritableString& aWidth) { return _to GetWidth(aWidth); } \ - NS_IMETHOD SetWidth(const nsAReadableString& aWidth) { return _to SetWidth(aWidth); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetBgColor(nsString& aBgColor) { return _to GetBgColor(aBgColor); } \ + NS_IMETHOD SetBgColor(const nsString& aBgColor) { return _to SetBgColor(aBgColor); } \ + NS_IMETHOD GetBorder(nsString& aBorder) { return _to GetBorder(aBorder); } \ + NS_IMETHOD SetBorder(const nsString& aBorder) { return _to SetBorder(aBorder); } \ + NS_IMETHOD GetCellPadding(nsString& aCellPadding) { return _to GetCellPadding(aCellPadding); } \ + NS_IMETHOD SetCellPadding(const nsString& aCellPadding) { return _to SetCellPadding(aCellPadding); } \ + NS_IMETHOD GetCellSpacing(nsString& aCellSpacing) { return _to GetCellSpacing(aCellSpacing); } \ + NS_IMETHOD SetCellSpacing(const nsString& aCellSpacing) { return _to SetCellSpacing(aCellSpacing); } \ + NS_IMETHOD GetFrame(nsString& aFrame) { return _to GetFrame(aFrame); } \ + NS_IMETHOD SetFrame(const nsString& aFrame) { return _to SetFrame(aFrame); } \ + NS_IMETHOD GetRules(nsString& aRules) { return _to GetRules(aRules); } \ + NS_IMETHOD SetRules(const nsString& aRules) { return _to SetRules(aRules); } \ + NS_IMETHOD GetSummary(nsString& aSummary) { return _to GetSummary(aSummary); } \ + NS_IMETHOD SetSummary(const nsString& aSummary) { return _to SetSummary(aSummary); } \ + NS_IMETHOD GetWidth(nsString& aWidth) { return _to GetWidth(aWidth); } \ + NS_IMETHOD SetWidth(const nsString& aWidth) { return _to SetWidth(aWidth); } \ NS_IMETHOD CreateTHead(nsIDOMHTMLElement** aReturn) { return _to CreateTHead(aReturn); } \ NS_IMETHOD DeleteTHead() { return _to DeleteTHead(); } \ NS_IMETHOD CreateTFoot(nsIDOMHTMLElement** aReturn) { return _to CreateTFoot(aReturn); } \ diff --git a/dom/public/html/nsIDOMHTMLTableRowElement.h b/dom/public/html/nsIDOMHTMLTableRowElement.h index 68d272c6885..2b39406cb7d 100644 --- a/dom/public/html/nsIDOMHTMLTableRowElement.h +++ b/dom/public/html/nsIDOMHTMLTableRowElement.h @@ -49,20 +49,20 @@ public: NS_IMETHOD GetCells(nsIDOMHTMLCollection** aCells)=0; NS_IMETHOD SetCells(nsIDOMHTMLCollection* aCells)=0; - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor)=0; - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor)=0; + NS_IMETHOD GetBgColor(nsString& aBgColor)=0; + NS_IMETHOD SetBgColor(const nsString& aBgColor)=0; - NS_IMETHOD GetCh(nsAWritableString& aCh)=0; - NS_IMETHOD SetCh(const nsAReadableString& aCh)=0; + NS_IMETHOD GetCh(nsString& aCh)=0; + NS_IMETHOD SetCh(const nsString& aCh)=0; - NS_IMETHOD GetChOff(nsAWritableString& aChOff)=0; - NS_IMETHOD SetChOff(const nsAReadableString& aChOff)=0; + NS_IMETHOD GetChOff(nsString& aChOff)=0; + NS_IMETHOD SetChOff(const nsString& aChOff)=0; - NS_IMETHOD GetVAlign(nsAWritableString& aVAlign)=0; - NS_IMETHOD SetVAlign(const nsAReadableString& aVAlign)=0; + NS_IMETHOD GetVAlign(nsString& aVAlign)=0; + NS_IMETHOD SetVAlign(const nsString& aVAlign)=0; NS_IMETHOD InsertCell(PRInt32 aIndex, nsIDOMHTMLElement** aReturn)=0; @@ -77,16 +77,16 @@ public: NS_IMETHOD SetSectionRowIndex(PRInt32 aSectionRowIndex); \ NS_IMETHOD GetCells(nsIDOMHTMLCollection** aCells); \ NS_IMETHOD SetCells(nsIDOMHTMLCollection* aCells); \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor); \ - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor); \ - NS_IMETHOD GetCh(nsAWritableString& aCh); \ - NS_IMETHOD SetCh(const nsAReadableString& aCh); \ - NS_IMETHOD GetChOff(nsAWritableString& aChOff); \ - NS_IMETHOD SetChOff(const nsAReadableString& aChOff); \ - NS_IMETHOD GetVAlign(nsAWritableString& aVAlign); \ - NS_IMETHOD SetVAlign(const nsAReadableString& aVAlign); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ + NS_IMETHOD GetBgColor(nsString& aBgColor); \ + NS_IMETHOD SetBgColor(const nsString& aBgColor); \ + NS_IMETHOD GetCh(nsString& aCh); \ + NS_IMETHOD SetCh(const nsString& aCh); \ + NS_IMETHOD GetChOff(nsString& aChOff); \ + NS_IMETHOD SetChOff(const nsString& aChOff); \ + NS_IMETHOD GetVAlign(nsString& aVAlign); \ + NS_IMETHOD SetVAlign(const nsString& aVAlign); \ NS_IMETHOD InsertCell(PRInt32 aIndex, nsIDOMHTMLElement** aReturn); \ NS_IMETHOD DeleteCell(PRInt32 aIndex); \ @@ -99,16 +99,16 @@ public: NS_IMETHOD SetSectionRowIndex(PRInt32 aSectionRowIndex) { return _to SetSectionRowIndex(aSectionRowIndex); } \ NS_IMETHOD GetCells(nsIDOMHTMLCollection** aCells) { return _to GetCells(aCells); } \ NS_IMETHOD SetCells(nsIDOMHTMLCollection* aCells) { return _to SetCells(aCells); } \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor) { return _to GetBgColor(aBgColor); } \ - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor) { return _to SetBgColor(aBgColor); } \ - NS_IMETHOD GetCh(nsAWritableString& aCh) { return _to GetCh(aCh); } \ - NS_IMETHOD SetCh(const nsAReadableString& aCh) { return _to SetCh(aCh); } \ - NS_IMETHOD GetChOff(nsAWritableString& aChOff) { return _to GetChOff(aChOff); } \ - NS_IMETHOD SetChOff(const nsAReadableString& aChOff) { return _to SetChOff(aChOff); } \ - NS_IMETHOD GetVAlign(nsAWritableString& aVAlign) { return _to GetVAlign(aVAlign); } \ - NS_IMETHOD SetVAlign(const nsAReadableString& aVAlign) { return _to SetVAlign(aVAlign); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetBgColor(nsString& aBgColor) { return _to GetBgColor(aBgColor); } \ + NS_IMETHOD SetBgColor(const nsString& aBgColor) { return _to SetBgColor(aBgColor); } \ + NS_IMETHOD GetCh(nsString& aCh) { return _to GetCh(aCh); } \ + NS_IMETHOD SetCh(const nsString& aCh) { return _to SetCh(aCh); } \ + NS_IMETHOD GetChOff(nsString& aChOff) { return _to GetChOff(aChOff); } \ + NS_IMETHOD SetChOff(const nsString& aChOff) { return _to SetChOff(aChOff); } \ + NS_IMETHOD GetVAlign(nsString& aVAlign) { return _to GetVAlign(aVAlign); } \ + NS_IMETHOD SetVAlign(const nsString& aVAlign) { return _to SetVAlign(aVAlign); } \ NS_IMETHOD InsertCell(PRInt32 aIndex, nsIDOMHTMLElement** aReturn) { return _to InsertCell(aIndex, aReturn); } \ NS_IMETHOD DeleteCell(PRInt32 aIndex) { return _to DeleteCell(aIndex); } \ diff --git a/dom/public/html/nsIDOMHTMLTableSectionElement.h b/dom/public/html/nsIDOMHTMLTableSectionElement.h index 306c907532f..3f9a44827f3 100644 --- a/dom/public/html/nsIDOMHTMLTableSectionElement.h +++ b/dom/public/html/nsIDOMHTMLTableSectionElement.h @@ -40,17 +40,17 @@ class nsIDOMHTMLTableSectionElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTABLESECTIONELEMENT_IID; return iid; } - NS_IMETHOD GetAlign(nsAWritableString& aAlign)=0; - NS_IMETHOD SetAlign(const nsAReadableString& aAlign)=0; + NS_IMETHOD GetAlign(nsString& aAlign)=0; + NS_IMETHOD SetAlign(const nsString& aAlign)=0; - NS_IMETHOD GetCh(nsAWritableString& aCh)=0; - NS_IMETHOD SetCh(const nsAReadableString& aCh)=0; + NS_IMETHOD GetCh(nsString& aCh)=0; + NS_IMETHOD SetCh(const nsString& aCh)=0; - NS_IMETHOD GetChOff(nsAWritableString& aChOff)=0; - NS_IMETHOD SetChOff(const nsAReadableString& aChOff)=0; + NS_IMETHOD GetChOff(nsString& aChOff)=0; + NS_IMETHOD SetChOff(const nsString& aChOff)=0; - NS_IMETHOD GetVAlign(nsAWritableString& aVAlign)=0; - NS_IMETHOD SetVAlign(const nsAReadableString& aVAlign)=0; + NS_IMETHOD GetVAlign(nsString& aVAlign)=0; + NS_IMETHOD SetVAlign(const nsString& aVAlign)=0; NS_IMETHOD GetRows(nsIDOMHTMLCollection** aRows)=0; @@ -61,14 +61,14 @@ public: #define NS_DECL_IDOMHTMLTABLESECTIONELEMENT \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign); \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign); \ - NS_IMETHOD GetCh(nsAWritableString& aCh); \ - NS_IMETHOD SetCh(const nsAReadableString& aCh); \ - NS_IMETHOD GetChOff(nsAWritableString& aChOff); \ - NS_IMETHOD SetChOff(const nsAReadableString& aChOff); \ - NS_IMETHOD GetVAlign(nsAWritableString& aVAlign); \ - NS_IMETHOD SetVAlign(const nsAReadableString& aVAlign); \ + NS_IMETHOD GetAlign(nsString& aAlign); \ + NS_IMETHOD SetAlign(const nsString& aAlign); \ + NS_IMETHOD GetCh(nsString& aCh); \ + NS_IMETHOD SetCh(const nsString& aCh); \ + NS_IMETHOD GetChOff(nsString& aChOff); \ + NS_IMETHOD SetChOff(const nsString& aChOff); \ + NS_IMETHOD GetVAlign(nsString& aVAlign); \ + NS_IMETHOD SetVAlign(const nsString& aVAlign); \ NS_IMETHOD GetRows(nsIDOMHTMLCollection** aRows); \ NS_IMETHOD InsertRow(PRInt32 aIndex, nsIDOMHTMLElement** aReturn); \ NS_IMETHOD DeleteRow(PRInt32 aIndex); \ @@ -76,14 +76,14 @@ public: #define NS_FORWARD_IDOMHTMLTABLESECTIONELEMENT(_to) \ - NS_IMETHOD GetAlign(nsAWritableString& aAlign) { return _to GetAlign(aAlign); } \ - NS_IMETHOD SetAlign(const nsAReadableString& aAlign) { return _to SetAlign(aAlign); } \ - NS_IMETHOD GetCh(nsAWritableString& aCh) { return _to GetCh(aCh); } \ - NS_IMETHOD SetCh(const nsAReadableString& aCh) { return _to SetCh(aCh); } \ - NS_IMETHOD GetChOff(nsAWritableString& aChOff) { return _to GetChOff(aChOff); } \ - NS_IMETHOD SetChOff(const nsAReadableString& aChOff) { return _to SetChOff(aChOff); } \ - NS_IMETHOD GetVAlign(nsAWritableString& aVAlign) { return _to GetVAlign(aVAlign); } \ - NS_IMETHOD SetVAlign(const nsAReadableString& aVAlign) { return _to SetVAlign(aVAlign); } \ + NS_IMETHOD GetAlign(nsString& aAlign) { return _to GetAlign(aAlign); } \ + NS_IMETHOD SetAlign(const nsString& aAlign) { return _to SetAlign(aAlign); } \ + NS_IMETHOD GetCh(nsString& aCh) { return _to GetCh(aCh); } \ + NS_IMETHOD SetCh(const nsString& aCh) { return _to SetCh(aCh); } \ + NS_IMETHOD GetChOff(nsString& aChOff) { return _to GetChOff(aChOff); } \ + NS_IMETHOD SetChOff(const nsString& aChOff) { return _to SetChOff(aChOff); } \ + NS_IMETHOD GetVAlign(nsString& aVAlign) { return _to GetVAlign(aVAlign); } \ + NS_IMETHOD SetVAlign(const nsString& aVAlign) { return _to SetVAlign(aVAlign); } \ NS_IMETHOD GetRows(nsIDOMHTMLCollection** aRows) { return _to GetRows(aRows); } \ NS_IMETHOD InsertRow(PRInt32 aIndex, nsIDOMHTMLElement** aReturn) { return _to InsertRow(aIndex, aReturn); } \ NS_IMETHOD DeleteRow(PRInt32 aIndex) { return _to DeleteRow(aIndex); } \ diff --git a/dom/public/html/nsIDOMHTMLTextAreaElement.h b/dom/public/html/nsIDOMHTMLTextAreaElement.h index 432b40f715e..1a7792901dd 100644 --- a/dom/public/html/nsIDOMHTMLTextAreaElement.h +++ b/dom/public/html/nsIDOMHTMLTextAreaElement.h @@ -39,13 +39,13 @@ class nsIDOMHTMLTextAreaElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTEXTAREAELEMENT_IID; return iid; } - NS_IMETHOD GetDefaultValue(nsAWritableString& aDefaultValue)=0; - NS_IMETHOD SetDefaultValue(const nsAReadableString& aDefaultValue)=0; + NS_IMETHOD GetDefaultValue(nsString& aDefaultValue)=0; + NS_IMETHOD SetDefaultValue(const nsString& aDefaultValue)=0; NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm)=0; - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey)=0; - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey)=0; + NS_IMETHOD GetAccessKey(nsString& aAccessKey)=0; + NS_IMETHOD SetAccessKey(const nsString& aAccessKey)=0; NS_IMETHOD GetCols(PRInt32* aCols)=0; NS_IMETHOD SetCols(PRInt32 aCols)=0; @@ -53,8 +53,8 @@ public: NS_IMETHOD GetDisabled(PRBool* aDisabled)=0; NS_IMETHOD SetDisabled(PRBool aDisabled)=0; - NS_IMETHOD GetName(nsAWritableString& aName)=0; - NS_IMETHOD SetName(const nsAReadableString& aName)=0; + NS_IMETHOD GetName(nsString& aName)=0; + NS_IMETHOD SetName(const nsString& aName)=0; NS_IMETHOD GetReadOnly(PRBool* aReadOnly)=0; NS_IMETHOD SetReadOnly(PRBool aReadOnly)=0; @@ -65,10 +65,10 @@ public: NS_IMETHOD GetTabIndex(PRInt32* aTabIndex)=0; NS_IMETHOD SetTabIndex(PRInt32 aTabIndex)=0; - NS_IMETHOD GetType(nsAWritableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; - NS_IMETHOD GetValue(nsAWritableString& aValue)=0; - NS_IMETHOD SetValue(const nsAReadableString& aValue)=0; + NS_IMETHOD GetValue(nsString& aValue)=0; + NS_IMETHOD SetValue(const nsString& aValue)=0; NS_IMETHOD Blur()=0; @@ -79,26 +79,26 @@ public: #define NS_DECL_IDOMHTMLTEXTAREAELEMENT \ - NS_IMETHOD GetDefaultValue(nsAWritableString& aDefaultValue); \ - NS_IMETHOD SetDefaultValue(const nsAReadableString& aDefaultValue); \ + NS_IMETHOD GetDefaultValue(nsString& aDefaultValue); \ + NS_IMETHOD SetDefaultValue(const nsString& aDefaultValue); \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm); \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey); \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey); \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey); \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey); \ NS_IMETHOD GetCols(PRInt32* aCols); \ NS_IMETHOD SetCols(PRInt32 aCols); \ NS_IMETHOD GetDisabled(PRBool* aDisabled); \ NS_IMETHOD SetDisabled(PRBool aDisabled); \ - NS_IMETHOD GetName(nsAWritableString& aName); \ - NS_IMETHOD SetName(const nsAReadableString& aName); \ + NS_IMETHOD GetName(nsString& aName); \ + NS_IMETHOD SetName(const nsString& aName); \ NS_IMETHOD GetReadOnly(PRBool* aReadOnly); \ NS_IMETHOD SetReadOnly(PRBool aReadOnly); \ NS_IMETHOD GetRows(PRInt32* aRows); \ NS_IMETHOD SetRows(PRInt32 aRows); \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex); \ NS_IMETHOD SetTabIndex(PRInt32 aTabIndex); \ - NS_IMETHOD GetType(nsAWritableString& aType); \ - NS_IMETHOD GetValue(nsAWritableString& aValue); \ - NS_IMETHOD SetValue(const nsAReadableString& aValue); \ + NS_IMETHOD GetType(nsString& aType); \ + NS_IMETHOD GetValue(nsString& aValue); \ + NS_IMETHOD SetValue(const nsString& aValue); \ NS_IMETHOD Blur(); \ NS_IMETHOD Focus(); \ NS_IMETHOD Select(); \ @@ -106,26 +106,26 @@ public: #define NS_FORWARD_IDOMHTMLTEXTAREAELEMENT(_to) \ - NS_IMETHOD GetDefaultValue(nsAWritableString& aDefaultValue) { return _to GetDefaultValue(aDefaultValue); } \ - NS_IMETHOD SetDefaultValue(const nsAReadableString& aDefaultValue) { return _to SetDefaultValue(aDefaultValue); } \ + NS_IMETHOD GetDefaultValue(nsString& aDefaultValue) { return _to GetDefaultValue(aDefaultValue); } \ + NS_IMETHOD SetDefaultValue(const nsString& aDefaultValue) { return _to SetDefaultValue(aDefaultValue); } \ NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm) { return _to GetForm(aForm); } \ - NS_IMETHOD GetAccessKey(nsAWritableString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ - NS_IMETHOD SetAccessKey(const nsAReadableString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ + NS_IMETHOD GetAccessKey(nsString& aAccessKey) { return _to GetAccessKey(aAccessKey); } \ + NS_IMETHOD SetAccessKey(const nsString& aAccessKey) { return _to SetAccessKey(aAccessKey); } \ NS_IMETHOD GetCols(PRInt32* aCols) { return _to GetCols(aCols); } \ NS_IMETHOD SetCols(PRInt32 aCols) { return _to SetCols(aCols); } \ NS_IMETHOD GetDisabled(PRBool* aDisabled) { return _to GetDisabled(aDisabled); } \ NS_IMETHOD SetDisabled(PRBool aDisabled) { return _to SetDisabled(aDisabled); } \ - NS_IMETHOD GetName(nsAWritableString& aName) { return _to GetName(aName); } \ - NS_IMETHOD SetName(const nsAReadableString& aName) { return _to SetName(aName); } \ + NS_IMETHOD GetName(nsString& aName) { return _to GetName(aName); } \ + NS_IMETHOD SetName(const nsString& aName) { return _to SetName(aName); } \ NS_IMETHOD GetReadOnly(PRBool* aReadOnly) { return _to GetReadOnly(aReadOnly); } \ NS_IMETHOD SetReadOnly(PRBool aReadOnly) { return _to SetReadOnly(aReadOnly); } \ NS_IMETHOD GetRows(PRInt32* aRows) { return _to GetRows(aRows); } \ NS_IMETHOD SetRows(PRInt32 aRows) { return _to SetRows(aRows); } \ NS_IMETHOD GetTabIndex(PRInt32* aTabIndex) { return _to GetTabIndex(aTabIndex); } \ NS_IMETHOD SetTabIndex(PRInt32 aTabIndex) { return _to SetTabIndex(aTabIndex); } \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ - NS_IMETHOD GetValue(nsAWritableString& aValue) { return _to GetValue(aValue); } \ - NS_IMETHOD SetValue(const nsAReadableString& aValue) { return _to SetValue(aValue); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ + NS_IMETHOD GetValue(nsString& aValue) { return _to GetValue(aValue); } \ + NS_IMETHOD SetValue(const nsString& aValue) { return _to SetValue(aValue); } \ NS_IMETHOD Blur() { return _to Blur(); } \ NS_IMETHOD Focus() { return _to Focus(); } \ NS_IMETHOD Select() { return _to Select(); } \ diff --git a/dom/public/html/nsIDOMHTMLTitleElement.h b/dom/public/html/nsIDOMHTMLTitleElement.h index 89fd701a448..4c2dbfacdca 100644 --- a/dom/public/html/nsIDOMHTMLTitleElement.h +++ b/dom/public/html/nsIDOMHTMLTitleElement.h @@ -38,20 +38,20 @@ class nsIDOMHTMLTitleElement : public nsIDOMHTMLElement { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMHTMLTITLEELEMENT_IID; return iid; } - NS_IMETHOD GetText(nsAWritableString& aText)=0; - NS_IMETHOD SetText(const nsAReadableString& aText)=0; + NS_IMETHOD GetText(nsString& aText)=0; + NS_IMETHOD SetText(const nsString& aText)=0; }; #define NS_DECL_IDOMHTMLTITLEELEMENT \ - NS_IMETHOD GetText(nsAWritableString& aText); \ - NS_IMETHOD SetText(const nsAReadableString& aText); \ + NS_IMETHOD GetText(nsString& aText); \ + NS_IMETHOD SetText(const nsString& aText); \ #define NS_FORWARD_IDOMHTMLTITLEELEMENT(_to) \ - NS_IMETHOD GetText(nsAWritableString& aText) { return _to GetText(aText); } \ - NS_IMETHOD SetText(const nsAReadableString& aText) { return _to SetText(aText); } \ + NS_IMETHOD GetText(nsString& aText) { return _to GetText(aText); } \ + NS_IMETHOD SetText(const nsString& aText) { return _to SetText(aText); } \ extern "C" NS_DOM nsresult NS_InitHTMLTitleElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMHTMLUListElement.h b/dom/public/html/nsIDOMHTMLUListElement.h index b57c48f8d30..46027615fd8 100644 --- a/dom/public/html/nsIDOMHTMLUListElement.h +++ b/dom/public/html/nsIDOMHTMLUListElement.h @@ -41,24 +41,24 @@ public: NS_IMETHOD GetCompact(PRBool* aCompact)=0; NS_IMETHOD SetCompact(PRBool aCompact)=0; - NS_IMETHOD GetType(nsAWritableString& aType)=0; - NS_IMETHOD SetType(const nsAReadableString& aType)=0; + NS_IMETHOD GetType(nsString& aType)=0; + NS_IMETHOD SetType(const nsString& aType)=0; }; #define NS_DECL_IDOMHTMLULISTELEMENT \ NS_IMETHOD GetCompact(PRBool* aCompact); \ NS_IMETHOD SetCompact(PRBool aCompact); \ - NS_IMETHOD GetType(nsAWritableString& aType); \ - NS_IMETHOD SetType(const nsAReadableString& aType); \ + NS_IMETHOD GetType(nsString& aType); \ + NS_IMETHOD SetType(const nsString& aType); \ #define NS_FORWARD_IDOMHTMLULISTELEMENT(_to) \ NS_IMETHOD GetCompact(PRBool* aCompact) { return _to GetCompact(aCompact); } \ NS_IMETHOD SetCompact(PRBool aCompact) { return _to SetCompact(aCompact); } \ - NS_IMETHOD GetType(nsAWritableString& aType) { return _to GetType(aType); } \ - NS_IMETHOD SetType(const nsAReadableString& aType) { return _to SetType(aType); } \ + NS_IMETHOD GetType(nsString& aType) { return _to GetType(aType); } \ + NS_IMETHOD SetType(const nsString& aType) { return _to SetType(aType); } \ extern "C" NS_DOM nsresult NS_InitHTMLUListElementClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMImage.h b/dom/public/html/nsIDOMImage.h index 55df997d38c..afd710c671a 100644 --- a/dom/public/html/nsIDOMImage.h +++ b/dom/public/html/nsIDOMImage.h @@ -37,8 +37,8 @@ class nsIDOMImage : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMIMAGE_IID; return iid; } - NS_IMETHOD GetLowsrc(nsAWritableString& aLowsrc)=0; - NS_IMETHOD SetLowsrc(const nsAReadableString& aLowsrc)=0; + NS_IMETHOD GetLowsrc(nsString& aLowsrc)=0; + NS_IMETHOD SetLowsrc(const nsString& aLowsrc)=0; NS_IMETHOD GetComplete(PRBool* aComplete)=0; @@ -60,8 +60,8 @@ public: #define NS_DECL_IDOMIMAGE \ - NS_IMETHOD GetLowsrc(nsAWritableString& aLowsrc); \ - NS_IMETHOD SetLowsrc(const nsAReadableString& aLowsrc); \ + NS_IMETHOD GetLowsrc(nsString& aLowsrc); \ + NS_IMETHOD SetLowsrc(const nsString& aLowsrc); \ NS_IMETHOD GetComplete(PRBool* aComplete); \ NS_IMETHOD GetBorder(PRInt32* aBorder); \ NS_IMETHOD SetBorder(PRInt32 aBorder); \ @@ -77,8 +77,8 @@ public: #define NS_FORWARD_IDOMIMAGE(_to) \ - NS_IMETHOD GetLowsrc(nsAWritableString& aLowsrc) { return _to GetLowsrc(aLowsrc); } \ - NS_IMETHOD SetLowsrc(const nsAReadableString& aLowsrc) { return _to SetLowsrc(aLowsrc); } \ + NS_IMETHOD GetLowsrc(nsString& aLowsrc) { return _to GetLowsrc(aLowsrc); } \ + NS_IMETHOD SetLowsrc(const nsString& aLowsrc) { return _to SetLowsrc(aLowsrc); } \ NS_IMETHOD GetComplete(PRBool* aComplete) { return _to GetComplete(aComplete); } \ NS_IMETHOD GetBorder(PRInt32* aBorder) { return _to GetBorder(aBorder); } \ NS_IMETHOD SetBorder(PRInt32 aBorder) { return _to SetBorder(aBorder); } \ diff --git a/dom/public/html/nsIDOMNSHTMLAnchorElement.h b/dom/public/html/nsIDOMNSHTMLAnchorElement.h index 10c7528b824..25f7ceef70b 100644 --- a/dom/public/html/nsIDOMNSHTMLAnchorElement.h +++ b/dom/public/html/nsIDOMNSHTMLAnchorElement.h @@ -37,45 +37,45 @@ class nsIDOMNSHTMLAnchorElement : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLANCHORELEMENT_IID; return iid; } - NS_IMETHOD GetProtocol(nsAWritableString& aProtocol)=0; + NS_IMETHOD GetProtocol(nsString& aProtocol)=0; - NS_IMETHOD GetHost(nsAWritableString& aHost)=0; + NS_IMETHOD GetHost(nsString& aHost)=0; - NS_IMETHOD GetHostname(nsAWritableString& aHostname)=0; + NS_IMETHOD GetHostname(nsString& aHostname)=0; - NS_IMETHOD GetPathname(nsAWritableString& aPathname)=0; + NS_IMETHOD GetPathname(nsString& aPathname)=0; - NS_IMETHOD GetSearch(nsAWritableString& aSearch)=0; + NS_IMETHOD GetSearch(nsString& aSearch)=0; - NS_IMETHOD GetPort(nsAWritableString& aPort)=0; + NS_IMETHOD GetPort(nsString& aPort)=0; - NS_IMETHOD GetHash(nsAWritableString& aHash)=0; + NS_IMETHOD GetHash(nsString& aHash)=0; - NS_IMETHOD GetText(nsAWritableString& aText)=0; + NS_IMETHOD GetText(nsString& aText)=0; }; #define NS_DECL_IDOMNSHTMLANCHORELEMENT \ - NS_IMETHOD GetProtocol(nsAWritableString& aProtocol); \ - NS_IMETHOD GetHost(nsAWritableString& aHost); \ - NS_IMETHOD GetHostname(nsAWritableString& aHostname); \ - NS_IMETHOD GetPathname(nsAWritableString& aPathname); \ - NS_IMETHOD GetSearch(nsAWritableString& aSearch); \ - NS_IMETHOD GetPort(nsAWritableString& aPort); \ - NS_IMETHOD GetHash(nsAWritableString& aHash); \ - NS_IMETHOD GetText(nsAWritableString& aText); \ + NS_IMETHOD GetProtocol(nsString& aProtocol); \ + NS_IMETHOD GetHost(nsString& aHost); \ + NS_IMETHOD GetHostname(nsString& aHostname); \ + NS_IMETHOD GetPathname(nsString& aPathname); \ + NS_IMETHOD GetSearch(nsString& aSearch); \ + NS_IMETHOD GetPort(nsString& aPort); \ + NS_IMETHOD GetHash(nsString& aHash); \ + NS_IMETHOD GetText(nsString& aText); \ #define NS_FORWARD_IDOMNSHTMLANCHORELEMENT(_to) \ - NS_IMETHOD GetProtocol(nsAWritableString& aProtocol) { return _to GetProtocol(aProtocol); } \ - NS_IMETHOD GetHost(nsAWritableString& aHost) { return _to GetHost(aHost); } \ - NS_IMETHOD GetHostname(nsAWritableString& aHostname) { return _to GetHostname(aHostname); } \ - NS_IMETHOD GetPathname(nsAWritableString& aPathname) { return _to GetPathname(aPathname); } \ - NS_IMETHOD GetSearch(nsAWritableString& aSearch) { return _to GetSearch(aSearch); } \ - NS_IMETHOD GetPort(nsAWritableString& aPort) { return _to GetPort(aPort); } \ - NS_IMETHOD GetHash(nsAWritableString& aHash) { return _to GetHash(aHash); } \ - NS_IMETHOD GetText(nsAWritableString& aText) { return _to GetText(aText); } \ + NS_IMETHOD GetProtocol(nsString& aProtocol) { return _to GetProtocol(aProtocol); } \ + NS_IMETHOD GetHost(nsString& aHost) { return _to GetHost(aHost); } \ + NS_IMETHOD GetHostname(nsString& aHostname) { return _to GetHostname(aHostname); } \ + NS_IMETHOD GetPathname(nsString& aPathname) { return _to GetPathname(aPathname); } \ + NS_IMETHOD GetSearch(nsString& aSearch) { return _to GetSearch(aSearch); } \ + NS_IMETHOD GetPort(nsString& aPort) { return _to GetPort(aPort); } \ + NS_IMETHOD GetHash(nsString& aHash) { return _to GetHash(aHash); } \ + NS_IMETHOD GetText(nsString& aText) { return _to GetText(aText); } \ #endif // nsIDOMNSHTMLAnchorElement_h__ diff --git a/dom/public/html/nsIDOMNSHTMLAreaElement.h b/dom/public/html/nsIDOMNSHTMLAreaElement.h index cbd1fdcda88..d1ea10fd6d2 100644 --- a/dom/public/html/nsIDOMNSHTMLAreaElement.h +++ b/dom/public/html/nsIDOMNSHTMLAreaElement.h @@ -37,41 +37,41 @@ class nsIDOMNSHTMLAreaElement : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLAREAELEMENT_IID; return iid; } - NS_IMETHOD GetProtocol(nsAWritableString& aProtocol)=0; + NS_IMETHOD GetProtocol(nsString& aProtocol)=0; - NS_IMETHOD GetHost(nsAWritableString& aHost)=0; + NS_IMETHOD GetHost(nsString& aHost)=0; - NS_IMETHOD GetHostname(nsAWritableString& aHostname)=0; + NS_IMETHOD GetHostname(nsString& aHostname)=0; - NS_IMETHOD GetPathname(nsAWritableString& aPathname)=0; + NS_IMETHOD GetPathname(nsString& aPathname)=0; - NS_IMETHOD GetSearch(nsAWritableString& aSearch)=0; + NS_IMETHOD GetSearch(nsString& aSearch)=0; - NS_IMETHOD GetPort(nsAWritableString& aPort)=0; + NS_IMETHOD GetPort(nsString& aPort)=0; - NS_IMETHOD GetHash(nsAWritableString& aHash)=0; + NS_IMETHOD GetHash(nsString& aHash)=0; }; #define NS_DECL_IDOMNSHTMLAREAELEMENT \ - NS_IMETHOD GetProtocol(nsAWritableString& aProtocol); \ - NS_IMETHOD GetHost(nsAWritableString& aHost); \ - NS_IMETHOD GetHostname(nsAWritableString& aHostname); \ - NS_IMETHOD GetPathname(nsAWritableString& aPathname); \ - NS_IMETHOD GetSearch(nsAWritableString& aSearch); \ - NS_IMETHOD GetPort(nsAWritableString& aPort); \ - NS_IMETHOD GetHash(nsAWritableString& aHash); \ + NS_IMETHOD GetProtocol(nsString& aProtocol); \ + NS_IMETHOD GetHost(nsString& aHost); \ + NS_IMETHOD GetHostname(nsString& aHostname); \ + NS_IMETHOD GetPathname(nsString& aPathname); \ + NS_IMETHOD GetSearch(nsString& aSearch); \ + NS_IMETHOD GetPort(nsString& aPort); \ + NS_IMETHOD GetHash(nsString& aHash); \ #define NS_FORWARD_IDOMNSHTMLAREAELEMENT(_to) \ - NS_IMETHOD GetProtocol(nsAWritableString& aProtocol) { return _to GetProtocol(aProtocol); } \ - NS_IMETHOD GetHost(nsAWritableString& aHost) { return _to GetHost(aHost); } \ - NS_IMETHOD GetHostname(nsAWritableString& aHostname) { return _to GetHostname(aHostname); } \ - NS_IMETHOD GetPathname(nsAWritableString& aPathname) { return _to GetPathname(aPathname); } \ - NS_IMETHOD GetSearch(nsAWritableString& aSearch) { return _to GetSearch(aSearch); } \ - NS_IMETHOD GetPort(nsAWritableString& aPort) { return _to GetPort(aPort); } \ - NS_IMETHOD GetHash(nsAWritableString& aHash) { return _to GetHash(aHash); } \ + NS_IMETHOD GetProtocol(nsString& aProtocol) { return _to GetProtocol(aProtocol); } \ + NS_IMETHOD GetHost(nsString& aHost) { return _to GetHost(aHost); } \ + NS_IMETHOD GetHostname(nsString& aHostname) { return _to GetHostname(aHostname); } \ + NS_IMETHOD GetPathname(nsString& aPathname) { return _to GetPathname(aPathname); } \ + NS_IMETHOD GetSearch(nsString& aSearch) { return _to GetSearch(aSearch); } \ + NS_IMETHOD GetPort(nsString& aPort) { return _to GetPort(aPort); } \ + NS_IMETHOD GetHash(nsString& aHash) { return _to GetHash(aHash); } \ #endif // nsIDOMNSHTMLAreaElement_h__ diff --git a/dom/public/html/nsIDOMNSHTMLDocument.h b/dom/public/html/nsIDOMNSHTMLDocument.h index abae9d5d903..1d2b9d5a9c4 100644 --- a/dom/public/html/nsIDOMNSHTMLDocument.h +++ b/dom/public/html/nsIDOMNSHTMLDocument.h @@ -25,7 +25,7 @@ #define nsIDOMNSHTMLDocument_h__ #include "nsISupports.h" -#include "nsAWritableString.h" +#include "nsString.h" #include "nsIScriptContext.h" #include "jsapi.h" @@ -40,26 +40,26 @@ class nsIDOMNSHTMLDocument : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLDOCUMENT_IID; return iid; } - NS_IMETHOD GetAlinkColor(nsAWritableString& aAlinkColor)=0; - NS_IMETHOD SetAlinkColor(const nsAReadableString& aAlinkColor)=0; + NS_IMETHOD GetAlinkColor(nsString& aAlinkColor)=0; + NS_IMETHOD SetAlinkColor(const nsString& aAlinkColor)=0; - NS_IMETHOD GetLinkColor(nsAWritableString& aLinkColor)=0; - NS_IMETHOD SetLinkColor(const nsAReadableString& aLinkColor)=0; + NS_IMETHOD GetLinkColor(nsString& aLinkColor)=0; + NS_IMETHOD SetLinkColor(const nsString& aLinkColor)=0; - NS_IMETHOD GetVlinkColor(nsAWritableString& aVlinkColor)=0; - NS_IMETHOD SetVlinkColor(const nsAReadableString& aVlinkColor)=0; + NS_IMETHOD GetVlinkColor(nsString& aVlinkColor)=0; + NS_IMETHOD SetVlinkColor(const nsString& aVlinkColor)=0; - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor)=0; - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor)=0; + NS_IMETHOD GetBgColor(nsString& aBgColor)=0; + NS_IMETHOD SetBgColor(const nsString& aBgColor)=0; - NS_IMETHOD GetFgColor(nsAWritableString& aFgColor)=0; - NS_IMETHOD SetFgColor(const nsAReadableString& aFgColor)=0; + NS_IMETHOD GetFgColor(nsString& aFgColor)=0; + NS_IMETHOD SetFgColor(const nsString& aFgColor)=0; - NS_IMETHOD GetLastModified(nsAWritableString& aLastModified)=0; + NS_IMETHOD GetLastModified(nsString& aLastModified)=0; NS_IMETHOD GetEmbeds(nsIDOMHTMLCollection** aEmbeds)=0; - NS_IMETHOD GetSelection(nsAWritableString& aReturn)=0; + NS_IMETHOD GetSelection(nsString& aReturn)=0; NS_IMETHOD NamedItem(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn)=0; @@ -80,19 +80,19 @@ public: #define NS_DECL_IDOMNSHTMLDOCUMENT \ - NS_IMETHOD GetAlinkColor(nsAWritableString& aAlinkColor); \ - NS_IMETHOD SetAlinkColor(const nsAReadableString& aAlinkColor); \ - NS_IMETHOD GetLinkColor(nsAWritableString& aLinkColor); \ - NS_IMETHOD SetLinkColor(const nsAReadableString& aLinkColor); \ - NS_IMETHOD GetVlinkColor(nsAWritableString& aVlinkColor); \ - NS_IMETHOD SetVlinkColor(const nsAReadableString& aVlinkColor); \ - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor); \ - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor); \ - NS_IMETHOD GetFgColor(nsAWritableString& aFgColor); \ - NS_IMETHOD SetFgColor(const nsAReadableString& aFgColor); \ - NS_IMETHOD GetLastModified(nsAWritableString& aLastModified); \ + NS_IMETHOD GetAlinkColor(nsString& aAlinkColor); \ + NS_IMETHOD SetAlinkColor(const nsString& aAlinkColor); \ + NS_IMETHOD GetLinkColor(nsString& aLinkColor); \ + NS_IMETHOD SetLinkColor(const nsString& aLinkColor); \ + NS_IMETHOD GetVlinkColor(nsString& aVlinkColor); \ + NS_IMETHOD SetVlinkColor(const nsString& aVlinkColor); \ + NS_IMETHOD GetBgColor(nsString& aBgColor); \ + NS_IMETHOD SetBgColor(const nsString& aBgColor); \ + NS_IMETHOD GetFgColor(nsString& aFgColor); \ + NS_IMETHOD SetFgColor(const nsString& aFgColor); \ + NS_IMETHOD GetLastModified(nsString& aLastModified); \ NS_IMETHOD GetEmbeds(nsIDOMHTMLCollection** aEmbeds); \ - NS_IMETHOD GetSelection(nsAWritableString& aReturn); \ + NS_IMETHOD GetSelection(nsString& aReturn); \ NS_IMETHOD NamedItem(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn); \ NS_IMETHOD Open(JSContext* cx, jsval* argv, PRUint32 argc); \ NS_IMETHOD Write(JSContext* cx, jsval* argv, PRUint32 argc); \ @@ -105,19 +105,19 @@ public: #define NS_FORWARD_IDOMNSHTMLDOCUMENT(_to) \ - NS_IMETHOD GetAlinkColor(nsAWritableString& aAlinkColor) { return _to GetAlinkColor(aAlinkColor); } \ - NS_IMETHOD SetAlinkColor(const nsAReadableString& aAlinkColor) { return _to SetAlinkColor(aAlinkColor); } \ - NS_IMETHOD GetLinkColor(nsAWritableString& aLinkColor) { return _to GetLinkColor(aLinkColor); } \ - NS_IMETHOD SetLinkColor(const nsAReadableString& aLinkColor) { return _to SetLinkColor(aLinkColor); } \ - NS_IMETHOD GetVlinkColor(nsAWritableString& aVlinkColor) { return _to GetVlinkColor(aVlinkColor); } \ - NS_IMETHOD SetVlinkColor(const nsAReadableString& aVlinkColor) { return _to SetVlinkColor(aVlinkColor); } \ - NS_IMETHOD GetBgColor(nsAWritableString& aBgColor) { return _to GetBgColor(aBgColor); } \ - NS_IMETHOD SetBgColor(const nsAReadableString& aBgColor) { return _to SetBgColor(aBgColor); } \ - NS_IMETHOD GetFgColor(nsAWritableString& aFgColor) { return _to GetFgColor(aFgColor); } \ - NS_IMETHOD SetFgColor(const nsAReadableString& aFgColor) { return _to SetFgColor(aFgColor); } \ - NS_IMETHOD GetLastModified(nsAWritableString& aLastModified) { return _to GetLastModified(aLastModified); } \ + NS_IMETHOD GetAlinkColor(nsString& aAlinkColor) { return _to GetAlinkColor(aAlinkColor); } \ + NS_IMETHOD SetAlinkColor(const nsString& aAlinkColor) { return _to SetAlinkColor(aAlinkColor); } \ + NS_IMETHOD GetLinkColor(nsString& aLinkColor) { return _to GetLinkColor(aLinkColor); } \ + NS_IMETHOD SetLinkColor(const nsString& aLinkColor) { return _to SetLinkColor(aLinkColor); } \ + NS_IMETHOD GetVlinkColor(nsString& aVlinkColor) { return _to GetVlinkColor(aVlinkColor); } \ + NS_IMETHOD SetVlinkColor(const nsString& aVlinkColor) { return _to SetVlinkColor(aVlinkColor); } \ + NS_IMETHOD GetBgColor(nsString& aBgColor) { return _to GetBgColor(aBgColor); } \ + NS_IMETHOD SetBgColor(const nsString& aBgColor) { return _to SetBgColor(aBgColor); } \ + NS_IMETHOD GetFgColor(nsString& aFgColor) { return _to GetFgColor(aFgColor); } \ + NS_IMETHOD SetFgColor(const nsString& aFgColor) { return _to SetFgColor(aFgColor); } \ + NS_IMETHOD GetLastModified(nsString& aLastModified) { return _to GetLastModified(aLastModified); } \ NS_IMETHOD GetEmbeds(nsIDOMHTMLCollection** aEmbeds) { return _to GetEmbeds(aEmbeds); } \ - NS_IMETHOD GetSelection(nsAWritableString& aReturn) { return _to GetSelection(aReturn); } \ + NS_IMETHOD GetSelection(nsString& aReturn) { return _to GetSelection(aReturn); } \ NS_IMETHOD NamedItem(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn) { return _to NamedItem(cx, argv, argc, aReturn); } \ NS_IMETHOD Open(JSContext* cx, jsval* argv, PRUint32 argc) { return _to Open(cx, argv, argc); } \ NS_IMETHOD Write(JSContext* cx, jsval* argv, PRUint32 argc) { return _to Write(cx, argv, argc); } \ diff --git a/dom/public/html/nsIDOMNSHTMLFormElement.h b/dom/public/html/nsIDOMNSHTMLFormElement.h index cecd1d31cde..d04908006da 100644 --- a/dom/public/html/nsIDOMNSHTMLFormElement.h +++ b/dom/public/html/nsIDOMNSHTMLFormElement.h @@ -39,7 +39,7 @@ class nsIDOMNSHTMLFormElement : public nsISupports { public: static const nsIID& GetIID() { static nsIID iid = NS_IDOMNSHTMLFORMELEMENT_IID; return iid; } - NS_IMETHOD GetEncoding(nsAWritableString& aEncoding)=0; + NS_IMETHOD GetEncoding(nsString& aEncoding)=0; NS_IMETHOD NamedItem(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn)=0; @@ -48,14 +48,14 @@ public: #define NS_DECL_IDOMNSHTMLFORMELEMENT \ - NS_IMETHOD GetEncoding(nsAWritableString& aEncoding); \ + NS_IMETHOD GetEncoding(nsString& aEncoding); \ NS_IMETHOD NamedItem(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn); \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMElement** aReturn); \ #define NS_FORWARD_IDOMNSHTMLFORMELEMENT(_to) \ - NS_IMETHOD GetEncoding(nsAWritableString& aEncoding) { return _to GetEncoding(aEncoding); } \ + NS_IMETHOD GetEncoding(nsString& aEncoding) { return _to GetEncoding(aEncoding); } \ NS_IMETHOD NamedItem(JSContext* cx, jsval* argv, PRUint32 argc, jsval* aReturn) { return _to NamedItem(cx, argv, argc, aReturn); } \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMElement** aReturn) { return _to Item(aIndex, aReturn); } \ diff --git a/dom/public/html/nsIDOMNSHTMLOptionCollection.h b/dom/public/html/nsIDOMNSHTMLOptionCollection.h index 43d1e30d0fe..e1bb42f3ae4 100755 --- a/dom/public/html/nsIDOMNSHTMLOptionCollection.h +++ b/dom/public/html/nsIDOMNSHTMLOptionCollection.h @@ -47,7 +47,7 @@ public: NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn)=0; - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn)=0; + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMNode** aReturn)=0; }; @@ -57,7 +57,7 @@ public: NS_IMETHOD GetSelectedIndex(PRInt32* aSelectedIndex); \ NS_IMETHOD SetSelectedIndex(PRInt32 aSelectedIndex); \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn); \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn); \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMNode** aReturn); \ @@ -67,7 +67,7 @@ public: NS_IMETHOD GetSelectedIndex(PRInt32* aSelectedIndex) { return _to GetSelectedIndex(aSelectedIndex); } \ NS_IMETHOD SetSelectedIndex(PRInt32 aSelectedIndex) { return _to SetSelectedIndex(aSelectedIndex); } \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn) { return _to Item(aIndex, aReturn); } \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn) { return _to NamedItem(aName, aReturn); } \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMNode** aReturn) { return _to NamedItem(aName, aReturn); } \ extern "C" NS_DOM nsresult NS_InitNSHTMLOptionCollectionClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/html/nsIDOMNSHTMLSelectElement.h b/dom/public/html/nsIDOMNSHTMLSelectElement.h index aab6282f831..d9b4f15ce77 100644 --- a/dom/public/html/nsIDOMNSHTMLSelectElement.h +++ b/dom/public/html/nsIDOMNSHTMLSelectElement.h @@ -40,19 +40,19 @@ public: NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn)=0; - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn)=0; + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMNode** aReturn)=0; }; #define NS_DECL_IDOMNSHTMLSELECTELEMENT \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn); \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn); \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMNode** aReturn); \ #define NS_FORWARD_IDOMNSHTMLSELECTELEMENT(_to) \ NS_IMETHOD Item(PRUint32 aIndex, nsIDOMNode** aReturn) { return _to Item(aIndex, aReturn); } \ - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMNode** aReturn) { return _to NamedItem(aName, aReturn); } \ + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMNode** aReturn) { return _to NamedItem(aName, aReturn); } \ #endif // nsIDOMNSHTMLSelectElement_h__ diff --git a/dom/public/idl/coreDom/DOMImplementation.idl b/dom/public/idl/coreDom/DOMImplementation.idl index a0c8eeb9ab9..bf96d7d99f1 100644 --- a/dom/public/idl/coreDom/DOMImplementation.idl +++ b/dom/public/idl/coreDom/DOMImplementation.idl @@ -15,4 +15,3 @@ in DocumentType doctype) raises(DOMException); }; - diff --git a/dom/public/range/nsIDOMNSRange.h b/dom/public/range/nsIDOMNSRange.h index efb02cc86e2..ad2cdfd3a40 100644 --- a/dom/public/range/nsIDOMNSRange.h +++ b/dom/public/range/nsIDOMNSRange.h @@ -45,9 +45,9 @@ public: NODE_INSIDE = 3 }; - NS_IMETHOD CreateContextualFragment(const nsAReadableString& aFragment, nsIDOMDocumentFragment** aReturn)=0; + NS_IMETHOD CreateContextualFragment(const nsString& aFragment, nsIDOMDocumentFragment** aReturn)=0; - NS_IMETHOD IsValidFragment(const nsAReadableString& aFragment, PRBool* aReturn)=0; + NS_IMETHOD IsValidFragment(const nsString& aFragment, PRBool* aReturn)=0; NS_IMETHOD IsPointInRange(nsIDOMNode* aParent, PRInt32 aOffset, PRBool* aReturn)=0; @@ -60,8 +60,8 @@ public: #define NS_DECL_IDOMNSRANGE \ - NS_IMETHOD CreateContextualFragment(const nsAReadableString& aFragment, nsIDOMDocumentFragment** aReturn); \ - NS_IMETHOD IsValidFragment(const nsAReadableString& aFragment, PRBool* aReturn); \ + NS_IMETHOD CreateContextualFragment(const nsString& aFragment, nsIDOMDocumentFragment** aReturn); \ + NS_IMETHOD IsValidFragment(const nsString& aFragment, PRBool* aReturn); \ NS_IMETHOD IsPointInRange(nsIDOMNode* aParent, PRInt32 aOffset, PRBool* aReturn); \ NS_IMETHOD ComparePoint(nsIDOMNode* aParent, PRInt32 aOffset, PRInt16* aReturn); \ NS_IMETHOD IntersectsNode(nsIDOMNode* aN, PRBool* aReturn); \ @@ -70,8 +70,8 @@ public: #define NS_FORWARD_IDOMNSRANGE(_to) \ - NS_IMETHOD CreateContextualFragment(const nsAReadableString& aFragment, nsIDOMDocumentFragment** aReturn) { return _to CreateContextualFragment(aFragment, aReturn); } \ - NS_IMETHOD IsValidFragment(const nsAReadableString& aFragment, PRBool* aReturn) { return _to IsValidFragment(aFragment, aReturn); } \ + NS_IMETHOD CreateContextualFragment(const nsString& aFragment, nsIDOMDocumentFragment** aReturn) { return _to CreateContextualFragment(aFragment, aReturn); } \ + NS_IMETHOD IsValidFragment(const nsString& aFragment, PRBool* aReturn) { return _to IsValidFragment(aFragment, aReturn); } \ NS_IMETHOD IsPointInRange(nsIDOMNode* aParent, PRInt32 aOffset, PRBool* aReturn) { return _to IsPointInRange(aParent, aOffset, aReturn); } \ NS_IMETHOD ComparePoint(nsIDOMNode* aParent, PRInt32 aOffset, PRInt16* aReturn) { return _to ComparePoint(aParent, aOffset, aReturn); } \ NS_IMETHOD IntersectsNode(nsIDOMNode* aN, PRBool* aReturn) { return _to IntersectsNode(aN, aReturn); } \ diff --git a/dom/public/range/nsIDOMRange.h b/dom/public/range/nsIDOMRange.h index 2d7535ee6f2..f9f616c938d 100644 --- a/dom/public/range/nsIDOMRange.h +++ b/dom/public/range/nsIDOMRange.h @@ -90,7 +90,7 @@ public: NS_IMETHOD Clone(nsIDOMRange** aReturn)=0; - NS_IMETHOD ToString(nsAWritableString& aReturn)=0; + NS_IMETHOD ToString(nsString& aReturn)=0; }; @@ -117,7 +117,7 @@ public: NS_IMETHOD InsertNode(nsIDOMNode* aN); \ NS_IMETHOD SurroundContents(nsIDOMNode* aN); \ NS_IMETHOD Clone(nsIDOMRange** aReturn); \ - NS_IMETHOD ToString(nsAWritableString& aReturn); \ + NS_IMETHOD ToString(nsString& aReturn); \ @@ -144,7 +144,7 @@ public: NS_IMETHOD InsertNode(nsIDOMNode* aN) { return _to InsertNode(aN); } \ NS_IMETHOD SurroundContents(nsIDOMNode* aN) { return _to SurroundContents(aN); } \ NS_IMETHOD Clone(nsIDOMRange** aReturn) { return _to Clone(aReturn); } \ - NS_IMETHOD ToString(nsAWritableString& aReturn) { return _to ToString(aReturn); } \ + NS_IMETHOD ToString(nsString& aReturn) { return _to ToString(aReturn); } \ extern "C" NS_DOM nsresult NS_InitRangeClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/public/range/nsIDOMSelection.h b/dom/public/range/nsIDOMSelection.h index 144c2f22f61..890915e97a8 100644 --- a/dom/public/range/nsIDOMSelection.h +++ b/dom/public/range/nsIDOMSelection.h @@ -87,7 +87,7 @@ public: NS_IMETHOD GetEnumerator(nsIEnumerator** aReturn)=0; - NS_IMETHOD ToString(const nsAReadableString& aFormatType, PRUint32 aFlags, PRInt32 aWrapCount, nsAWritableString& aReturn)=0; + NS_IMETHOD ToString(const nsString& aFormatType, PRUint32 aFlags, PRInt32 aWrapCount, nsString& aReturn)=0; }; @@ -115,7 +115,7 @@ public: NS_IMETHOD SetHint(PRBool aRight); \ NS_IMETHOD GetHint(PRBool* aReturn); \ NS_IMETHOD GetEnumerator(nsIEnumerator** aReturn); \ - NS_IMETHOD ToString(const nsAReadableString& aFormatType, PRUint32 aFlags, PRInt32 aWrapCount, nsAWritableString& aReturn); \ + NS_IMETHOD ToString(const nsString& aFormatType, PRUint32 aFlags, PRInt32 aWrapCount, nsString& aReturn); \ @@ -143,7 +143,7 @@ public: NS_IMETHOD SetHint(PRBool aRight) { return _to SetHint(aRight); } \ NS_IMETHOD GetHint(PRBool* aReturn) { return _to GetHint(aReturn); } \ NS_IMETHOD GetEnumerator(nsIEnumerator** aReturn) { return _to GetEnumerator(aReturn); } \ - NS_IMETHOD ToString(const nsAReadableString& aFormatType, PRUint32 aFlags, PRInt32 aWrapCount, nsAWritableString& aReturn) { return _to ToString(aFormatType, aFlags, aWrapCount, aReturn); } \ + NS_IMETHOD ToString(const nsString& aFormatType, PRUint32 aFlags, PRInt32 aWrapCount, nsString& aReturn) { return _to ToString(aFormatType, aFlags, aWrapCount, aReturn); } \ extern "C" NS_DOM nsresult NS_InitSelectionClass(nsIScriptContext *aContext, void **aPrototype); diff --git a/dom/src/base/nsDOMException.cpp b/dom/src/base/nsDOMException.cpp index cab7fc31c87..0860781bb73 100644 --- a/dom/src/base/nsDOMException.cpp +++ b/dom/src/base/nsDOMException.cpp @@ -169,10 +169,10 @@ nsDOMException::GetResult(PRUint32* aResult) } NS_IMETHODIMP -nsDOMException::GetMessage(nsAWritableString& aMessage) +nsDOMException::GetMessage(nsString& aMessage) { if (mMessage) { - aMessage.Assign(NS_ConvertASCIItoUCS2(mMessage)); + aMessage.AssignWithConversion(mMessage); } else { aMessage.Truncate(); @@ -182,10 +182,10 @@ nsDOMException::GetMessage(nsAWritableString& aMessage) } NS_IMETHODIMP -nsDOMException::GetName(nsAWritableString& aName) +nsDOMException::GetName(nsString& aName) { if (mName) { - aName.Assign(NS_ConvertASCIItoUCS2(mName)); + aName.AssignWithConversion(mName); } else { aName.Truncate(); @@ -195,7 +195,7 @@ nsDOMException::GetName(nsAWritableString& aName) } NS_IMETHODIMP -nsDOMException::ToString(nsAWritableString& aReturn) +nsDOMException::ToString(nsString& aReturn) { static const char defaultMsg[] = ""; static const char defaultLocation[] = ""; @@ -211,7 +211,7 @@ nsDOMException::ToString(nsAWritableString& aReturn) GetCode(&code); char* temp = PR_smprintf(format, msg, code, mResult, resultName, location); if (temp) { - aReturn.Assign(NS_ConvertASCIItoUCS2(temp)); + aReturn.AssignWithConversion(temp); PR_smprintf_free(temp); } diff --git a/dom/src/base/nsDOMWindowList.cpp b/dom/src/base/nsDOMWindowList.cpp index f09a8620c7a..eab04780968 100644 --- a/dom/src/base/nsDOMWindowList.cpp +++ b/dom/src/base/nsDOMWindowList.cpp @@ -127,7 +127,7 @@ nsDOMWindowList::Item(PRUint32 aIndex, nsIDOMWindow** aReturn) } NS_IMETHODIMP -nsDOMWindowList::NamedItem(const nsAReadableString& aName, nsIDOMWindow** aReturn) +nsDOMWindowList::NamedItem(const nsString& aName, nsIDOMWindow** aReturn) { nsCOMPtr item; @@ -146,7 +146,7 @@ nsDOMWindowList::NamedItem(const nsAReadableString& aName, nsIDOMWindow** aRetur } } - mDocShellNode->FindChildWithName(nsAutoString(aName).GetUnicode(), PR_FALSE, PR_FALSE, + mDocShellNode->FindChildWithName(aName.GetUnicode(), PR_FALSE, PR_FALSE, nsnull, getter_AddRefs(item)); nsCOMPtr globalObject(do_GetInterface(item)); diff --git a/dom/src/base/nsDOMWindowList.h b/dom/src/base/nsDOMWindowList.h index a8509e85af0..1ffa49efe64 100644 --- a/dom/src/base/nsDOMWindowList.h +++ b/dom/src/base/nsDOMWindowList.h @@ -44,7 +44,7 @@ public: //nsIDOMWindowCollection interface NS_IMETHOD GetLength(PRUint32* aLength); NS_IMETHOD Item(PRUint32 aIndex, nsIDOMWindow** aReturn); - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMWindow** aReturn); + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMWindow** aReturn); //nsIScriptObjectOwner interface NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject); diff --git a/dom/src/base/nsFrameList.cpp b/dom/src/base/nsFrameList.cpp index 89ae736a609..592db386df6 100644 --- a/dom/src/base/nsFrameList.cpp +++ b/dom/src/base/nsFrameList.cpp @@ -108,7 +108,7 @@ nsFrameList::Item(PRUint32 aIndex, nsIDOMWindow** aReturn) } NS_IMETHODIMP -nsFrameList::NamedItem(const nsAReadableString& aName, nsIDOMWindow** aReturn) +nsFrameList::NamedItem(const nsString& aName, nsIDOMWindow** aReturn) { nsCOMPtr item; diff --git a/dom/src/base/nsFrameList.h b/dom/src/base/nsFrameList.h index 3c2c216717c..8b9bb4481f0 100644 --- a/dom/src/base/nsFrameList.h +++ b/dom/src/base/nsFrameList.h @@ -40,7 +40,7 @@ public: //nsIDOMWindowCollection interface NS_IMETHOD GetLength(PRUint32* aLength); NS_IMETHOD Item(PRUint32 aIndex, nsIDOMWindow** aReturn); - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMWindow** aReturn); + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMWindow** aReturn); //nsIScriptObjectOwner interface NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject); diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/src/base/nsGlobalWindow.cpp index 47bd13409b0..1810db3a679 100644 --- a/dom/src/base/nsGlobalWindow.cpp +++ b/dom/src/base/nsGlobalWindow.cpp @@ -34,7 +34,6 @@ #include "nsJSUtils.h" #include "prmem.h" #include "jsdbgapi.h" // for JS_ClearWatchPointsForObject -#include "nsReadableUtils.h" // Other Classes #include "nsEventListenerManager.h" @@ -871,43 +870,43 @@ NS_IMETHODIMP GlobalWindowImpl::SetOpener(nsIDOMWindow* aOpener) return NS_OK; } -NS_IMETHODIMP GlobalWindowImpl::GetStatus(nsAWritableString& aStatus) +NS_IMETHODIMP GlobalWindowImpl::GetStatus(nsString& aStatus) { aStatus = mStatus; return NS_OK; } -NS_IMETHODIMP GlobalWindowImpl::SetStatus(const nsAReadableString& aStatus) +NS_IMETHODIMP GlobalWindowImpl::SetStatus(const nsString& aStatus) { mStatus = aStatus; nsCOMPtr browserChrome; GetWebBrowserChrome(getter_AddRefs(browserChrome)); if(browserChrome) - browserChrome->SetJSStatus(nsAutoString(aStatus).GetUnicode()); + browserChrome->SetJSStatus(aStatus.GetUnicode()); return NS_OK; } -NS_IMETHODIMP GlobalWindowImpl::GetDefaultStatus(nsAWritableString& aDefaultStatus) +NS_IMETHODIMP GlobalWindowImpl::GetDefaultStatus(nsString& aDefaultStatus) { aDefaultStatus = mDefaultStatus; return NS_OK; } -NS_IMETHODIMP GlobalWindowImpl::SetDefaultStatus(const nsAReadableString& aDefaultStatus) +NS_IMETHODIMP GlobalWindowImpl::SetDefaultStatus(const nsString& aDefaultStatus) { mDefaultStatus = aDefaultStatus; nsCOMPtr browserChrome; GetWebBrowserChrome(getter_AddRefs(browserChrome)); if(browserChrome) - browserChrome->SetJSDefaultStatus(nsAutoString(aDefaultStatus).GetUnicode()); + browserChrome->SetJSDefaultStatus(aDefaultStatus.GetUnicode()); return NS_OK; } -NS_IMETHODIMP GlobalWindowImpl::GetName(nsAWritableString& aName) +NS_IMETHODIMP GlobalWindowImpl::GetName(nsString& aName) { nsXPIDLString name; nsCOMPtr docShellAsItem(do_QueryInterface(mDocShell)); @@ -918,12 +917,12 @@ NS_IMETHODIMP GlobalWindowImpl::GetName(nsAWritableString& aName) return NS_OK; } -NS_IMETHODIMP GlobalWindowImpl::SetName(const nsAReadableString& aName) +NS_IMETHODIMP GlobalWindowImpl::SetName(const nsString& aName) { nsresult result = NS_OK; nsCOMPtr docShellAsItem(do_QueryInterface(mDocShell)); if(docShellAsItem) - result = docShellAsItem->SetName(nsAutoString(aName).GetUnicode()); + result = docShellAsItem->SetName(aName.GetUnicode()); return result; } @@ -1295,9 +1294,9 @@ NS_IMETHODIMP GlobalWindowImpl::GetLength(PRUint32* aLength) return NS_ERROR_FAILURE; } -NS_IMETHODIMP GlobalWindowImpl::Dump(const nsAReadableString& aStr) +NS_IMETHODIMP GlobalWindowImpl::Dump(const nsString& aStr) { - char *cstr = ToNewCString(aStr); + char *cstr = aStr.ToNewUTF8String(); #ifdef XP_MAC // have to convert \r to \n so that printing to the console works @@ -1736,37 +1735,37 @@ NS_IMETHODIMP GlobalWindowImpl::DisableExternalCapture() //Note: This call will lock the cursor, it will not change as it moves. //To unlock, the cursor must be set back to CURSOR_AUTO. -NS_IMETHODIMP GlobalWindowImpl::SetCursor(const nsAReadableString& aCursor) +NS_IMETHODIMP GlobalWindowImpl::SetCursor(const nsString& aCursor) { nsresult ret = NS_OK; PRInt32 cursor; - if (aCursor.Equals(NS_LITERAL_STRING("auto"))) cursor = NS_STYLE_CURSOR_AUTO; - else if (aCursor.Equals(NS_LITERAL_STRING("default"))) cursor = NS_STYLE_CURSOR_DEFAULT; - else if (aCursor.Equals(NS_LITERAL_STRING("pointer"))) cursor = NS_STYLE_CURSOR_POINTER; - else if (aCursor.Equals(NS_LITERAL_STRING("crosshair"))) cursor = NS_STYLE_CURSOR_CROSSHAIR; - else if (aCursor.Equals(NS_LITERAL_STRING("move"))) cursor = NS_STYLE_CURSOR_MOVE; - else if (aCursor.Equals(NS_LITERAL_STRING("text"))) cursor = NS_STYLE_CURSOR_TEXT; - else if (aCursor.Equals(NS_LITERAL_STRING("wait"))) cursor = NS_STYLE_CURSOR_WAIT; - else if (aCursor.Equals(NS_LITERAL_STRING("help"))) cursor = NS_STYLE_CURSOR_HELP; - else if (aCursor.Equals(NS_LITERAL_STRING("n-resize"))) cursor = NS_STYLE_CURSOR_N_RESIZE; - else if (aCursor.Equals(NS_LITERAL_STRING("s-resize"))) cursor = NS_STYLE_CURSOR_S_RESIZE; - else if (aCursor.Equals(NS_LITERAL_STRING("w-resize"))) cursor = NS_STYLE_CURSOR_W_RESIZE; - else if (aCursor.Equals(NS_LITERAL_STRING("e-resize"))) cursor = NS_STYLE_CURSOR_E_RESIZE; - else if (aCursor.Equals(NS_LITERAL_STRING("ne-resize"))) cursor = NS_STYLE_CURSOR_NE_RESIZE; - else if (aCursor.Equals(NS_LITERAL_STRING("nw-resize"))) cursor = NS_STYLE_CURSOR_NW_RESIZE; - else if (aCursor.Equals(NS_LITERAL_STRING("se-resize"))) cursor = NS_STYLE_CURSOR_SE_RESIZE; - else if (aCursor.Equals(NS_LITERAL_STRING("sw-resize"))) cursor = NS_STYLE_CURSOR_SW_RESIZE; - else if (aCursor.Equals(NS_LITERAL_STRING("copy"))) cursor = NS_STYLE_CURSOR_COPY; // CSS3 - else if (aCursor.Equals(NS_LITERAL_STRING("alias"))) cursor = NS_STYLE_CURSOR_ALIAS; - else if (aCursor.Equals(NS_LITERAL_STRING("context-menu"))) cursor = NS_STYLE_CURSOR_CONTEXT_MENU; - else if (aCursor.Equals(NS_LITERAL_STRING("cell"))) cursor = NS_STYLE_CURSOR_CELL; - else if (aCursor.Equals(NS_LITERAL_STRING("grab"))) cursor = NS_STYLE_CURSOR_GRAB; - else if (aCursor.Equals(NS_LITERAL_STRING("grabbing"))) cursor = NS_STYLE_CURSOR_GRABBING; - else if (aCursor.Equals(NS_LITERAL_STRING("spinning"))) cursor = NS_STYLE_CURSOR_SPINNING; - else if (aCursor.Equals(NS_LITERAL_STRING("count-up"))) cursor = NS_STYLE_CURSOR_COUNT_UP; - else if (aCursor.Equals(NS_LITERAL_STRING("count-down"))) cursor = NS_STYLE_CURSOR_COUNT_DOWN; - else if (aCursor.Equals(NS_LITERAL_STRING("count-up-down"))) cursor = NS_STYLE_CURSOR_COUNT_UP_DOWN; + if (aCursor.EqualsWithConversion("auto")) cursor = NS_STYLE_CURSOR_AUTO; + else if (aCursor.EqualsWithConversion("default")) cursor = NS_STYLE_CURSOR_DEFAULT; + else if (aCursor.EqualsWithConversion("pointer")) cursor = NS_STYLE_CURSOR_POINTER; + else if (aCursor.EqualsWithConversion("crosshair")) cursor = NS_STYLE_CURSOR_CROSSHAIR; + else if (aCursor.EqualsWithConversion("move")) cursor = NS_STYLE_CURSOR_MOVE; + else if (aCursor.EqualsWithConversion("text")) cursor = NS_STYLE_CURSOR_TEXT; + else if (aCursor.EqualsWithConversion("wait")) cursor = NS_STYLE_CURSOR_WAIT; + else if (aCursor.EqualsWithConversion("help")) cursor = NS_STYLE_CURSOR_HELP; + else if (aCursor.EqualsWithConversion("n-resize")) cursor = NS_STYLE_CURSOR_N_RESIZE; + else if (aCursor.EqualsWithConversion("s-resize")) cursor = NS_STYLE_CURSOR_S_RESIZE; + else if (aCursor.EqualsWithConversion("w-resize")) cursor = NS_STYLE_CURSOR_W_RESIZE; + else if (aCursor.EqualsWithConversion("e-resize")) cursor = NS_STYLE_CURSOR_E_RESIZE; + else if (aCursor.EqualsWithConversion("ne-resize")) cursor = NS_STYLE_CURSOR_NE_RESIZE; + else if (aCursor.EqualsWithConversion("nw-resize")) cursor = NS_STYLE_CURSOR_NW_RESIZE; + else if (aCursor.EqualsWithConversion("se-resize")) cursor = NS_STYLE_CURSOR_SE_RESIZE; + else if (aCursor.EqualsWithConversion("sw-resize")) cursor = NS_STYLE_CURSOR_SW_RESIZE; + else if (aCursor.EqualsWithConversion("copy")) cursor = NS_STYLE_CURSOR_COPY; // CSS3 + else if (aCursor.EqualsWithConversion("alias")) cursor = NS_STYLE_CURSOR_ALIAS; + else if (aCursor.EqualsWithConversion("context-menu")) cursor = NS_STYLE_CURSOR_CONTEXT_MENU; + else if (aCursor.EqualsWithConversion("cell")) cursor = NS_STYLE_CURSOR_CELL; + else if (aCursor.EqualsWithConversion("grab")) cursor = NS_STYLE_CURSOR_GRAB; + else if (aCursor.EqualsWithConversion("grabbing")) cursor = NS_STYLE_CURSOR_GRABBING; + else if (aCursor.EqualsWithConversion("spinning")) cursor = NS_STYLE_CURSOR_SPINNING; + else if (aCursor.EqualsWithConversion("count-up")) cursor = NS_STYLE_CURSOR_COUNT_UP; + else if (aCursor.EqualsWithConversion("count-down")) cursor = NS_STYLE_CURSOR_COUNT_DOWN; + else if (aCursor.EqualsWithConversion("count-up-down")) cursor = NS_STYLE_CURSOR_COUNT_UP_DOWN; else return NS_OK; nsCOMPtr presContext; @@ -1853,7 +1852,7 @@ NS_IMETHODIMP GlobalWindowImpl::Close(JSContext* cx, jsval* argv, PRUint32 argc) } NS_IMETHODIMP -GlobalWindowImpl::UpdateCommands(const nsAReadableString& anAction) +GlobalWindowImpl::UpdateCommands(const nsString& anAction) { if (mChromeEventHandler) { // Just jump out to the chrome event handler. @@ -1901,7 +1900,7 @@ GlobalWindowImpl::UpdateCommands(const nsAReadableString& anAction) return NS_OK; } -NS_IMETHODIMP GlobalWindowImpl::Escape(const nsAReadableString& aStr, nsAWritableString& aReturn) +NS_IMETHODIMP GlobalWindowImpl::Escape(const nsString& aStr, nsString& aReturn) { nsresult result = NS_OK; nsCOMPtr encoder; @@ -1933,7 +1932,7 @@ NS_IMETHODIMP GlobalWindowImpl::Escape(const nsAReadableString& aStr, nsAWritabl PRInt32 maxByteLen, srcLen; srcLen = aStr.Length(); - const PRUnichar* src = nsAutoString(aStr).GetUnicode(); + const PRUnichar* src = aStr.GetUnicode(); // Get the expected length of result string result = encoder->GetMaxLength(src, srcLen, &maxByteLen); @@ -1961,8 +1960,7 @@ NS_IMETHODIMP GlobalWindowImpl::Escape(const nsAReadableString& aStr, nsAWritabl // Escape the string char* outBuf = nsEscape(dest, nsEscapeMask(url_XAlphas | url_XPAlphas | url_Path)); - // XXX It's weird that we now convert back to Unicode - aReturn.Assign(NS_ConvertASCIItoUCS2(outBuf)); + aReturn.AssignWithConversion(outBuf); nsMemory::Free(outBuf); nsMemory::Free(dest); @@ -1970,7 +1968,7 @@ NS_IMETHODIMP GlobalWindowImpl::Escape(const nsAReadableString& aStr, nsAWritabl return result; } -NS_IMETHODIMP GlobalWindowImpl::Unescape(const nsAReadableString& aStr, nsAWritableString& aReturn) +NS_IMETHODIMP GlobalWindowImpl::Unescape(const nsString& aStr, nsString& aReturn) { nsresult result = NS_OK; nsCOMPtr decoder; @@ -2001,7 +1999,7 @@ NS_IMETHODIMP GlobalWindowImpl::Unescape(const nsAReadableString& aStr, nsAWrita return result; // Need to copy to do the two-byte to one-byte deflation - char* inBuf = ToNewCString(aStr); + char* inBuf = aStr.ToNewCString(); if(!inBuf) return NS_ERROR_OUT_OF_MEMORY; @@ -2302,7 +2300,7 @@ void GlobalWindowImpl::Finalize(JSContext* aContext, JSObject* aObj) // GlobalWindowImpl::nsIDOMEventTarget //***************************************************************************** -NS_IMETHODIMP GlobalWindowImpl::AddEventListener(const nsAReadableString& aType, +NS_IMETHODIMP GlobalWindowImpl::AddEventListener(const nsString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture) { nsCOMPtr manager; @@ -2317,7 +2315,7 @@ NS_IMETHODIMP GlobalWindowImpl::AddEventListener(const nsAReadableString& aType, return NS_ERROR_FAILURE; } -NS_IMETHODIMP GlobalWindowImpl::RemoveEventListener(const nsAReadableString& aType, +NS_IMETHODIMP GlobalWindowImpl::RemoveEventListener(const nsString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture) { if(mListenerManager) @@ -2717,7 +2715,7 @@ NS_IMETHODIMP GlobalWindowImpl::GetPositionAndSize(PRInt32 *x, PRInt32 *y, PRInt //***************************************************************************** NS_IMETHODIMP GlobalWindowImpl::GetComputedStyle(nsIDOMElement* aElt, - const nsAReadableString& aPseudoElt, + const nsString& aPseudoElt, nsIDOMCSSStyleDeclaration** aReturn) { NS_ENSURE_ARG_POINTER(aReturn); @@ -3345,7 +3343,9 @@ NS_IMETHODIMP GlobalWindowImpl::CheckWindowName(JSContext* cx, nsString& aName) nsAutoString warn; warn.AssignWithConversion("Illegal character in window name "); warn.Append(aName); - NS_WARNING(NS_ConvertUCS2toUTF8(warn)); + char* cp = warn.ToNewCString(); + NS_WARNING(cp); + nsCRT::free(cp); return NS_ERROR_FAILURE; } } @@ -4241,7 +4241,7 @@ NS_IMETHODIMP NavigatorImpl::GetScriptObject(nsIScriptContext* aContext, // NavigatorImpl::nsIDOMNavigator //***************************************************************************** -NS_IMETHODIMP NavigatorImpl::GetUserAgent(nsAWritableString& aUserAgent) +NS_IMETHODIMP NavigatorImpl::GetUserAgent(nsString& aUserAgent) { nsresult res; nsCOMPtr service(do_GetService(kHTTPHandlerCID, &res)); @@ -4256,7 +4256,7 @@ NS_IMETHODIMP NavigatorImpl::GetUserAgent(nsAWritableString& aUserAgent) return res; } -NS_IMETHODIMP NavigatorImpl::GetAppCodeName(nsAWritableString& aAppCodeName) +NS_IMETHODIMP NavigatorImpl::GetAppCodeName(nsString& aAppCodeName) { nsresult res; nsCOMPtr service(do_GetService(kHTTPHandlerCID, &res)); @@ -4271,44 +4271,45 @@ NS_IMETHODIMP NavigatorImpl::GetAppCodeName(nsAWritableString& aAppCodeName) return res; } -NS_IMETHODIMP NavigatorImpl::GetAppVersion(nsAWritableString& aAppVersion) +NS_IMETHODIMP NavigatorImpl::GetAppVersion(nsString& aAppVersion) { nsresult res; nsCOMPtr service(do_GetService(kHTTPHandlerCID, &res)); if(NS_SUCCEEDED(res) && (nsnull != service)) - { + { PRUnichar *str = nsnull; res = service->GetAppVersion(&str); aAppVersion = str; Recycle(str); - aAppVersion.Append(NS_LITERAL_STRING(" (")); - res = service->GetPlatform(&str); - if(NS_FAILED(res)) return res; - - aAppVersion += str; - Recycle(str); - - aAppVersion.Append(NS_LITERAL_STRING("; ")); - res = service->GetLanguage(&str); - if (NS_FAILED(res)) return res; + aAppVersion.AppendWithConversion(" ("); + res = service->GetPlatform(&str); + if(NS_FAILED(res)) return res; - aAppVersion += str; - Recycle(str); + aAppVersion += str; + Recycle(str); - aAppVersion.Append(PRUnichar(')')); - } + aAppVersion.AppendWithConversion("; "); + + res = service->GetLanguage(&str); + if (NS_FAILED(res)) return res; + + aAppVersion += str; + Recycle(str); + + aAppVersion.AppendWithConversion(')'); + } return res; } -NS_IMETHODIMP NavigatorImpl::GetAppName(nsAWritableString& aAppName) +NS_IMETHODIMP NavigatorImpl::GetAppName(nsString& aAppName) { - aAppName.Assign(NS_LITERAL_STRING("Netscape")); + aAppName.AssignWithConversion("Netscape"); return NS_OK; } -NS_IMETHODIMP NavigatorImpl::GetLanguage(nsAWritableString& aLanguage) +NS_IMETHODIMP NavigatorImpl::GetLanguage(nsString& aLanguage) { nsresult res; nsCOMPtr service(do_GetService(kHTTPHandlerCID, &res)); @@ -4323,7 +4324,7 @@ NS_IMETHODIMP NavigatorImpl::GetLanguage(nsAWritableString& aLanguage) return res; } -NS_IMETHODIMP NavigatorImpl::GetPlatform(nsAWritableString& aPlatform) +NS_IMETHODIMP NavigatorImpl::GetPlatform(nsString& aPlatform) { nsresult res; nsCOMPtr service(do_GetService(kHTTPHandlerCID, &res)); @@ -4338,7 +4339,7 @@ NS_IMETHODIMP NavigatorImpl::GetPlatform(nsAWritableString& aPlatform) return res; } -NS_IMETHODIMP NavigatorImpl::GetOscpu(nsAWritableString& aOSCPU) +NS_IMETHODIMP NavigatorImpl::GetOscpu(nsString& aOSCPU) { nsresult res; nsCOMPtr service(do_GetService(kHTTPHandlerCID, &res)); @@ -4353,7 +4354,7 @@ NS_IMETHODIMP NavigatorImpl::GetOscpu(nsAWritableString& aOSCPU) return res; } -NS_IMETHODIMP NavigatorImpl::GetVendor(nsAWritableString& aVendor) +NS_IMETHODIMP NavigatorImpl::GetVendor(nsString& aVendor) { nsresult res; nsCOMPtr service(do_GetService(kHTTPHandlerCID, &res)); @@ -4369,7 +4370,7 @@ NS_IMETHODIMP NavigatorImpl::GetVendor(nsAWritableString& aVendor) } -NS_IMETHODIMP NavigatorImpl::GetVendorSub(nsAWritableString& aVendorSub) +NS_IMETHODIMP NavigatorImpl::GetVendorSub(nsString& aVendorSub) { nsresult res; nsCOMPtr service(do_GetService(kHTTPHandlerCID, &res)); @@ -4384,7 +4385,7 @@ NS_IMETHODIMP NavigatorImpl::GetVendorSub(nsAWritableString& aVendorSub) return res; } -NS_IMETHODIMP NavigatorImpl::GetProduct(nsAWritableString& aProduct) +NS_IMETHODIMP NavigatorImpl::GetProduct(nsString& aProduct) { nsresult res; nsCOMPtr service(do_GetService(kHTTPHandlerCID, &res)); @@ -4399,7 +4400,7 @@ NS_IMETHODIMP NavigatorImpl::GetProduct(nsAWritableString& aProduct) return res; } -NS_IMETHODIMP NavigatorImpl::GetProductSub(nsAWritableString& aProductSub) +NS_IMETHODIMP NavigatorImpl::GetProductSub(nsString& aProductSub) { nsresult res; nsCOMPtr service(do_GetService(kHTTPHandlerCID, &res)); @@ -4414,7 +4415,7 @@ NS_IMETHODIMP NavigatorImpl::GetProductSub(nsAWritableString& aProductSub) return res; } -NS_IMETHODIMP NavigatorImpl::GetSecurityPolicy(nsAWritableString& aSecurityPolicy) +NS_IMETHODIMP NavigatorImpl::GetSecurityPolicy(nsString& aSecurityPolicy) { return NS_OK; } diff --git a/dom/src/base/nsGlobalWindow.h b/dom/src/base/nsGlobalWindow.h index 6e88348bf0c..2978e9c5ec5 100644 --- a/dom/src/base/nsGlobalWindow.h +++ b/dom/src/base/nsGlobalWindow.h @@ -126,9 +126,9 @@ public: virtual void Finalize(JSContext *aContext, JSObject *aObj); // nsIDOMEventTarget - NS_IMETHOD AddEventListener(const nsAReadableString& aType, + NS_IMETHOD AddEventListener(const nsString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture); - NS_IMETHOD RemoveEventListener(const nsAReadableString& aType, + NS_IMETHOD RemoveEventListener(const nsString& aType, nsIDOMEventListener* aListener, PRBool aUseCapture); NS_IMETHOD DispatchEvent(nsIDOMEvent* aEvent); @@ -321,25 +321,25 @@ public: NS_IMETHOD_(void) SetDocShell(nsIDocShell *aDocShell); // nsIDOMLocation - NS_IMETHOD GetHash(nsAWritableString& aHash); - NS_IMETHOD SetHash(const nsAReadableString& aHash); - NS_IMETHOD GetHost(nsAWritableString& aHost); - NS_IMETHOD SetHost(const nsAReadableString& aHost); - NS_IMETHOD GetHostname(nsAWritableString& aHostname); - NS_IMETHOD SetHostname(const nsAReadableString& aHostname); - NS_IMETHOD GetHref(nsAWritableString& aHref); - NS_IMETHOD SetHref(const nsAReadableString& aHref); - NS_IMETHOD GetPathname(nsAWritableString& aPathname); - NS_IMETHOD SetPathname(const nsAReadableString& aPathname); - NS_IMETHOD GetPort(nsAWritableString& aPort); - NS_IMETHOD SetPort(const nsAReadableString& aPort); - NS_IMETHOD GetProtocol(nsAWritableString& aProtocol); - NS_IMETHOD SetProtocol(const nsAReadableString& aProtocol); - NS_IMETHOD GetSearch(nsAWritableString& aSearch); - NS_IMETHOD SetSearch(const nsAReadableString& aSearch); + NS_IMETHOD GetHash(nsString& aHash); + NS_IMETHOD SetHash(const nsString& aHash); + NS_IMETHOD GetHost(nsString& aHost); + NS_IMETHOD SetHost(const nsString& aHost); + NS_IMETHOD GetHostname(nsString& aHostname); + NS_IMETHOD SetHostname(const nsString& aHostname); + NS_IMETHOD GetHref(nsString& aHref); + NS_IMETHOD SetHref(const nsString& aHref); + NS_IMETHOD GetPathname(nsString& aPathname); + NS_IMETHOD SetPathname(const nsString& aPathname); + NS_IMETHOD GetPort(nsString& aPort); + NS_IMETHOD SetPort(const nsString& aPort); + NS_IMETHOD GetProtocol(nsString& aProtocol); + NS_IMETHOD SetProtocol(const nsString& aProtocol); + NS_IMETHOD GetSearch(nsString& aSearch); + NS_IMETHOD SetSearch(const nsString& aSearch); NS_IMETHOD Reload(PRBool aForceget); - NS_IMETHOD Replace(const nsAReadableString& aUrl); - NS_IMETHOD ToString(nsAWritableString& aReturn); + NS_IMETHOD Replace(const nsString& aUrl); + NS_IMETHOD ToString(nsString& aReturn); // nsIDOMNSLocation NS_IMETHOD Reload(JSContext *cx, jsval *argv, PRUint32 argc); @@ -357,7 +357,7 @@ public: protected: nsresult SetURL(nsIURI* aURL); - nsresult SetHrefWithBase(const nsAReadableString& aHref, + nsresult SetHrefWithBase(const nsString& aHref, nsIURI* aBase, PRBool aReplace); nsresult GetSourceURL(JSContext* cx, diff --git a/dom/src/base/nsHistory.cpp b/dom/src/base/nsHistory.cpp index 2ab9d081325..bea8f7f2e4d 100644 --- a/dom/src/base/nsHistory.cpp +++ b/dom/src/base/nsHistory.cpp @@ -96,7 +96,7 @@ HistoryImpl::GetLength(PRInt32* aLength) } NS_IMETHODIMP -HistoryImpl::GetCurrent(nsAWritableString& aCurrent) +HistoryImpl::GetCurrent(nsString& aCurrent) { PRInt32 curIndex; const PRUnichar* curURL = nsnull; @@ -111,7 +111,7 @@ HistoryImpl::GetCurrent(nsAWritableString& aCurrent) } NS_IMETHODIMP -HistoryImpl::GetPrevious(nsAWritableString& aPrevious) +HistoryImpl::GetPrevious(nsString& aPrevious) { PRInt32 curIndex; const PRUnichar* prevURL = nsnull; @@ -126,7 +126,7 @@ HistoryImpl::GetPrevious(nsAWritableString& aPrevious) } NS_IMETHODIMP -HistoryImpl::GetNext(nsAWritableString& aNext) +HistoryImpl::GetNext(nsString& aNext) { PRInt32 curIndex; const PRUnichar* nextURL = nsnull; diff --git a/dom/src/base/nsHistory.h b/dom/src/base/nsHistory.h index ae92033ede3..9fccf3aba0c 100644 --- a/dom/src/base/nsHistory.h +++ b/dom/src/base/nsHistory.h @@ -44,9 +44,9 @@ public: NS_IMETHOD_(void) SetDocShell(nsIDocShell *aDocShell); NS_IMETHOD GetLength(PRInt32* aLength); - NS_IMETHOD GetCurrent(nsAWritableString& aCurrent); - NS_IMETHOD GetPrevious(nsAWritableString& aPrevious); - NS_IMETHOD GetNext(nsAWritableString& aNext); + NS_IMETHOD GetCurrent(nsString& aCurrent); + NS_IMETHOD GetPrevious(nsString& aPrevious); + NS_IMETHOD GetNext(nsString& aNext); NS_IMETHOD Back(); NS_IMETHOD Forward(); NS_IMETHOD Go(JSContext* cx, jsval* argv, PRUint32 argc); diff --git a/dom/src/base/nsJSUtils.cpp b/dom/src/base/nsJSUtils.cpp index a4aa27822e3..20136e2e2cb 100644 --- a/dom/src/base/nsJSUtils.cpp +++ b/dom/src/base/nsJSUtils.cpp @@ -337,7 +337,7 @@ nsJSUtils::nsConvertJSValToXPCObject(nsISupports** aSupports, NS_EXPORT void -nsJSUtils::nsConvertJSValToString(nsAWritableString& aString, +nsJSUtils::nsConvertJSValToString(nsString& aString, JSContext* aContext, jsval aValue) { @@ -432,7 +432,6 @@ nsJSUtils::nsGenericFinalize(JSContext* aContext, NS_RELEASE(owner); } - // The addref was part of JSObject construction NS_RELEASE(nativeThis); } } diff --git a/dom/src/base/nsJSUtils.h b/dom/src/base/nsJSUtils.h index 457cb6204e0..c43ddb46070 100644 --- a/dom/src/base/nsJSUtils.h +++ b/dom/src/base/nsJSUtils.h @@ -74,8 +74,8 @@ public: jsval* aReturn); static NS_EXPORT void nsConvertStringToJSVal(const nsString& aProp, - JSContext* aContext, - jsval* aReturn); + JSContext* aContext, + jsval* aReturn); static NS_EXPORT PRBool nsConvertJSValToObject(nsISupports** aSupports, REFNSIID aIID, @@ -88,9 +88,9 @@ public: JSContext* aContext, jsval aValue); - static NS_EXPORT void nsConvertJSValToString(nsAWritableString& aString, - JSContext* aContext, - jsval aValue); + static NS_EXPORT void nsConvertJSValToString(nsString& aString, + JSContext* aContext, + jsval aValue); static NS_EXPORT PRBool nsConvertJSValToBool(PRBool* aProp, JSContext* aContext, diff --git a/dom/src/base/nsLocation.cpp b/dom/src/base/nsLocation.cpp index ad60d5af3d0..e298329f357 100644 --- a/dom/src/base/nsLocation.cpp +++ b/dom/src/base/nsLocation.cpp @@ -33,7 +33,6 @@ #include "nsIServiceManager.h" #include "nsNetUtil.h" #include "plstr.h" -#include "prprf.h" #include "prmem.h" #include "nsCOMPtr.h" #include "nsJSUtils.h" @@ -173,7 +172,7 @@ LocationImpl::SetURL(nsIURI* aURL) } NS_IMETHODIMP -LocationImpl::GetHash(nsAWritableString& aHash) +LocationImpl::GetHash(nsString& aHash) { nsAutoString href; nsIURI *uri; @@ -192,8 +191,8 @@ LocationImpl::GetHash(nsAWritableString& aHash) NS_RELEASE(url); } if (result == NS_OK && (nsnull != ref) && ('\0' != *ref)) { - aHash.Assign(NS_LITERAL_STRING("#")); - aHash.Append(NS_ConvertASCIItoUCS2(ref)); + aHash.AssignWithConversion("#"); + aHash.AppendWithConversion(ref); nsCRT::free(ref); } else { @@ -207,7 +206,7 @@ LocationImpl::GetHash(nsAWritableString& aHash) } NS_IMETHODIMP -LocationImpl::SetHash(const nsAReadableString& aHash) +LocationImpl::SetHash(const nsString& aHash) { nsAutoString href; nsIURI *uri; @@ -221,8 +220,10 @@ LocationImpl::SetHash(const nsAReadableString& aHash) result = uri->QueryInterface(NS_GET_IID(nsIURI), (void**)&url); NS_RELEASE(uri); if (NS_OK == result) { - url->SetRef(NS_ConvertUCS2toUTF8(aHash)); + char *buf = aHash.ToNewCString(); + url->SetRef(buf); SetURL(url); + nsCRT::free(buf); NS_RELEASE(url); } } @@ -231,7 +232,7 @@ LocationImpl::SetHash(const nsAReadableString& aHash) } NS_IMETHODIMP -LocationImpl::GetHost(nsAWritableString& aHost) +LocationImpl::GetHost(nsString& aHost) { nsAutoString href; nsIURI *url; @@ -244,17 +245,13 @@ LocationImpl::GetHost(nsAWritableString& aHost) char* host; result = url->GetHost(&host); if (result == NS_OK) { - aHost.Assign(NS_ConvertASCIItoUCS2(host)); + aHost.AssignWithConversion(host); nsCRT::free(host); PRInt32 port; (void)url->GetPort(&port); if (-1 != port) { - aHost.Append(NS_LITERAL_STRING(":")); - - nsAutoString host; - host.AppendInt(port); - - aHost.Append(host); + aHost.AppendWithConversion(":"); + aHost.AppendInt(port, 10); } } NS_RELEASE(url); @@ -265,7 +262,7 @@ LocationImpl::GetHost(nsAWritableString& aHost) } NS_IMETHODIMP -LocationImpl::SetHost(const nsAReadableString& aHost) +LocationImpl::SetHost(const nsString& aHost) { nsAutoString href; nsIURI *url; @@ -275,8 +272,10 @@ LocationImpl::SetHost(const nsAReadableString& aHost) if (NS_OK == result) { result = NS_NewURI(&url, href); if (NS_OK == result) { - url->SetHost(NS_ConvertUCS2toUTF8(aHost)); + char *buf = aHost.ToNewCString(); + url->SetHost(buf); SetURL(url); + nsCRT::free(buf); NS_RELEASE(url); } } @@ -285,7 +284,7 @@ LocationImpl::SetHost(const nsAReadableString& aHost) } NS_IMETHODIMP -LocationImpl::GetHostname(nsAWritableString& aHostname) +LocationImpl::GetHostname(nsString& aHostname) { nsAutoString href; nsIURI *url; @@ -298,7 +297,7 @@ LocationImpl::GetHostname(nsAWritableString& aHostname) char* host; result = url->GetHost(&host); if (result == NS_OK) { - aHostname.Assign(NS_ConvertASCIItoUCS2(host)); + aHostname.AssignWithConversion(host); nsCRT::free(host); } NS_RELEASE(url); @@ -309,7 +308,7 @@ LocationImpl::GetHostname(nsAWritableString& aHostname) } NS_IMETHODIMP -LocationImpl::SetHostname(const nsAReadableString& aHostname) +LocationImpl::SetHostname(const nsString& aHostname) { nsAutoString href; nsIURI *url; @@ -319,8 +318,10 @@ LocationImpl::SetHostname(const nsAReadableString& aHostname) if (NS_OK == result) { result = NS_NewURI(&url, href); if (NS_OK == result) { - url->SetHost(NS_ConvertUCS2toUTF8(aHostname)); + char *buf = aHostname.ToNewCString(); + url->SetHost(buf); SetURL(url); + nsCRT::free(buf); NS_RELEASE(url); } } @@ -329,7 +330,7 @@ LocationImpl::SetHostname(const nsAReadableString& aHostname) } NS_IMETHODIMP -LocationImpl::GetHref(nsAWritableString& aHref) +LocationImpl::GetHref(nsString& aHref) { nsresult result = NS_OK; @@ -340,7 +341,7 @@ LocationImpl::GetHref(nsAWritableString& aHref) nsXPIDLCString uriString; result = uri->GetSpec(getter_Copies(uriString)); if (NS_SUCCEEDED(result)) - aHref.Assign(NS_ConvertASCIItoUCS2(uriString)); + aHref.AssignWithConversion(uriString); } } @@ -348,7 +349,7 @@ LocationImpl::GetHref(nsAWritableString& aHref) } NS_IMETHODIMP -LocationImpl::SetHref(const nsAReadableString& aHref) +LocationImpl::SetHref(const nsString& aHref) { nsAutoString oldHref; nsIURI *oldUrl; @@ -367,7 +368,7 @@ LocationImpl::SetHref(const nsAReadableString& aHref) } nsresult -LocationImpl::SetHrefWithBase(const nsAReadableString& aHref, +LocationImpl::SetHrefWithBase(const nsString& aHref, nsIURI* aBase, PRBool aReplace) { @@ -392,7 +393,7 @@ LocationImpl::SetHrefWithBase(const nsAReadableString& aHref, } NS_IMETHODIMP -LocationImpl::GetPathname(nsAWritableString& aPathname) +LocationImpl::GetPathname(nsString& aPathname) { nsAutoString href; nsIURI *uri; @@ -407,7 +408,7 @@ LocationImpl::GetPathname(nsAWritableString& aPathname) char* file; result = url->GetFilePath(&file); if (result == NS_OK) { - aPathname.Assign(NS_ConvertASCIItoUCS2(file)); + aPathname.AssignWithConversion(file); nsCRT::free(file); } } @@ -419,7 +420,7 @@ LocationImpl::GetPathname(nsAWritableString& aPathname) } NS_IMETHODIMP -LocationImpl::SetPathname(const nsAReadableString& aPathname) +LocationImpl::SetPathname(const nsString& aPathname) { nsAutoString href; nsIURI *url; @@ -429,8 +430,10 @@ LocationImpl::SetPathname(const nsAReadableString& aPathname) if (NS_OK == result) { result = NS_NewURI(&url, href); if (NS_OK == result) { - url->SetPath(NS_ConvertUCS2toUTF8(aPathname)); + char *buf = aPathname.ToNewCString(); + url->SetPath(buf); SetURL(url); + nsCRT::free(buf); NS_RELEASE(url); } } @@ -439,7 +442,7 @@ LocationImpl::SetPathname(const nsAReadableString& aPathname) } NS_IMETHODIMP -LocationImpl::GetPort(nsAWritableString& aPort) +LocationImpl::GetPort(nsString& aPort) { nsAutoString href; nsIURI *url; @@ -453,9 +456,7 @@ LocationImpl::GetPort(nsAWritableString& aPort) PRInt32 port; (void)url->GetPort(&port); if (-1 != port) { - nsAutoString portStr; - portStr.AppendInt(port); - aPort.Append(portStr); + aPort.AppendInt(port, 10); } NS_RELEASE(url); } @@ -465,7 +466,7 @@ LocationImpl::GetPort(nsAWritableString& aPort) } NS_IMETHODIMP -LocationImpl::SetPort(const nsAReadableString& aPort) +LocationImpl::SetPort(const nsString& aPort) { nsAutoString href; nsIURI *url; @@ -475,7 +476,7 @@ LocationImpl::SetPort(const nsAReadableString& aPort) if (NS_OK == result) { result = NS_NewURI(&url, href); if (NS_OK == result) { - const char *buf = NS_ConvertUCS2toUTF8(aPort).GetBuffer(); + char *buf = aPort.ToNewCString(); PRInt32 port = -1; if (buf) { @@ -488,6 +489,7 @@ LocationImpl::SetPort(const nsAReadableString& aPort) } url->SetPort(port); SetURL(url); + nsCRT::free(buf); NS_RELEASE(url); } } @@ -496,7 +498,7 @@ LocationImpl::SetPort(const nsAReadableString& aPort) } NS_IMETHODIMP -LocationImpl::GetProtocol(nsAWritableString& aProtocol) +LocationImpl::GetProtocol(nsString& aProtocol) { nsAutoString href; nsIURI *url; @@ -509,8 +511,8 @@ LocationImpl::GetProtocol(nsAWritableString& aProtocol) char* protocol; result = url->GetScheme(&protocol); if (result == NS_OK) { - aProtocol.Assign(NS_ConvertASCIItoUCS2(protocol)); - aProtocol.Append(NS_LITERAL_STRING(":")); + aProtocol.AssignWithConversion(protocol); + aProtocol.AppendWithConversion(":"); nsCRT::free(protocol); } NS_RELEASE(url); @@ -521,7 +523,7 @@ LocationImpl::GetProtocol(nsAWritableString& aProtocol) } NS_IMETHODIMP -LocationImpl::SetProtocol(const nsAReadableString& aProtocol) +LocationImpl::SetProtocol(const nsString& aProtocol) { nsAutoString href; nsIURI *url; @@ -531,8 +533,10 @@ LocationImpl::SetProtocol(const nsAReadableString& aProtocol) if (NS_OK == result) { result = NS_NewURI(&url, href); if (NS_OK == result) { - url->SetScheme(NS_ConvertUCS2toUTF8(aProtocol)); + char *buf = aProtocol.ToNewCString(); + url->SetScheme(buf); SetURL(url); + nsCRT::free(buf); NS_RELEASE(url); } } @@ -541,7 +545,7 @@ LocationImpl::SetProtocol(const nsAReadableString& aProtocol) } NS_IMETHODIMP -LocationImpl::GetSearch(nsAWritableString& aSearch) +LocationImpl::GetSearch(nsString& aSearch) { nsAutoString href; nsIURI *uri; @@ -559,8 +563,8 @@ LocationImpl::GetSearch(nsAWritableString& aSearch) NS_RELEASE(url); } if (result == NS_OK && (nsnull != search) && ('\0' != *search)) { - aSearch.Assign(NS_LITERAL_STRING("?")); - aSearch.Append(NS_ConvertASCIItoUCS2(search)); + aSearch.AssignWithConversion("?"); + aSearch.AppendWithConversion(search); nsCRT::free(search); } else { @@ -574,7 +578,7 @@ LocationImpl::GetSearch(nsAWritableString& aSearch) } NS_IMETHODIMP -LocationImpl::SetSearch(const nsAReadableString& aSearch) +LocationImpl::SetSearch(const nsString& aSearch) { nsAutoString href; nsIURI *uri; @@ -584,13 +588,15 @@ LocationImpl::SetSearch(const nsAReadableString& aSearch) if (NS_OK == result) { result = NS_NewURI(&uri, href); if (NS_OK == result) { + char *buf = aSearch.ToNewCString(); nsIURL* url; result = uri->QueryInterface(NS_GET_IID(nsIURL), (void**)&url); if (NS_SUCCEEDED(result)) { - result = url->SetQuery(NS_ConvertUCS2toUTF8(aSearch)); + result = url->SetQuery(buf); NS_RELEASE(url); } SetURL(uri); + nsCRT::free(buf); NS_RELEASE(uri); } } @@ -611,7 +617,7 @@ LocationImpl::Reload(PRBool aForceget) } NS_IMETHODIMP -LocationImpl::Replace(const nsAReadableString& aUrl) +LocationImpl::Replace(const nsString& aUrl) { nsAutoString oldHref; nsIURI *oldUrl; @@ -668,7 +674,7 @@ LocationImpl::Replace(JSContext *cx, jsval *argv, PRUint32 argc) } NS_IMETHODIMP -LocationImpl::ToString(nsAWritableString& aReturn) +LocationImpl::ToString(nsString& aReturn) { return GetHref(aReturn); } diff --git a/dom/src/base/nsMimeTypeArray.cpp b/dom/src/base/nsMimeTypeArray.cpp index 8e3c474e80f..8c13906d911 100644 --- a/dom/src/base/nsMimeTypeArray.cpp +++ b/dom/src/base/nsMimeTypeArray.cpp @@ -120,7 +120,7 @@ NS_IMETHODIMP MimeTypeArrayImpl::Item(PRUint32 aIndex, nsIDOMMimeType** aReturn) return NS_ERROR_FAILURE; } -NS_IMETHODIMP MimeTypeArrayImpl::NamedItem(const nsAReadableString& aName, +NS_IMETHODIMP MimeTypeArrayImpl::NamedItem(const nsString& aName, nsIDOMMimeType** aReturn) { NS_ENSURE_ARG_POINTER(aReturn); @@ -257,7 +257,7 @@ NS_IMETHODIMP MimeTypeElementImpl::GetScriptObject(nsIScriptContext *aContext, v return res; } -NS_IMETHODIMP MimeTypeElementImpl::GetDescription(nsAWritableString& aDescription) +NS_IMETHODIMP MimeTypeElementImpl::GetDescription(nsString& aDescription) { return mMimeType->GetDescription(aDescription); } @@ -269,12 +269,12 @@ NS_IMETHODIMP MimeTypeElementImpl::GetEnabledPlugin(nsIDOMPlugin** aEnabledPlugi return NS_OK; } -NS_IMETHODIMP MimeTypeElementImpl::GetSuffixes(nsAWritableString& aSuffixes) +NS_IMETHODIMP MimeTypeElementImpl::GetSuffixes(nsString& aSuffixes) { return mMimeType->GetSuffixes(aSuffixes); } -NS_IMETHODIMP MimeTypeElementImpl::GetType(nsAWritableString& aType) +NS_IMETHODIMP MimeTypeElementImpl::GetType(nsString& aType) { return mMimeType->GetType(aType); } diff --git a/dom/src/base/nsMimeTypeArray.h b/dom/src/base/nsMimeTypeArray.h index ed38272758b..9cd53fe8be3 100644 --- a/dom/src/base/nsMimeTypeArray.h +++ b/dom/src/base/nsMimeTypeArray.h @@ -41,7 +41,7 @@ public: NS_IMETHOD GetLength(PRUint32* aLength); NS_IMETHOD Item(PRUint32 aIndex, nsIDOMMimeType** aReturn); - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMMimeType** aReturn); + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMMimeType** aReturn); private: nsresult GetMimeTypes(); @@ -63,10 +63,10 @@ public: NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject); NS_IMETHOD SetScriptObject(void* aScriptObject); - NS_IMETHOD GetDescription(nsAWritableString& aDescription); + NS_IMETHOD GetDescription(nsString& aDescription); NS_IMETHOD GetEnabledPlugin(nsIDOMPlugin** aEnabledPlugin); - NS_IMETHOD GetSuffixes(nsAWritableString& aSuffixes); - NS_IMETHOD GetType(nsAWritableString& aType); + NS_IMETHOD GetSuffixes(nsString& aSuffixes); + NS_IMETHOD GetType(nsString& aType); protected: void *mScriptObject; diff --git a/dom/src/base/nsPluginArray.cpp b/dom/src/base/nsPluginArray.cpp index 9654bc0ea60..be27c5e782a 100644 --- a/dom/src/base/nsPluginArray.cpp +++ b/dom/src/base/nsPluginArray.cpp @@ -129,7 +129,7 @@ NS_IMETHODIMP PluginArrayImpl::Item(PRUint32 aIndex, nsIDOMPlugin** aReturn) return NS_OK; } -NS_IMETHODIMP PluginArrayImpl::NamedItem(const nsAReadableString& aName, nsIDOMPlugin** aReturn) +NS_IMETHODIMP PluginArrayImpl::NamedItem(const nsString& aName, nsIDOMPlugin** aReturn) { NS_PRECONDITION(nsnull != aReturn, "null arg"); @@ -142,10 +142,10 @@ NS_IMETHODIMP PluginArrayImpl::NamedItem(const nsAReadableString& aName, nsIDOMP *aReturn = nsnull; for (PRUint32 i = 0; i < mPluginCount; i++) { - nsAutoString pluginName; + nsString pluginName; nsIDOMPlugin* plugin = mPluginArray[i]; if (plugin->GetName(pluginName) == NS_OK) { - if (pluginName.Equals(aName)) { + if (pluginName == aName) { *aReturn = plugin; NS_IF_ADDREF(plugin); break; @@ -253,17 +253,17 @@ NS_IMETHODIMP PluginElementImpl::GetScriptObject(nsIScriptContext *aContext, voi return res; } -NS_IMETHODIMP PluginElementImpl::GetDescription(nsAWritableString& aDescription) +NS_IMETHODIMP PluginElementImpl::GetDescription(nsString& aDescription) { return mPlugin->GetDescription(aDescription); } -NS_IMETHODIMP PluginElementImpl::GetFilename(nsAWritableString& aFilename) +NS_IMETHODIMP PluginElementImpl::GetFilename(nsString& aFilename) { return mPlugin->GetFilename(aFilename); } -NS_IMETHODIMP PluginElementImpl::GetName(nsAWritableString& aName) +NS_IMETHODIMP PluginElementImpl::GetName(nsString& aName) { return mPlugin->GetName(aName); } @@ -289,7 +289,7 @@ NS_IMETHODIMP PluginElementImpl::Item(PRUint32 aIndex, nsIDOMMimeType** aReturn) return NS_ERROR_FAILURE; } -NS_IMETHODIMP PluginElementImpl::NamedItem(const nsAReadableString& aName, nsIDOMMimeType** aReturn) +NS_IMETHODIMP PluginElementImpl::NamedItem(const nsString& aName, nsIDOMMimeType** aReturn) { if (mMimeTypeArray == nsnull) { nsresult rv = GetMimeTypes(); @@ -299,10 +299,10 @@ NS_IMETHODIMP PluginElementImpl::NamedItem(const nsAReadableString& aName, nsIDO *aReturn = nsnull; for (PRUint32 i = 0; i < mMimeTypeCount; i++) { - nsAutoString type; + nsString type; nsIDOMMimeType* mimeType = mMimeTypeArray[i]; if (mimeType->GetType(type) == NS_OK) { - if (type.Equals(aName)) { + if (type == aName) { *aReturn = mimeType; NS_ADDREF(mimeType); break; diff --git a/dom/src/base/nsPluginArray.h b/dom/src/base/nsPluginArray.h index 4ffa2cb8fd5..8aca9ce26d2 100644 --- a/dom/src/base/nsPluginArray.h +++ b/dom/src/base/nsPluginArray.h @@ -28,7 +28,7 @@ #include "nsIDOMPlugin.h" class nsIDOMNavigator; -struct nsIPluginHost; +class nsIPluginHost; class PluginArrayImpl : public nsIScriptObjectOwner, public nsIDOMPluginArray { public: @@ -42,7 +42,7 @@ public: NS_IMETHOD GetLength(PRUint32* aLength); NS_IMETHOD Item(PRUint32 aIndex, nsIDOMPlugin** aReturn); - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMPlugin** aReturn); + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMPlugin** aReturn); NS_IMETHOD Refresh(PRBool aReloadDocuments); private: @@ -66,12 +66,12 @@ public: NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject); NS_IMETHOD SetScriptObject(void* aScriptObject); - NS_IMETHOD GetDescription(nsAWritableString& aDescription); - NS_IMETHOD GetFilename(nsAWritableString& aFilename); - NS_IMETHOD GetName(nsAWritableString& aName); + NS_IMETHOD GetDescription(nsString& aDescription); + NS_IMETHOD GetFilename(nsString& aFilename); + NS_IMETHOD GetName(nsString& aName); NS_IMETHOD GetLength(PRUint32* aLength); NS_IMETHOD Item(PRUint32 aIndex, nsIDOMMimeType** aReturn); - NS_IMETHOD NamedItem(const nsAReadableString& aName, nsIDOMMimeType** aReturn); + NS_IMETHOD NamedItem(const nsString& aName, nsIDOMMimeType** aReturn); private: nsresult GetMimeTypes(); diff --git a/dom/tools/FileGen.cpp b/dom/tools/FileGen.cpp index ff8050ca084..a6b546e8eb6 100644 --- a/dom/tools/FileGen.cpp +++ b/dom/tools/FileGen.cpp @@ -269,7 +269,7 @@ FileGen::GetVariableTypeForParameter(char *aBuffer, IdlVariable &aVariable) strcpy(aBuffer, "float"); break; case TYPE_STRING: - strcpy(aBuffer, "nsAReadableString&"); + strcpy(aBuffer, "nsString&"); break; case TYPE_OBJECT: sprintf(aBuffer, kObjTypeStr, aVariable.GetTypeName()); @@ -289,17 +289,6 @@ FileGen::GetVariableTypeForParameter(char *aBuffer, IdlVariable &aVariable) } } -void -FileGen::GetVariableTypeForReturnValue(char *aBuffer, IdlVariable &aVariable) -{ - if (TYPE_STRING == aVariable.GetType()) { - strcpy(aBuffer, "nsAWritableString&"); - } - else { - GetVariableTypeForParameter(aBuffer, aVariable); - } -} - void FileGen::GetParameterType(char *aBuffer, IdlParameter &aParameter) { diff --git a/dom/tools/FileGen.h b/dom/tools/FileGen.h index 045ae901818..97ac9dd7a12 100644 --- a/dom/tools/FileGen.h +++ b/dom/tools/FileGen.h @@ -56,7 +56,6 @@ protected: void GetVariableTypeForParameter(char *aBuffer, IdlVariable &aVariable); void GetVariableTypeForLocal(char *aBuffer, IdlVariable &aVariable); void GetVariableTypeForMethodLocal(char *aBuffer, IdlVariable &aVariable); - void GetVariableTypeForReturnValue(char *aBuffer, IdlVariable &aVariable); void GetParameterType(char *aBuffer, IdlParameter &aParameter); void GetInterfaceIID(char *aBuffer, IdlInterface &aInterface); diff --git a/dom/tools/XPCOMGen.cpp b/dom/tools/XPCOMGen.cpp index d6be94ad50e..17906fa965a 100644 --- a/dom/tools/XPCOMGen.cpp +++ b/dom/tools/XPCOMGen.cpp @@ -319,14 +319,13 @@ XPCOMGen::GenerateMethods(IdlInterface &aInterface) for (a = 0; a < acount; a++) { IdlAttribute *attr = aInterface.GetAttributeAt(a); - GetVariableTypeForReturnValue(type_buf, *attr); + GetVariableTypeForParameter(type_buf, *attr); GetCapitalizedName(name_buf, *attr); sprintf(buf, kGetterMethodDeclStr, name_buf, type_buf, attr->GetType() == TYPE_STRING ? "" : "*", name_buf); *file << buf; if (!attr->GetReadOnly()) { - GetVariableTypeForParameter(type_buf, *attr); sprintf(buf, kSetterMethodDeclStr, name_buf, attr->GetType() == TYPE_STRING ? "const " : "", type_buf, name_buf); @@ -372,7 +371,7 @@ XPCOMGen::GenerateMethods(IdlInterface &aInterface) strcpy(cur_param, kDelimiterStr); cur_param += strlen(kDelimiterStr); } - GetVariableTypeForReturnValue(type_buf, *rval); + GetVariableTypeForParameter(type_buf, *rval); sprintf(cur_param, kReturnStr, type_buf, rval->GetType() == TYPE_STRING ? "" : "*"); } @@ -404,14 +403,13 @@ XPCOMGen::GenerateDeclMacro(IdlInterface &aInterface) for (a = 0; a < acount; a++) { IdlAttribute *attr = aInterface.GetAttributeAt(a); - GetVariableTypeForReturnValue(type_buf, *attr); + GetVariableTypeForParameter(type_buf, *attr); GetCapitalizedName(name_buf, *attr); sprintf(buf, kGetterMethodDeclNonVirtualStr, name_buf, type_buf, attr->GetType() == TYPE_STRING ? "" : "*", name_buf); *file << buf; if (!attr->GetReadOnly()) { - GetVariableTypeForParameter(type_buf, *attr); sprintf(buf, kSetterMethodDeclNonVirtualStr, name_buf, attr->GetType() == TYPE_STRING ? "const " : "", type_buf, name_buf); @@ -460,7 +458,7 @@ XPCOMGen::GenerateDeclMacro(IdlInterface &aInterface) strcpy(cur_param, kDelimiterStr); cur_param += strlen(kDelimiterStr); } - GetVariableTypeForReturnValue(type_buf, *rval); + GetVariableTypeForParameter(type_buf, *rval); sprintf(cur_param, kReturnStr, type_buf, rval->GetType() == TYPE_STRING ? "" : "*"); } @@ -493,7 +491,7 @@ XPCOMGen::GenerateForwardMacro(IdlInterface &aInterface) for (a = 0; a < acount; a++) { IdlAttribute *attr = aInterface.GetAttributeAt(a); - GetVariableTypeForReturnValue(type_buf, *attr); + GetVariableTypeForParameter(type_buf, *attr); GetCapitalizedName(name_buf, *attr); sprintf(buf, kGetterMethodForwardStr, name_buf, type_buf, attr->GetType() == TYPE_STRING ? "" : "*", name_buf, @@ -501,7 +499,6 @@ XPCOMGen::GenerateForwardMacro(IdlInterface &aInterface) *file << buf; if (!attr->GetReadOnly()) { - GetVariableTypeForParameter(type_buf, *attr); sprintf(buf, kSetterMethodForwardStr, name_buf, attr->GetType() == TYPE_STRING ? "const " : "", type_buf, name_buf, name_buf, name_buf); @@ -562,7 +559,7 @@ XPCOMGen::GenerateForwardMacro(IdlInterface &aInterface) strcpy(cur_param2, kDelimiterStr); cur_param2 += strlen(kDelimiterStr); } - GetVariableTypeForReturnValue(type_buf, *rval); + GetVariableTypeForParameter(type_buf, *rval); sprintf(cur_param, kReturnStr, type_buf, rval->GetType() == TYPE_STRING ? "" : "*"); strcpy(cur_param2, kReturnCallStr);