diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp index 71e342d350e..c9fcf5344a3 100644 --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -464,7 +464,7 @@ nsAccessible::~nsAccessible() } -NS_IMETHODIMP nsAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsAccessible::GetAccName(nsAString& _retval) { nsCOMPtr elt(do_QueryInterface(mDOMNode)); if (elt) @@ -575,7 +575,7 @@ NS_IMETHODIMP nsAccessible::GetAccChildCount(PRInt32 *aAccChildCount) return NS_OK; } -nsresult nsAccessible::GetTranslatedString(const nsAReadableString& aKey, nsAWritableString& aStringOut) +nsresult nsAccessible::GetTranslatedString(const nsAString& aKey, nsAString& aStringOut) { static nsCOMPtr stringBundle; static PRBool firstTime = PR_TRUE; @@ -1140,7 +1140,7 @@ NS_IMETHODIMP nsAccessible::AccTakeFocus() return NS_OK; } -NS_IMETHODIMP nsAccessible::AppendStringWithSpaces(nsAWritableString *aFlatString, nsAReadableString& textEquivalent) +NS_IMETHODIMP nsAccessible::AppendStringWithSpaces(nsAString *aFlatString, const nsAString& textEquivalent) { // Insert spaces to insure that words from controls aren't jammed together if (!textEquivalent.IsEmpty()) { @@ -1160,7 +1160,7 @@ NS_IMETHODIMP nsAccessible::AppendStringWithSpaces(nsAWritableString *aFlatStrin * that node's decendants. */ -NS_IMETHODIMP nsAccessible::AppendFlatStringFromContentNode(nsIContent *aContent, nsAWritableString *aFlatString) +NS_IMETHODIMP nsAccessible::AppendFlatStringFromContentNode(nsIContent *aContent, nsAString *aFlatString) { nsAutoString textEquivalent; nsCOMPtr xulElement(do_QueryInterface(aContent)); @@ -1241,7 +1241,7 @@ NS_IMETHODIMP nsAccessible::AppendFlatStringFromContentNode(nsIContent *aContent } -NS_IMETHODIMP nsAccessible::AppendFlatStringFromSubtree(nsIContent *aContent, nsAWritableString *aFlatString) +NS_IMETHODIMP nsAccessible::AppendFlatStringFromSubtree(nsIContent *aContent, nsAString *aFlatString) { // Depth first search for all text nodes that are decendants of content node. // Append all the text into one flat string @@ -1268,7 +1268,7 @@ NS_IMETHODIMP nsAccessible::AppendFlatStringFromSubtree(nsIContent *aContent, ns * Checks the label's value first then makes a call to get the * text from the children if the value is not set. */ -NS_IMETHODIMP nsAccessible::AppendLabelText(nsIDOMNode *aLabelNode, nsAWritableString& _retval) +NS_IMETHODIMP nsAccessible::AppendLabelText(nsIDOMNode *aLabelNode, nsAString& _retval) { NS_ASSERTION(aLabelNode, "Label Node passed in is null"); nsCOMPtr labelNode(do_QueryInterface(aLabelNode)); @@ -1288,7 +1288,7 @@ NS_IMETHODIMP nsAccessible::AppendLabelText(nsIDOMNode *aLabelNode, nsAWritableS /** * Called for HTML work only */ -NS_IMETHODIMP nsAccessible::AppendLabelFor(nsIContent *aLookNode, nsAReadableString *aId, nsAWritableString *aLabel) +NS_IMETHODIMP nsAccessible::AppendLabelFor(nsIContent *aLookNode, const nsAString *aId, nsAString *aLabel) { PRInt32 numChildren = 0; @@ -1322,7 +1322,7 @@ NS_IMETHODIMP nsAccessible::AppendLabelFor(nsIContent *aLookNode, nsAReadableStr * the DOM tree to the form, concatonating label elements as it goes. Then checks for * labels with the for="controlID" property. */ -NS_IMETHODIMP nsAccessible::GetHTMLAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsAccessible::GetHTMLAccName(nsAString& _retval) { nsCOMPtr walkUpContent(do_QueryInterface(mDOMNode)); nsCOMPtr labelElement; @@ -1377,7 +1377,7 @@ NS_IMETHODIMP nsAccessible::GetHTMLAccName(nsAWritableString& _retval) * the child label for its Name. */ /* wstring getAccName (); */ -NS_IMETHODIMP nsAccessible::GetXULAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsAccessible::GetXULAccName(nsAString& _retval) { nsresult rv; nsAutoString label; diff --git a/accessible/src/base/nsAccessible.h b/accessible/src/base/nsAccessible.h index 86fe67b1e49..bc1098ed337 100644 --- a/accessible/src/base/nsAccessible.h +++ b/accessible/src/base/nsAccessible.h @@ -74,7 +74,7 @@ public: nsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); virtual ~nsAccessible(); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccParent(nsIAccessible **_retval); NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval); NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval); @@ -96,18 +96,18 @@ protected: virtual void GetBounds(nsRect& aRect, nsIFrame** aRelativeFrame); virtual void GetPresContext(nsCOMPtr& aContext); PRBool IsPartiallyVisible(); - NS_IMETHOD AppendLabelText(nsIDOMNode *aLabelNode, nsAWritableString& _retval); - NS_IMETHOD AppendLabelFor(nsIContent *aLookNode, nsAReadableString *aId, nsAWritableString *aLabel); - NS_IMETHOD GetHTMLAccName(nsAWritableString& _retval); - NS_IMETHOD GetXULAccName(nsAWritableString& _retval); - NS_IMETHOD AppendFlatStringFromSubtree(nsIContent *aContent, nsAWritableString *aFlatString); - NS_IMETHOD AppendFlatStringFromContentNode(nsIContent *aContent, nsAWritableString *aFlatString); - NS_IMETHOD AppendStringWithSpaces(nsAWritableString *aFlatString, nsAReadableString& textEquivalent); + NS_IMETHOD AppendLabelText(nsIDOMNode *aLabelNode, nsAString& _retval); + NS_IMETHOD AppendLabelFor(nsIContent *aLookNode, const nsAString *aId, nsAString *aLabel); + NS_IMETHOD GetHTMLAccName(nsAString& _retval); + NS_IMETHOD GetXULAccName(nsAString& _retval); + NS_IMETHOD AppendFlatStringFromSubtree(nsIContent *aContent, nsAString *aFlatString); + NS_IMETHOD AppendFlatStringFromContentNode(nsIContent *aContent, nsAString *aFlatString); + NS_IMETHOD AppendStringWithSpaces(nsAString *aFlatString, const nsAString& textEquivalent); NS_IMETHOD GetFocusedElement(nsIDOMElement **aFocusedElement); NS_IMETHOD CacheOptimizations(nsIAccessible *aParent, PRInt32 aSiblingIndex, nsIDOMNodeList *aSiblingList); // helper method to verify frames static PRBool IsCorrectFrameType(nsIFrame* aFrame, nsIAtom* aAtom); - static nsresult GetTranslatedString(const nsAReadableString& aKey, nsAWritableString& aStringOut); + static nsresult GetTranslatedString(const nsAString& aKey, nsAString& aStringOut); void GetScrollOffset(nsRect *aRect); void GetScreenOrigin(nsIPresContext *aPresContext, nsIFrame *aFrame, nsRect *aRect); diff --git a/accessible/src/base/nsBaseWidgetAccessible.cpp b/accessible/src/base/nsBaseWidgetAccessible.cpp index 7e9fa5f8a6c..31cde15aba2 100644 --- a/accessible/src/base/nsBaseWidgetAccessible.cpp +++ b/accessible/src/base/nsBaseWidgetAccessible.cpp @@ -130,7 +130,7 @@ NS_IMETHODIMP nsContainerAccessible::GetAccNumActions(PRUint8 *_retval) } /** no actions */ -NS_IMETHODIMP nsContainerAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval) +NS_IMETHODIMP nsContainerAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) { return NS_OK; } @@ -149,13 +149,13 @@ NS_IMETHODIMP nsContainerAccessible::GetAccState(PRUint32 *_retval) } /** no value */ -NS_IMETHODIMP nsContainerAccessible::GetAccValue(nsAWritableString& _retval) +NS_IMETHODIMP nsContainerAccessible::GetAccValue(nsAString& _retval) { return NS_OK; } /** no name*/ -NS_IMETHODIMP nsContainerAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsContainerAccessible::GetAccName(nsAString& _retval) { return NS_OK; } @@ -257,7 +257,7 @@ NS_IMETHODIMP nsLinkableAccessible::GetAccState(PRUint32 *_retval) } -NS_IMETHODIMP nsLinkableAccessible::GetAccValue(nsAWritableString& _retval) +NS_IMETHODIMP nsLinkableAccessible::GetAccValue(nsAString& _retval) { if (IsALink()) { nsCOMPtr elt(do_QueryInterface(mLinkContent)); @@ -276,7 +276,7 @@ NS_IMETHODIMP nsLinkableAccessible::GetAccNumActions(PRUint8 *_retval) } /* wstring getAccActionName (in PRUint8 index); */ -NS_IMETHODIMP nsLinkableAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval) +NS_IMETHODIMP nsLinkableAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) { // Action 0 (default action): Jump to link if (index == eAction_Jump) { diff --git a/accessible/src/base/nsBaseWidgetAccessible.h b/accessible/src/base/nsBaseWidgetAccessible.h index 5b4162aeb9f..4bc2f0789a8 100644 --- a/accessible/src/base/nsBaseWidgetAccessible.h +++ b/accessible/src/base/nsBaseWidgetAccessible.h @@ -71,11 +71,11 @@ class nsContainerAccessible : public nsAccessible public: nsContainerAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval); + NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); NS_IMETHOD AccDoAction(PRUint8 index); NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccValue(nsAWritableString& _retval); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccValue(nsAString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); }; /** @@ -100,10 +100,10 @@ class nsLinkableAccessible : public nsAccessible public: nsLinkableAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval); + NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); NS_IMETHOD AccDoAction(PRUint8 index); NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccValue(nsAWritableString& _retval); + NS_IMETHOD GetAccValue(nsAString& _retval); protected: PRBool IsALink(); diff --git a/accessible/src/base/nsFormControlAccessible.cpp b/accessible/src/base/nsFormControlAccessible.cpp index c03ea885704..d647900c43d 100644 --- a/accessible/src/base/nsFormControlAccessible.cpp +++ b/accessible/src/base/nsFormControlAccessible.cpp @@ -102,7 +102,7 @@ NS_IMETHODIMP nsFormControlAccessible::GetAccState(PRUint32 *_retval) * merely checks who is calling and then calls the appropriate * protected method for the XUL or HTML element. */ -NS_IMETHODIMP nsFormControlAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsFormControlAccessible::GetAccName(nsAString& _retval) { nsCOMPtr xulFormElement(do_QueryInterface(mDOMNode)); if (xulFormElement) @@ -159,7 +159,7 @@ NS_IMETHODIMP nsRadioButtonAccessible::GetAccNumActions(PRUint8 *_retval) /** * */ -NS_IMETHODIMP nsRadioButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval) +NS_IMETHODIMP nsRadioButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) { if (index == eAction_Click) { nsAccessible::GetTranslatedString(NS_LITERAL_STRING("select"), _retval); diff --git a/accessible/src/base/nsFormControlAccessible.h b/accessible/src/base/nsFormControlAccessible.h index cd4ed5ff34a..756c5e5e5ce 100644 --- a/accessible/src/base/nsFormControlAccessible.h +++ b/accessible/src/base/nsFormControlAccessible.h @@ -51,7 +51,7 @@ class nsFormControlAccessible : public nsAccessible { public: nsFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccState(PRUint32 *_retval); NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); NS_IMETHOD GetAccLastChild(nsIAccessible **_retval); @@ -69,7 +69,7 @@ public: nsRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval); + NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); }; /** diff --git a/accessible/src/base/nsGenericAccessible.cpp b/accessible/src/base/nsGenericAccessible.cpp index e278eaa7bce..ccc1200764e 100644 --- a/accessible/src/base/nsGenericAccessible.cpp +++ b/accessible/src/base/nsGenericAccessible.cpp @@ -94,25 +94,25 @@ NS_IMETHODIMP nsGenericAccessible::GetAccChildCount(PRInt32 *_retval) } /* wstring getAccName (); */ -NS_IMETHODIMP nsGenericAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsGenericAccessible::GetAccName(nsAString& _retval) { return NS_ERROR_NOT_IMPLEMENTED; } /* wstring getAccValue (); */ -NS_IMETHODIMP nsGenericAccessible::GetAccValue(nsAWritableString& _retval) +NS_IMETHODIMP nsGenericAccessible::GetAccValue(nsAString& _retval) { return NS_ERROR_NOT_IMPLEMENTED; } /* void setAccName (in wstring name); */ -NS_IMETHODIMP nsGenericAccessible::SetAccName(const nsAReadableString& name) +NS_IMETHODIMP nsGenericAccessible::SetAccName(const nsAString& name) { return NS_ERROR_NOT_IMPLEMENTED; } /* wstring getAccDescription (); */ -NS_IMETHODIMP nsGenericAccessible::GetAccDescription(nsAWritableString& _retval) +NS_IMETHODIMP nsGenericAccessible::GetAccDescription(nsAString& _retval) { return NS_ERROR_NOT_IMPLEMENTED; } @@ -136,7 +136,7 @@ NS_IMETHODIMP nsGenericAccessible::GetAccNumActions(PRUint8 *_retval) } /* wstring getAccActionName (in PRUint8 index); */ -NS_IMETHODIMP nsGenericAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval) +NS_IMETHODIMP nsGenericAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) { return NS_ERROR_NOT_IMPLEMENTED; } @@ -154,7 +154,7 @@ NS_IMETHODIMP nsGenericAccessible::GetAccFocused(nsIAccessible **_retval) } /* wstring getAccHelp (); */ -NS_IMETHODIMP nsGenericAccessible::GetAccHelp(nsAWritableString& _retval) +NS_IMETHODIMP nsGenericAccessible::GetAccHelp(nsAString& _retval) { return NS_ERROR_NOT_IMPLEMENTED; } diff --git a/accessible/src/base/nsRootAccessible.cpp b/accessible/src/base/nsRootAccessible.cpp index 1b96b46e921..af987207d7f 100644 --- a/accessible/src/base/nsRootAccessible.cpp +++ b/accessible/src/base/nsRootAccessible.cpp @@ -136,7 +136,7 @@ nsRootAccessible::~nsRootAccessible() } /* attribute wstring accName; */ -NS_IMETHODIMP nsRootAccessible::GetAccName(nsAWritableString& aAccName) +NS_IMETHODIMP nsRootAccessible::GetAccName(nsAString& aAccName) { return GetTitle(aAccName); } @@ -226,7 +226,7 @@ NS_IMETHODIMP nsRootAccessible::GetAccState(PRUint32 *aAccState) return NS_OK; } -NS_IMETHODIMP nsRootAccessible::GetAccValue(nsAWritableString& aAccValue) +NS_IMETHODIMP nsRootAccessible::GetAccValue(nsAString& aAccValue) { return GetURL(aAccValue); } @@ -502,27 +502,27 @@ NS_IMETHODIMP nsRootAccessible::CommandUpdate(nsIDOMEvent* aEvent) { return NS_O // ------- nsIAccessibleDocument Methods (5) --------------- -NS_IMETHODIMP nsRootAccessible::GetURL(nsAWritableString& aURL) +NS_IMETHODIMP nsRootAccessible::GetURL(nsAString& aURL) { return nsDocAccessibleMixin::GetURL(aURL); } -NS_IMETHODIMP nsRootAccessible::GetTitle(nsAWritableString& aTitle) +NS_IMETHODIMP nsRootAccessible::GetTitle(nsAString& aTitle) { return nsDocAccessibleMixin::GetTitle(aTitle); } -NS_IMETHODIMP nsRootAccessible::GetMimeType(nsAWritableString& aMimeType) +NS_IMETHODIMP nsRootAccessible::GetMimeType(nsAString& aMimeType) { return nsDocAccessibleMixin::GetMimeType(aMimeType); } -NS_IMETHODIMP nsRootAccessible::GetDocType(nsAWritableString& aDocType) +NS_IMETHODIMP nsRootAccessible::GetDocType(nsAString& aDocType) { return nsDocAccessibleMixin::GetDocType(aDocType); } -NS_IMETHODIMP nsRootAccessible::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAWritableString& aNameSpaceURI) +NS_IMETHODIMP nsRootAccessible::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAString& aNameSpaceURI) { return nsDocAccessibleMixin::GetNameSpaceURIForID(aNameSpaceID, aNameSpaceURI); } @@ -589,7 +589,7 @@ nsDocAccessibleMixin::~nsDocAccessibleMixin() { } -NS_IMETHODIMP nsDocAccessibleMixin::GetURL(nsAWritableString& aURL) +NS_IMETHODIMP nsDocAccessibleMixin::GetURL(nsAString& aURL) { nsCOMPtr presShell; mDocument->GetShellAt(0, getter_AddRefs(presShell)); @@ -612,14 +612,14 @@ NS_IMETHODIMP nsDocAccessibleMixin::GetURL(nsAWritableString& aURL) return NS_OK; } -NS_IMETHODIMP nsDocAccessibleMixin::GetTitle(nsAWritableString& aTitle) +NS_IMETHODIMP nsDocAccessibleMixin::GetTitle(nsAString& aTitle) { // This doesn't leak - we don't own the const pointer that's returned aTitle = *(mDocument->GetDocumentTitle()); return NS_OK; } -NS_IMETHODIMP nsDocAccessibleMixin::GetMimeType(nsAWritableString& aMimeType) +NS_IMETHODIMP nsDocAccessibleMixin::GetMimeType(nsAString& aMimeType) { nsCOMPtr domnsDocument(do_QueryInterface(mDocument)); if (domnsDocument) { @@ -628,7 +628,7 @@ NS_IMETHODIMP nsDocAccessibleMixin::GetMimeType(nsAWritableString& aMimeType) return NS_ERROR_FAILURE; } -NS_IMETHODIMP nsDocAccessibleMixin::GetDocType(nsAWritableString& aDocType) +NS_IMETHODIMP nsDocAccessibleMixin::GetDocType(nsAString& aDocType) { nsCOMPtr xulDoc(do_QueryInterface(mDocument)); nsCOMPtr domDoc(do_QueryInterface(mDocument)); @@ -645,7 +645,7 @@ NS_IMETHODIMP nsDocAccessibleMixin::GetDocType(nsAWritableString& aDocType) return NS_ERROR_FAILURE; } -NS_IMETHODIMP nsDocAccessibleMixin::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAWritableString& aNameSpaceURI) +NS_IMETHODIMP nsDocAccessibleMixin::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAString& aNameSpaceURI) { if (mDocument) { nsCOMPtr nameSpaceManager; diff --git a/accessible/src/base/nsRootAccessible.h b/accessible/src/base/nsRootAccessible.h index 081c146662d..4225d3ec39e 100644 --- a/accessible/src/base/nsRootAccessible.h +++ b/accessible/src/base/nsRootAccessible.h @@ -91,8 +91,8 @@ class nsRootAccessible : public nsAccessible, virtual ~nsRootAccessible(); /* attribute wstring accName; */ - NS_IMETHOD GetAccName(nsAWritableString& aAccName); - NS_IMETHOD GetAccValue(nsAWritableString& aAccValue); + NS_IMETHOD GetAccName(nsAString& aAccName); + NS_IMETHOD GetAccValue(nsAString& aAccValue); NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent); NS_IMETHOD GetAccRole(PRUint32 *aAccRole); NS_IMETHOD GetAccState(PRUint32 *aAccState); diff --git a/accessible/src/base/nsSelectAccessible.cpp b/accessible/src/base/nsSelectAccessible.cpp index bd99d67b52d..b6bdbcd1bae 100644 --- a/accessible/src/base/nsSelectAccessible.cpp +++ b/accessible/src/base/nsSelectAccessible.cpp @@ -113,7 +113,7 @@ nsLeafAccessible(aDOMNode, aShell) } /** click us! */ -NS_IMETHODIMP nsSelectOptionAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval) +NS_IMETHODIMP nsSelectOptionAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) { if (index == eAction_Click) { nsAccessible::GetTranslatedString(NS_LITERAL_STRING("select"), _retval); @@ -140,7 +140,7 @@ NS_IMETHODIMP nsSelectOptionAccessible::GetAccParent(nsIAccessible **_retval) /** * Get our Name from our Content's subtree */ -NS_IMETHODIMP nsSelectOptionAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsSelectOptionAccessible::GetAccName(nsAString& _retval) { nsCOMPtr content (do_QueryInterface(mDOMNode)); if (!content) { @@ -150,7 +150,7 @@ NS_IMETHODIMP nsSelectOptionAccessible::GetAccName(nsAWritableString& _retval) nsAutoString option; nsresult rv = AppendFlatStringFromSubtree(content, &option); if (NS_SUCCEEDED(rv)) { - // Temp var needed until CompressWhitespace built for nsAWritableString + // Temp var needed until CompressWhitespace built for nsAString option.CompressWhitespace(); _retval.Assign(option); } @@ -362,7 +362,7 @@ nsLeafAccessible(aDOMNode, aShell) * and then return that text. * Walks the Frame tree and checks for proper frames. */ -NS_IMETHODIMP nsComboboxTextFieldAccessible::GetAccValue(nsAWritableString& _retval) +NS_IMETHODIMP nsComboboxTextFieldAccessible::GetAccValue(nsAString& _retval) { nsIFrame* frame = nsAccessible::GetBoundsFrame(); nsCOMPtr context; @@ -524,7 +524,7 @@ NS_IMETHODIMP nsComboboxButtonAccessible::GetAccParent(nsIAccessible **_retval) /** * Gets the name from GetAccActionName() */ -NS_IMETHODIMP nsComboboxButtonAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsComboboxButtonAccessible::GetAccName(nsAString& _retval) { return GetAccActionName(eAction_Click, _retval); } @@ -535,7 +535,7 @@ NS_IMETHODIMP nsComboboxButtonAccessible::GetAccName(nsAWritableString& _retval) * if we are open -> closed is our name. * Uses the frame to get the state, updated on every click */ -NS_IMETHODIMP nsComboboxButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval) +NS_IMETHODIMP nsComboboxButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) { PRBool isOpen = PR_FALSE; nsIFrame *boundsFrame = GetBoundsFrame(); diff --git a/accessible/src/base/nsSelectAccessible.h b/accessible/src/base/nsSelectAccessible.h index 29609abaa45..7ec236a579d 100644 --- a/accessible/src/base/nsSelectAccessible.h +++ b/accessible/src/base/nsSelectAccessible.h @@ -82,8 +82,8 @@ public: virtual ~nsSelectOptionAccessible() {} /* ----- nsIAccessible ----- */ - NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccParent(nsIAccessible **_retval); NS_IMETHOD GetAccRole(PRUint32 *_retval); @@ -173,7 +173,7 @@ public: NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval); NS_IMETHOD GetAccParent(nsIAccessible **_retval); NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccValue(nsAWritableString& _retval); + NS_IMETHOD GetAccValue(nsAString& _retval); NS_IMETHOD GetAccState(PRUint32 *_retval); virtual void GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame); @@ -196,10 +196,10 @@ public: /* ----- nsIAccessible ----- */ NS_IMETHOD GetAccParent(nsIAccessible **_retval); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval); + NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); NS_IMETHOD GetAccState(PRUint32 *_retval); virtual void GetBounds(nsRect& aBounds, nsIFrame** aBoundingFrame); diff --git a/accessible/src/html/nsHTMLAreaAccessible.cpp b/accessible/src/html/nsHTMLAreaAccessible.cpp index c1f35c0a602..01bdbb39d9f 100644 --- a/accessible/src/html/nsHTMLAreaAccessible.cpp +++ b/accessible/src/html/nsHTMLAreaAccessible.cpp @@ -56,7 +56,7 @@ nsLinkableAccessible(aDomNode, aShell), mAccParent(aAccParent) } /* wstring getAccName (); */ -NS_IMETHODIMP nsHTMLAreaAccessible::GetAccName(nsAWritableString & _retval) +NS_IMETHODIMP nsHTMLAreaAccessible::GetAccName(nsAString & _retval) { nsCOMPtr elt(do_QueryInterface(mDOMNode)); if (elt) { @@ -74,7 +74,7 @@ NS_IMETHODIMP nsHTMLAreaAccessible::GetAccRole(PRUint32 *_retval) } /* wstring getAccValue (); */ -NS_IMETHODIMP nsHTMLAreaAccessible::GetAccValue(nsAWritableString& _retval) +NS_IMETHODIMP nsHTMLAreaAccessible::GetAccValue(nsAString& _retval) { nsCOMPtr elt(do_QueryInterface(mDOMNode)); if (elt) @@ -83,7 +83,7 @@ NS_IMETHODIMP nsHTMLAreaAccessible::GetAccValue(nsAWritableString& _retval) } /* wstring getAccDescription (); */ -NS_IMETHODIMP nsHTMLAreaAccessible::GetAccDescription(nsAWritableString& _retval) +NS_IMETHODIMP nsHTMLAreaAccessible::GetAccDescription(nsAString& _retval) { // Still to do - follow IE's standard here nsCOMPtr area(do_QueryInterface(mDOMNode)); diff --git a/accessible/src/html/nsHTMLAreaAccessible.h b/accessible/src/html/nsHTMLAreaAccessible.h index 58c30029b9a..483d9e5e8c9 100644 --- a/accessible/src/html/nsHTMLAreaAccessible.h +++ b/accessible/src/html/nsHTMLAreaAccessible.h @@ -51,16 +51,16 @@ class nsHTMLAreaAccessible : public nsLinkableAccessible public: nsHTMLAreaAccessible(nsIDOMNode *domNode, nsIAccessible *accParent, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAWritableString & _retval); + NS_IMETHOD GetAccName(nsAString & _retval); NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccValue(nsAWritableString& _retval); + NS_IMETHOD GetAccValue(nsAString& _retval); NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); NS_IMETHOD GetAccLastChild(nsIAccessible **_retval); NS_IMETHOD GetAccChildCount(PRInt32 *_retval); NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent); NS_IMETHOD GetAccNextSibling(nsIAccessible * *aAccNextSibling); NS_IMETHOD GetAccPreviousSibling(nsIAccessible * *aAccPreviousSibling); - NS_IMETHOD GetAccDescription(nsAWritableString& _retval); + NS_IMETHOD GetAccDescription(nsAString& _retval); NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height); protected: diff --git a/accessible/src/html/nsHTMLFormControlAccessible.cpp b/accessible/src/html/nsHTMLFormControlAccessible.cpp index 7d4cd649a03..ec48a487cad 100644 --- a/accessible/src/html/nsHTMLFormControlAccessible.cpp +++ b/accessible/src/html/nsHTMLFormControlAccessible.cpp @@ -76,7 +76,7 @@ NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccNumActions(PRUint8 *_retval) return NS_OK; } -NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval) +NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) { if (index == eAction_Click) { // 0 is the magic value for default action // check or uncheck @@ -168,7 +168,7 @@ NS_IMETHODIMP nsHTMLButtonAccessible::GetAccNumActions(PRUint8 *_retval) return NS_OK; } -NS_IMETHODIMP nsHTMLButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval) +NS_IMETHODIMP nsHTMLButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) { if (index == eAction_Click) { nsAccessible::GetTranslatedString(NS_LITERAL_STRING("press"), _retval); @@ -209,7 +209,7 @@ NS_IMETHODIMP nsHTMLButtonAccessible::GetAccRole(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(nsAString& _retval) { nsCOMPtr button(do_QueryInterface(mDOMNode)); @@ -238,7 +238,7 @@ NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccNumActions(PRUint8 *_retval) return NS_OK;; } -NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval) +NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) { if (index == eAction_Click) { nsAccessible::GetTranslatedString(NS_LITERAL_STRING("press"), _retval); @@ -283,7 +283,7 @@ NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccState(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccName(nsAString& _retval) { nsresult rv = NS_ERROR_FAILURE; nsCOMPtr content(do_QueryInterface(mDOMNode)); @@ -293,7 +293,7 @@ NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccName(nsAWritableString& _retval) rv = AppendFlatStringFromSubtree(content, &name); if (NS_SUCCEEDED(rv)) { - // Temp var needed until CompressWhitespace built for nsAWritableString + // Temp var needed until CompressWhitespace built for nsAString name.CompressWhitespace(); _retval.Assign(name); } @@ -315,7 +315,7 @@ NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccRole(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccValue(nsAWritableString& _retval) +NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccValue(nsAString& _retval) { PRUint32 state; GetAccState(&state); @@ -425,7 +425,7 @@ NS_IMETHODIMP nsHTMLGroupboxAccessible::GetAccState(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsHTMLGroupboxAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsHTMLGroupboxAccessible::GetAccName(nsAString& _retval) { nsCOMPtr element(do_QueryInterface(mDOMNode)); if (element) { diff --git a/accessible/src/html/nsHTMLFormControlAccessible.h b/accessible/src/html/nsHTMLFormControlAccessible.h index 9dfce358f95..2ba4e2805ac 100644 --- a/accessible/src/html/nsHTMLFormControlAccessible.h +++ b/accessible/src/html/nsHTMLFormControlAccessible.h @@ -52,7 +52,7 @@ public: nsHTMLCheckboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval); + NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); NS_IMETHOD AccDoAction(PRUint8 index); NS_IMETHOD GetAccState(PRUint32 *_retval); }; @@ -73,9 +73,9 @@ public: nsHTMLButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval); + NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); NS_IMETHOD AccDoAction(PRUint8 index); }; @@ -85,10 +85,10 @@ class nsHTML4ButtonAccessible : public nsLeafAccessible public: nsHTML4ButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccState(PRUint32 *_retval); NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval); + NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); NS_IMETHOD AccDoAction(PRUint8 index); }; @@ -97,7 +97,7 @@ class nsHTMLTextFieldAccessible : public nsFormControlAccessible public: nsHTMLTextFieldAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccValue(nsAWritableString& _retval); + NS_IMETHOD GetAccValue(nsAString& _retval); NS_IMETHOD GetAccState(PRUint32 *_retval); }; @@ -107,7 +107,7 @@ public: nsHTMLGroupboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); }; #endif diff --git a/accessible/src/html/nsHTMLIFrameRootAccessible.cpp b/accessible/src/html/nsHTMLIFrameRootAccessible.cpp index a02b3c34c02..623cd1a470f 100644 --- a/accessible/src/html/nsHTMLIFrameRootAccessible.cpp +++ b/accessible/src/html/nsHTMLIFrameRootAccessible.cpp @@ -74,12 +74,12 @@ nsHTMLIFrameAccessible::nsHTMLIFrameAccessible(nsIDOMNode* aNode, nsIAccessible* } /* attribute wstring accName; */ -NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccName(nsAWritableString& aAccName) +NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccName(nsAString& aAccName) { return GetTitle(aAccName); } -NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccValue(nsAWritableString& aAccValue) +NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccValue(nsAString& aAccValue) { return GetURL(aAccValue); } @@ -114,27 +114,27 @@ NS_IMETHODIMP nsHTMLIFrameAccessible::GetAccState(PRUint32 *aAccState) return nsAccessible::GetAccState(aAccState); } -NS_IMETHODIMP nsHTMLIFrameAccessible::GetURL(nsAWritableString& aURL) +NS_IMETHODIMP nsHTMLIFrameAccessible::GetURL(nsAString& aURL) { return nsDocAccessibleMixin::GetURL(aURL); } -NS_IMETHODIMP nsHTMLIFrameAccessible::GetTitle(nsAWritableString& aTitle) +NS_IMETHODIMP nsHTMLIFrameAccessible::GetTitle(nsAString& aTitle) { return nsDocAccessibleMixin::GetTitle(aTitle); } -NS_IMETHODIMP nsHTMLIFrameAccessible::GetMimeType(nsAWritableString& aMimeType) +NS_IMETHODIMP nsHTMLIFrameAccessible::GetMimeType(nsAString& aMimeType) { return nsDocAccessibleMixin::GetMimeType(aMimeType); } -NS_IMETHODIMP nsHTMLIFrameAccessible::GetDocType(nsAWritableString& aDocType) +NS_IMETHODIMP nsHTMLIFrameAccessible::GetDocType(nsAString& aDocType) { return nsDocAccessibleMixin::GetDocType(aDocType); } -NS_IMETHODIMP nsHTMLIFrameAccessible::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAWritableString& aNameSpaceURI) +NS_IMETHODIMP nsHTMLIFrameAccessible::GetNameSpaceURIForID(PRInt16 aNameSpaceID, nsAString& aNameSpaceURI) { return nsDocAccessibleMixin::GetNameSpaceURIForID(aNameSpaceID, aNameSpaceURI); } diff --git a/accessible/src/html/nsHTMLIFrameRootAccessible.h b/accessible/src/html/nsHTMLIFrameRootAccessible.h index ee0683e5485..2ed331f88b8 100644 --- a/accessible/src/html/nsHTMLIFrameRootAccessible.h +++ b/accessible/src/html/nsHTMLIFrameRootAccessible.h @@ -60,8 +60,8 @@ class nsHTMLIFrameAccessible : public nsBlockAccessible, NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); NS_IMETHOD GetAccLastChild(nsIAccessible **_retval); NS_IMETHOD GetAccChildCount(PRInt32 *_retval); - NS_IMETHOD GetAccName(nsAWritableString& aAccName); - NS_IMETHOD GetAccValue(nsAWritableString& AccValue); + NS_IMETHOD GetAccName(nsAString& aAccName); + NS_IMETHOD GetAccValue(nsAString& AccValue); NS_IMETHOD GetAccRole(PRUint32 *aAccRole); NS_IMETHOD GetAccState(PRUint32 *aAccState); diff --git a/accessible/src/html/nsHTMLImageAccessible.cpp b/accessible/src/html/nsHTMLImageAccessible.cpp index 8d64cde4982..6d51f7d70f5 100644 --- a/accessible/src/html/nsHTMLImageAccessible.cpp +++ b/accessible/src/html/nsHTMLImageAccessible.cpp @@ -110,7 +110,7 @@ NS_IMETHODIMP nsHTMLImageAccessible::GetAccState(PRUint32 *_retval) /* wstring getAccName (); */ -NS_IMETHODIMP nsHTMLImageAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsHTMLImageAccessible::GetAccName(nsAString& _retval) { nsresult rv = NS_ERROR_FAILURE; @@ -119,7 +119,7 @@ NS_IMETHODIMP nsHTMLImageAccessible::GetAccName(nsAWritableString& _retval) nsAutoString name; rv = AppendFlatStringFromContentNode(imageContent, &name); if (NS_SUCCEEDED(rv)) { - // Temp var needed until CompressWhitespace built for nsAWritableString + // Temp var needed until CompressWhitespace built for nsAString name.CompressWhitespace(); _retval.Assign(name); } diff --git a/accessible/src/html/nsHTMLImageAccessible.h b/accessible/src/html/nsHTMLImageAccessible.h index c55e650a00d..ce902f38425 100644 --- a/accessible/src/html/nsHTMLImageAccessible.h +++ b/accessible/src/html/nsHTMLImageAccessible.h @@ -56,7 +56,7 @@ class nsHTMLImageAccessible : public nsLinkableAccessible public: nsHTMLImageAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccState(PRUint32 *_retval); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); diff --git a/accessible/src/html/nsHTMLLinkAccessible.cpp b/accessible/src/html/nsHTMLLinkAccessible.cpp index bfc21db9429..cd99c2d1d2c 100644 --- a/accessible/src/html/nsHTMLLinkAccessible.cpp +++ b/accessible/src/html/nsHTMLLinkAccessible.cpp @@ -54,7 +54,7 @@ nsLinkableAccessible(aDomNode, aShell) } /* wstring getAccName (); */ -NS_IMETHODIMP nsHTMLLinkAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsHTMLLinkAccessible::GetAccName(nsAString& _retval) { if (!IsALink()) // Also initializes private data members return NS_ERROR_FAILURE; @@ -62,7 +62,7 @@ NS_IMETHODIMP nsHTMLLinkAccessible::GetAccName(nsAWritableString& _retval) nsAutoString name; nsresult rv = AppendFlatStringFromSubtree(mLinkContent, &name); if (NS_SUCCEEDED(rv)) { - // Temp var needed until CompressWhitespace built for nsAWritableString + // Temp var needed until CompressWhitespace built for nsAString name.CompressWhitespace(); _retval.Assign(name); } diff --git a/accessible/src/html/nsHTMLLinkAccessible.h b/accessible/src/html/nsHTMLLinkAccessible.h index 05a28c87b6d..a8997804836 100644 --- a/accessible/src/html/nsHTMLLinkAccessible.h +++ b/accessible/src/html/nsHTMLLinkAccessible.h @@ -48,7 +48,7 @@ class nsHTMLLinkAccessible : public nsLinkableAccessible public: nsHTMLLinkAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccRole(PRUint32 *_retval); }; diff --git a/accessible/src/html/nsHTMLSelectAccessible.cpp b/accessible/src/html/nsHTMLSelectAccessible.cpp index 72cbaad4528..e65ad031002 100644 --- a/accessible/src/html/nsHTMLSelectAccessible.cpp +++ b/accessible/src/html/nsHTMLSelectAccessible.cpp @@ -307,7 +307,7 @@ NS_IMETHODIMP nsHTMLListboxAccessible::GetAccFirstChild(nsIAccessible **_retval) * Our value is the value of our ( first ) selected child. nsIDOMHTMLSelectElement * returns this by default with GetValue(). */ -NS_IMETHODIMP nsHTMLListboxAccessible::GetAccValue(nsAWritableString& _retval) +NS_IMETHODIMP nsHTMLListboxAccessible::GetAccValue(nsAString& _retval) { nsCOMPtr select (do_QueryInterface(mDOMNode)); if ( select ) { @@ -418,7 +418,7 @@ NS_IMETHODIMP nsHTMLComboboxAccessible::GetAccFirstChild(nsIAccessible **_retval * Our value is the value of our ( first ) selected child. nsIDOMHTMLSelectElement * returns this by default with GetValue(). */ -NS_IMETHODIMP nsHTMLComboboxAccessible::GetAccValue(nsAWritableString& _retval) +NS_IMETHODIMP nsHTMLComboboxAccessible::GetAccValue(nsAString& _retval) { nsCOMPtr select (do_QueryInterface(mDOMNode)); if (select) { diff --git a/accessible/src/html/nsHTMLSelectAccessible.h b/accessible/src/html/nsHTMLSelectAccessible.h index 315681d46ad..e641d8cfeec 100644 --- a/accessible/src/html/nsHTMLSelectAccessible.h +++ b/accessible/src/html/nsHTMLSelectAccessible.h @@ -127,7 +127,7 @@ public: /* ----- nsIAccessible ----- */ NS_IMETHOD GetAccLastChild(nsIAccessible **_retval); NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); - NS_IMETHOD GetAccValue(nsAWritableString& _retval); + NS_IMETHOD GetAccValue(nsAString& _retval); }; @@ -148,7 +148,7 @@ public: /* ----- nsIAccessible ----- */ NS_IMETHOD GetAccLastChild(nsIAccessible **_retval); NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); - NS_IMETHOD GetAccValue(nsAWritableString& _retval); + NS_IMETHOD GetAccValue(nsAString& _retval); }; diff --git a/accessible/src/html/nsHTMLTableAccessible.cpp b/accessible/src/html/nsHTMLTableAccessible.cpp index 681301a51f8..d15060cbeb9 100644 --- a/accessible/src/html/nsHTMLTableAccessible.cpp +++ b/accessible/src/html/nsHTMLTableAccessible.cpp @@ -80,7 +80,7 @@ NS_IMETHODIMP nsHTMLTableAccessible::GetAccState(PRUint32 *aResult) return NS_OK; } -NS_IMETHODIMP nsHTMLTableAccessible::GetAccName(nsAWritableString& aResult) +NS_IMETHODIMP nsHTMLTableAccessible::GetAccName(nsAString& aResult) { aResult.Assign(NS_LITERAL_STRING("")); // Default name is blank diff --git a/accessible/src/html/nsHTMLTableAccessible.h b/accessible/src/html/nsHTMLTableAccessible.h index 8d84f6fcb57..185bdfdd81b 100644 --- a/accessible/src/html/nsHTMLTableAccessible.h +++ b/accessible/src/html/nsHTMLTableAccessible.h @@ -58,7 +58,7 @@ public: nsHTMLTableAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell); NS_IMETHOD GetAccRole(PRUint32 *aResult); NS_IMETHOD GetAccState(PRUint32 *aResult); - NS_IMETHOD GetAccName(nsAWritableString& aResult); + NS_IMETHOD GetAccName(nsAString& aResult); }; #endif diff --git a/accessible/src/html/nsHTMLTextAccessible.cpp b/accessible/src/html/nsHTMLTextAccessible.cpp index 85957af981c..d1c20eea708 100644 --- a/accessible/src/html/nsHTMLTextAccessible.cpp +++ b/accessible/src/html/nsHTMLTextAccessible.cpp @@ -45,7 +45,7 @@ nsTextAccessible(aDomNode, aShell) } /* wstring getAccName (); */ -NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsHTMLTextAccessible::GetAccName(nsAString& _retval) { return mDOMNode->GetNodeValue(_retval); } diff --git a/accessible/src/html/nsHTMLTextAccessible.h b/accessible/src/html/nsHTMLTextAccessible.h index ed3afbab413..f9ba1474cf2 100644 --- a/accessible/src/html/nsHTMLTextAccessible.h +++ b/accessible/src/html/nsHTMLTextAccessible.h @@ -48,7 +48,7 @@ class nsHTMLTextAccessible : public nsTextAccessible public: nsHTMLTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); }; #endif diff --git a/accessible/src/xul/nsXULColorPickerAccessible.cpp b/accessible/src/xul/nsXULColorPickerAccessible.cpp index 088fe0ca5bb..743e62dbfde 100644 --- a/accessible/src/xul/nsXULColorPickerAccessible.cpp +++ b/accessible/src/xul/nsXULColorPickerAccessible.cpp @@ -91,13 +91,13 @@ NS_IMETHODIMP nsXULColorPickerTileAccessible::GetAccState(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsXULColorPickerTileAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsXULColorPickerTileAccessible::GetAccName(nsAString& _retval) { _retval.Assign(NS_LITERAL_STRING("")); return NS_OK; } -NS_IMETHODIMP nsXULColorPickerTileAccessible::GetAccValue(nsAWritableString& _retval) +NS_IMETHODIMP nsXULColorPickerTileAccessible::GetAccValue(nsAString& _retval) { nsCOMPtr element(do_QueryInterface(mDOMNode)); NS_ASSERTION(element, "No XUL Element for colorpicker"); diff --git a/accessible/src/xul/nsXULColorPickerAccessible.h b/accessible/src/xul/nsXULColorPickerAccessible.h index c0d04e077ce..b2c7a79bbb7 100644 --- a/accessible/src/xul/nsXULColorPickerAccessible.h +++ b/accessible/src/xul/nsXULColorPickerAccessible.h @@ -49,8 +49,8 @@ public: nsXULColorPickerTileAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccName(nsAWritableString& _retval); - NS_IMETHOD GetAccValue(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); + NS_IMETHOD GetAccValue(nsAString& _retval); }; class nsXULColorPickerAccessible : public nsXULColorPickerTileAccessible diff --git a/accessible/src/xul/nsXULFormControlAccessible.cpp b/accessible/src/xul/nsXULFormControlAccessible.cpp index dd906824990..7cabe019347 100644 --- a/accessible/src/xul/nsXULFormControlAccessible.cpp +++ b/accessible/src/xul/nsXULFormControlAccessible.cpp @@ -68,7 +68,7 @@ nsAccessible(aNode, aShell), mAccService(do_GetService("@mozilla.org/accessibili { } -NS_IMETHODIMP nsXULButtonAccessible::GetAccName(nsAWritableString& aResult) +NS_IMETHODIMP nsXULButtonAccessible::GetAccName(nsAString& aResult) { return GetXULAccName(aResult); } @@ -85,7 +85,7 @@ NS_IMETHODIMP nsXULButtonAccessible::GetAccNumActions(PRUint8 *_retval) /** * Return the name of our only action */ -NS_IMETHODIMP nsXULButtonAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval) +NS_IMETHODIMP nsXULButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) { if (index == eAction_Click) { nsAccessible::GetTranslatedString(NS_LITERAL_STRING("press"), _retval); @@ -252,7 +252,7 @@ PRBool nsXULDropmarkerAccessible::DropmarkerOpen(PRBool aToggleOpen) /** * Return the name of our only action */ -NS_IMETHODIMP nsXULDropmarkerAccessible::GetAccActionName(PRUint8 index, nsAWritableString& aResult) +NS_IMETHODIMP nsXULDropmarkerAccessible::GetAccActionName(PRUint8 index, nsAString& aResult) { if (index == eAction_Click) { if (DropmarkerOpen(PR_FALSE)) @@ -329,7 +329,7 @@ NS_IMETHODIMP nsXULCheckboxAccessible::GetAccNumActions(PRUint8 *_retval) /** * Return the name of our only action */ -NS_IMETHODIMP nsXULCheckboxAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval) +NS_IMETHODIMP nsXULCheckboxAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) { if (index == eAction_Click) { // check or uncheck @@ -412,7 +412,7 @@ NS_IMETHODIMP nsXULGroupboxAccessible::GetAccState(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsXULGroupboxAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsXULGroupboxAccessible::GetAccName(nsAString& _retval) { _retval.Assign(NS_LITERAL_STRING("")); // Default name is blank @@ -457,7 +457,7 @@ NS_IMETHODIMP nsXULProgressMeterAccessible::GetAccState(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsXULProgressMeterAccessible::GetAccValue(nsAWritableString& _retval) +NS_IMETHODIMP nsXULProgressMeterAccessible::GetAccValue(nsAString& _retval) { nsCOMPtr element(do_QueryInterface(mDOMNode)); NS_ASSERTION(element, "No element for DOM node!"); diff --git a/accessible/src/xul/nsXULFormControlAccessible.h b/accessible/src/xul/nsXULFormControlAccessible.h index c4619ae9e39..6de012358c8 100644 --- a/accessible/src/xul/nsXULFormControlAccessible.h +++ b/accessible/src/xul/nsXULFormControlAccessible.h @@ -50,11 +50,11 @@ class nsXULButtonAccessible : public nsAccessible { public: nsXULButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAWritableString& aResult); + NS_IMETHOD GetAccName(nsAString& aResult); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccState(PRUint32 *_retval); NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval); + NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); NS_IMETHOD AccDoAction(PRUint8 index); NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); NS_IMETHOD GetAccLastChild(nsIAccessible **_retval); @@ -71,7 +71,7 @@ public: nsXULCheckboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval); + NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); NS_IMETHOD AccDoAction(PRUint8 index); NS_IMETHOD GetAccState(PRUint32 *_retval); }; @@ -83,7 +83,7 @@ public: NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccState(PRUint32 *_retval); NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval); + NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); NS_IMETHOD AccDoAction(PRUint8 index); private: @@ -96,7 +96,7 @@ public: nsXULGroupboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); }; class nsXULProgressMeterAccessible : public nsAccessible @@ -105,7 +105,7 @@ public: nsXULProgressMeterAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccValue(nsAWritableString &_retval); + NS_IMETHOD GetAccValue(nsAString &_retval); }; class nsXULRadioButtonAccessible : public nsRadioButtonAccessible diff --git a/accessible/src/xul/nsXULMenuAccessible.cpp b/accessible/src/xul/nsXULMenuAccessible.cpp index bc7fd89b412..d3b3f87c85d 100644 --- a/accessible/src/xul/nsXULMenuAccessible.cpp +++ b/accessible/src/xul/nsXULMenuAccessible.cpp @@ -113,7 +113,7 @@ NS_IMETHODIMP nsXULMenuitemAccessible::GetAccState(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsXULMenuitemAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsXULMenuitemAccessible::GetAccName(nsAString& _retval) { nsCOMPtr element(do_QueryInterface(mDOMNode)); NS_ASSERTION(element, "No DOM element for menu node!"); @@ -182,7 +182,7 @@ NS_IMETHODIMP nsXULMenuSeparatorAccessible::GetAccState(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsXULMenuSeparatorAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsXULMenuSeparatorAccessible::GetAccName(nsAString& _retval) { _retval.Assign(NS_LITERAL_STRING("")); return NS_OK; @@ -225,7 +225,7 @@ NS_IMETHODIMP nsXULMenupopupAccessible::GetAccState(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsXULMenupopupAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsXULMenupopupAccessible::GetAccName(nsAString& _retval) { nsCOMPtr element(do_QueryInterface(mDOMNode)); NS_ASSERTION(element, "No element for popup node!"); @@ -262,7 +262,7 @@ NS_IMETHODIMP nsXULMenubarAccessible::GetAccState(PRUint32 *_retval) } -NS_IMETHODIMP nsXULMenubarAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsXULMenubarAccessible::GetAccName(nsAString& _retval) { _retval = NS_LITERAL_STRING("menubar"); diff --git a/accessible/src/xul/nsXULMenuAccessible.h b/accessible/src/xul/nsXULMenuAccessible.h index 18a1404dc79..ea0d6f98f24 100644 --- a/accessible/src/xul/nsXULMenuAccessible.h +++ b/accessible/src/xul/nsXULMenuAccessible.h @@ -49,7 +49,7 @@ class nsXULMenuitemAccessible : public nsAccessible { public: nsXULMenuitemAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccState(PRUint32 *_retval); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccFirstChild(nsIAccessible **aAccFirstChild); @@ -61,7 +61,7 @@ class nsXULMenuSeparatorAccessible : public nsXULMenuitemAccessible { public: nsXULMenuSeparatorAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccState(PRUint32 *_retval); NS_IMETHOD GetAccRole(PRUint32 *_retval); }; @@ -70,7 +70,7 @@ class nsXULMenupopupAccessible : public nsAccessible { public: nsXULMenupopupAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccState(PRUint32 *_retval); NS_IMETHOD GetAccRole(PRUint32 *_retval); }; @@ -79,7 +79,7 @@ class nsXULMenubarAccessible : public nsAccessible { public: nsXULMenubarAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccState(PRUint32 *_retval); NS_IMETHOD GetAccRole(PRUint32 *_retval); }; diff --git a/accessible/src/xul/nsXULSelectAccessible.cpp b/accessible/src/xul/nsXULSelectAccessible.cpp index 544657e8845..e0b204f7896 100644 --- a/accessible/src/xul/nsXULSelectAccessible.cpp +++ b/accessible/src/xul/nsXULSelectAccessible.cpp @@ -191,7 +191,7 @@ NS_IMETHODIMP nsXULListboxAccessible::GetAccState(PRUint32 *_retval) * Our value is the value of our ( first ) selected child. nsIDOMXULSelectElement * returns this by default with GetValue(). */ -NS_IMETHODIMP nsXULListboxAccessible::GetAccValue(nsAWritableString& _retval) +NS_IMETHODIMP nsXULListboxAccessible::GetAccValue(nsAString& _retval) { nsCOMPtr select(do_QueryInterface(mDOMNode)); if (select) { @@ -272,7 +272,7 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsXULListitemAccessible, nsXULMenuitemAccessible) * If there is a Listcell as a child ( not anonymous ) use it, otherwise * default to getting the name from GetXULAccName */ -NS_IMETHODIMP nsXULListitemAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsXULListitemAccessible::GetAccName(nsAString& _retval) { nsCOMPtr child; if (NS_SUCCEEDED(mDOMNode->GetFirstChild(getter_AddRefs(child)))) { @@ -346,7 +346,7 @@ nsComboboxAccessible(aDOMNode, aShell) * Our value is the value of our ( first ) selected child. nsIDOMXULSelectElement * returns this by default with GetValue(). */ -NS_IMETHODIMP nsXULComboboxAccessible::GetAccValue(nsAWritableString& _retval) +NS_IMETHODIMP nsXULComboboxAccessible::GetAccValue(nsAString& _retval) { nsCOMPtr select(do_QueryInterface(mDOMNode)); if (select) { diff --git a/accessible/src/xul/nsXULSelectAccessible.h b/accessible/src/xul/nsXULSelectAccessible.h index a8cda59f158..7a2bb9f5359 100644 --- a/accessible/src/xul/nsXULSelectAccessible.h +++ b/accessible/src/xul/nsXULSelectAccessible.h @@ -124,7 +124,7 @@ public: NS_IMETHOD GetAccChildCount(PRInt32 *_retval); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccValue(nsAWritableString& _retval); + NS_IMETHOD GetAccValue(nsAString& _retval); }; @@ -140,7 +140,7 @@ public: virtual ~nsXULListitemAccessible() {} /* ----- nsIAccessible ----- */ - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccRole(PRUint32 *_retval); NS_IMETHOD GetAccState(PRUint32 *_retval); @@ -161,7 +161,7 @@ public: virtual ~nsXULComboboxAccessible() {} /* ----- nsIAccessible ----- */ - NS_IMETHOD GetAccValue(nsAWritableString& _retval); + NS_IMETHOD GetAccValue(nsAString& _retval); }; #endif diff --git a/accessible/src/xul/nsXULTabAccessible.cpp b/accessible/src/xul/nsXULTabAccessible.cpp index 6c85de8c6e3..ae6ca64449a 100644 --- a/accessible/src/xul/nsXULTabAccessible.cpp +++ b/accessible/src/xul/nsXULTabAccessible.cpp @@ -55,7 +55,7 @@ nsLeafAccessible(aNode, aShell) /** * Might need to use the GetXULAccName method from nsFormControlAcc.cpp */ -NS_IMETHODIMP nsXULTabAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsXULTabAccessible::GetAccName(nsAString& _retval) { nsCOMPtr tab(do_QueryInterface(mDOMNode)); if (tab) @@ -71,7 +71,7 @@ NS_IMETHODIMP nsXULTabAccessible::GetAccNumActions(PRUint8 *_retval) } /** Return the name of our only action */ -NS_IMETHODIMP nsXULTabAccessible::GetAccActionName(PRUint8 index, nsAWritableString& _retval) +NS_IMETHODIMP nsXULTabAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) { if (index == eAction_Click) { nsAccessible::GetTranslatedString(NS_LITERAL_STRING("switch"), _retval); @@ -188,7 +188,7 @@ NS_IMETHODIMP nsXULTabPanelsAccessible::GetAccState(PRUint32 *_retval) * the panel. XXX not sure if the "panels" object should have the * same name. */ -NS_IMETHODIMP nsXULTabPanelsAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsXULTabPanelsAccessible::GetAccName(nsAString& _retval) { return NS_ERROR_NOT_IMPLEMENTED; } diff --git a/accessible/src/xul/nsXULTabAccessible.h b/accessible/src/xul/nsXULTabAccessible.h index 170a280399b..6eec06f2fac 100644 --- a/accessible/src/xul/nsXULTabAccessible.h +++ b/accessible/src/xul/nsXULTabAccessible.h @@ -51,10 +51,10 @@ class nsXULTabAccessible : public nsLeafAccessible public: nsXULTabAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccState(PRUint32 *_retval); NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAWritableString& _retval); + NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); NS_IMETHOD AccDoAction(PRUint8 index); }; @@ -81,7 +81,7 @@ class nsXULTabPanelsAccessible : public nsAccessible public: nsXULTabPanelsAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); NS_IMETHOD GetAccState(PRUint32 *_retval); protected: nsCOMPtr mGParentDOMNode; diff --git a/accessible/src/xul/nsXULTextAccessible.cpp b/accessible/src/xul/nsXULTextAccessible.cpp index 72e83b2b5a9..501c9010371 100644 --- a/accessible/src/xul/nsXULTextAccessible.cpp +++ b/accessible/src/xul/nsXULTextAccessible.cpp @@ -51,7 +51,7 @@ nsTextAccessible(aDomNode, aShell) } /* wstring getAccName (); */ -NS_IMETHODIMP nsXULTextAccessible::GetAccName(nsAWritableString& _retval) +NS_IMETHODIMP nsXULTextAccessible::GetAccName(nsAString& _retval) { nsCOMPtr descriptionElement(do_QueryInterface(mDOMNode)); if (descriptionElement) { diff --git a/accessible/src/xul/nsXULTextAccessible.h b/accessible/src/xul/nsXULTextAccessible.h index 235345fe562..62b2d7eb45d 100644 --- a/accessible/src/xul/nsXULTextAccessible.h +++ b/accessible/src/xul/nsXULTextAccessible.h @@ -49,7 +49,7 @@ class nsXULTextAccessible : public nsTextAccessible public: nsXULTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAWritableString& _retval); + NS_IMETHOD GetAccName(nsAString& _retval); }; #endif diff --git a/editor/composer/src/nsComposerCommands.cpp b/editor/composer/src/nsComposerCommands.cpp index 40e72da724e..cded162c93e 100644 --- a/editor/composer/src/nsComposerCommands.cpp +++ b/editor/composer/src/nsComposerCommands.cpp @@ -87,7 +87,7 @@ NS_IMPL_ISUPPORTS1(nsBaseComposerCommand, nsIControllerCommand) //-------------------------------------------------------------------------------------------------------------------- nsresult -nsBaseComposerCommand::GetInterfaceNode(const nsAReadableString & nodeID, nsIEditorShell* editorShell, nsIDOMElement **outNode) +nsBaseComposerCommand::GetInterfaceNode(const nsAString & nodeID, nsIEditorShell* editorShell, nsIDOMElement **outNode) //-------------------------------------------------------------------------------------------------------------------- { *outNode = nsnull; @@ -107,7 +107,7 @@ nsBaseComposerCommand::GetInterfaceNode(const nsAReadableString & nodeID, nsIEdi //-------------------------------------------------------------------------------------------------------------------- nsresult -nsBaseComposerCommand::GetCommandNodeState(const nsAReadableString & aCommandName, nsIEditorShell* editorShell, nsString& outNodeState) +nsBaseComposerCommand::GetCommandNodeState(const nsAString & aCommandName, nsIEditorShell* editorShell, nsString& outNodeState) //-------------------------------------------------------------------------------------------------------------------- { nsCOMPtr uiNode; @@ -120,7 +120,7 @@ nsBaseComposerCommand::GetCommandNodeState(const nsAReadableString & aCommandNam //-------------------------------------------------------------------------------------------------------------------- nsresult -nsBaseComposerCommand::SetCommandNodeState(const nsAReadableString & aCommandName, nsIEditorShell* editorShell, const nsString& inNodeState) +nsBaseComposerCommand::SetCommandNodeState(const nsAString & aCommandName, nsIEditorShell* editorShell, const nsString& inNodeState) //-------------------------------------------------------------------------------------------------------------------- { nsCOMPtr uiNode; @@ -177,7 +177,7 @@ nsBaseStateUpdatingCommand::~nsBaseStateUpdatingCommand() NS_IMPL_ISUPPORTS_INHERITED1(nsBaseStateUpdatingCommand, nsBaseComposerCommand, nsIStateUpdatingControllerCommand); NS_IMETHODIMP -nsBaseStateUpdatingCommand::IsCommandEnabled(const nsAReadableString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) +nsBaseStateUpdatingCommand::IsCommandEnabled(const nsAString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) { nsCOMPtr editorShell = do_QueryInterface(refCon); *outCmdEnabled = PR_FALSE; @@ -194,7 +194,7 @@ nsBaseStateUpdatingCommand::IsCommandEnabled(const nsAReadableString & aCommandN NS_IMETHODIMP -nsBaseStateUpdatingCommand::DoCommand(const nsAReadableString & aCommandName, nsISupports *refCon) +nsBaseStateUpdatingCommand::DoCommand(const nsAString & aCommandName, nsISupports *refCon) { nsCOMPtr editorShell = do_QueryInterface(refCon); if (!editorShell) return NS_ERROR_NOT_INITIALIZED; @@ -231,7 +231,7 @@ nsBaseStateUpdatingCommand::GetCommandState(nsICommandParams *aParams, nsISuppor } NS_IMETHODIMP -nsBaseStateUpdatingCommand::UpdateCommandState(const nsAReadableString & aCommandName, nsISupports *refCon) +nsBaseStateUpdatingCommand::UpdateCommandState(const nsAString & aCommandName, nsISupports *refCon) { nsCOMPtr editorShell = do_QueryInterface(refCon); nsresult rv = NS_OK; @@ -274,7 +274,7 @@ nsCloseCommand::IsCommandEnabled(const PRUnichar *aCommand, nsISupports * refCon NS_IMETHODIMP -nsCloseCommand::DoCommand(const nsAReadableString & aCommandName, const nsAReadableString & aCommandParams, nsISupports *refCon) +nsCloseCommand::DoCommand(const nsAString & aCommandName, const nsAString & aCommandParams, nsISupports *refCon) { nsCOMPtr editorShell = do_QueryInterface(refCon); @@ -295,7 +295,7 @@ nsCloseCommand::DoCommand(const nsAReadableString & aCommandName, const nsAReada #endif NS_IMETHODIMP -nsPasteQuotationCommand::IsCommandEnabled(const nsAReadableString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) +nsPasteQuotationCommand::IsCommandEnabled(const nsAString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) { nsCOMPtr editorShell = do_QueryInterface(refCon); *outCmdEnabled = PR_FALSE; @@ -312,7 +312,7 @@ nsPasteQuotationCommand::IsCommandEnabled(const nsAReadableString & aCommandName NS_IMETHODIMP -nsPasteQuotationCommand::DoCommand(const nsAReadableString & aCommandName, nsISupports *refCon) +nsPasteQuotationCommand::DoCommand(const nsAString & aCommandName, nsISupports *refCon) { nsCOMPtr editorShell = do_QueryInterface(refCon); @@ -719,7 +719,7 @@ nsListItemCommand::ToggleState(nsIEditor *aEditor, const char* aTagName) #endif NS_IMETHODIMP -nsRemoveListCommand::IsCommandEnabled(const nsAReadableString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) +nsRemoveListCommand::IsCommandEnabled(const nsAString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) { nsCOMPtr editorShell = do_QueryInterface(refCon); *outCmdEnabled = PR_FALSE; @@ -744,7 +744,7 @@ nsRemoveListCommand::IsCommandEnabled(const nsAReadableString & aCommandName, ns NS_IMETHODIMP -nsRemoveListCommand::DoCommand(const nsAReadableString & aCommandName, nsISupports *refCon) +nsRemoveListCommand::DoCommand(const nsAString & aCommandName, nsISupports *refCon) { nsCOMPtr editorShell = do_QueryInterface(refCon); @@ -787,7 +787,7 @@ nsRemoveListCommand::GetCommandState(nsICommandParams *aParams, nsISupports *ref #endif NS_IMETHODIMP -nsIndentCommand::IsCommandEnabled(const nsAReadableString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) +nsIndentCommand::IsCommandEnabled(const nsAString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) { nsCOMPtr editorShell = do_QueryInterface(refCon); *outCmdEnabled = PR_FALSE; @@ -804,7 +804,7 @@ nsIndentCommand::IsCommandEnabled(const nsAReadableString & aCommandName, nsISup NS_IMETHODIMP -nsIndentCommand::DoCommand(const nsAReadableString & aCommandName, nsISupports *refCon) +nsIndentCommand::DoCommand(const nsAString & aCommandName, nsISupports *refCon) { nsCOMPtr editorShell = do_QueryInterface(refCon); @@ -850,7 +850,7 @@ nsIndentCommand::GetCommandState(nsICommandParams *aParams, nsISupports *refCon) //OUTDENT NS_IMETHODIMP -nsOutdentCommand::IsCommandEnabled(const nsAReadableString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) +nsOutdentCommand::IsCommandEnabled(const nsAString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) { nsCOMPtr editorShell = do_QueryInterface(refCon); *outCmdEnabled = PR_FALSE; @@ -873,7 +873,7 @@ nsOutdentCommand::IsCommandEnabled(const nsAReadableString & aCommandName, nsISu NS_IMETHODIMP -nsOutdentCommand::DoCommand(const nsAReadableString & aCommandName, nsISupports *refCon) +nsOutdentCommand::DoCommand(const nsAString & aCommandName, nsISupports *refCon) { nsCOMPtr editorShell = do_QueryInterface(refCon); @@ -933,7 +933,7 @@ nsMultiStateCommand::~nsMultiStateCommand() NS_IMPL_ISUPPORTS_INHERITED1(nsMultiStateCommand, nsBaseComposerCommand, nsIStateUpdatingControllerCommand); NS_IMETHODIMP -nsMultiStateCommand::IsCommandEnabled(const nsAReadableString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) +nsMultiStateCommand::IsCommandEnabled(const nsAString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) { nsCOMPtr editorShell = do_QueryInterface(refCon); *outCmdEnabled = PR_FALSE; @@ -959,7 +959,7 @@ nsMultiStateCommand::IsCommandEnabled(const nsAReadableString & aCommandName, ns NS_IMETHODIMP -nsMultiStateCommand::DoCommand(const nsAReadableString & aCommandName, nsISupports *refCon) +nsMultiStateCommand::DoCommand(const nsAString & aCommandName, nsISupports *refCon) { nsCOMPtr editorShell = do_QueryInterface(refCon); @@ -998,7 +998,7 @@ nsMultiStateCommand::DoCommandParams(nsICommandParams *aParams, nsISupports *ref } NS_IMETHODIMP -nsMultiStateCommand::UpdateCommandState(const nsAReadableString & aCommandName, nsISupports *refCon) +nsMultiStateCommand::UpdateCommandState(const nsAString & aCommandName, nsISupports *refCon) { nsCOMPtr editorShell = do_QueryInterface(refCon); nsresult rv = NS_OK; @@ -1388,7 +1388,7 @@ nsHighlightColorStateCommand::SetState(nsIEditorShell *aEditorShell, nsString& n } NS_IMETHODIMP -nsHighlightColorStateCommand::IsCommandEnabled(const nsAReadableString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) +nsHighlightColorStateCommand::IsCommandEnabled(const nsAString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) { nsCOMPtr editorShell = do_QueryInterface(refCon); *outCmdEnabled = PR_FALSE; @@ -1595,7 +1595,7 @@ nsAlignCommand::SetState(nsIEditorShell *aEditorShell, nsString& newState) #endif NS_IMETHODIMP -nsRemoveStylesCommand::IsCommandEnabled(const nsAReadableString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) +nsRemoveStylesCommand::IsCommandEnabled(const nsAString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) { nsCOMPtr editorShell = do_QueryInterface(refCon); nsCOMPtreditor; @@ -1619,7 +1619,7 @@ nsRemoveStylesCommand::IsCommandEnabled(const nsAReadableString & aCommandName, NS_IMETHODIMP -nsRemoveStylesCommand::DoCommand(const nsAReadableString & aCommandName, nsISupports *refCon) +nsRemoveStylesCommand::DoCommand(const nsAString & aCommandName, nsISupports *refCon) { nsCOMPtr editorShell = do_QueryInterface(refCon); @@ -1662,7 +1662,7 @@ nsRemoveStylesCommand::GetCommandState(nsICommandParams *aParams, nsISupports *r #endif NS_IMETHODIMP -nsIncreaseFontSizeCommand::IsCommandEnabled(const nsAReadableString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) +nsIncreaseFontSizeCommand::IsCommandEnabled(const nsAString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) { nsCOMPtr editorShell = do_QueryInterface(refCon); nsCOMPtreditor; @@ -1684,7 +1684,7 @@ nsIncreaseFontSizeCommand::IsCommandEnabled(const nsAReadableString & aCommandNa NS_IMETHODIMP -nsIncreaseFontSizeCommand::DoCommand(const nsAReadableString & aCommandName, nsISupports *refCon) +nsIncreaseFontSizeCommand::DoCommand(const nsAString & aCommandName, nsISupports *refCon) { nsCOMPtr editorShell = do_QueryInterface(refCon); @@ -1726,7 +1726,7 @@ nsIncreaseFontSizeCommand::GetCommandState(nsICommandParams *aParams, nsISupport #endif NS_IMETHODIMP -nsDecreaseFontSizeCommand::IsCommandEnabled(const nsAReadableString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) +nsDecreaseFontSizeCommand::IsCommandEnabled(const nsAString & aCommandName, nsISupports *refCon, PRBool *outCmdEnabled) { nsCOMPtr editorShell = do_QueryInterface(refCon); nsCOMPtreditor; @@ -1749,7 +1749,7 @@ nsDecreaseFontSizeCommand::IsCommandEnabled(const nsAReadableString & aCommandNa NS_IMETHODIMP -nsDecreaseFontSizeCommand::DoCommand(const nsAReadableString & aCommandName, nsISupports *refCon) +nsDecreaseFontSizeCommand::DoCommand(const nsAString & aCommandName, nsISupports *refCon) { nsCOMPtr editorShell = do_QueryInterface(refCon); diff --git a/editor/composer/src/nsComposerCommands.h b/editor/composer/src/nsComposerCommands.h index c814f881ca3..e633a4109bd 100644 --- a/editor/composer/src/nsComposerCommands.h +++ b/editor/composer/src/nsComposerCommands.h @@ -64,16 +64,16 @@ public: NS_DECL_ISUPPORTS // nsIControllerCommand. Declared longhand so we can make them pure virtual - NS_IMETHOD IsCommandEnabled(const nsAReadableString & aCommandName, nsISupports *aCommandRefCon, PRBool *_retval) = 0; - NS_IMETHOD DoCommand(const nsAReadableString & aCommandName, nsISupports *aCommandRefCon) = 0; + NS_IMETHOD IsCommandEnabled(const nsAString & aCommandName, nsISupports *aCommandRefCon, PRBool *_retval) = 0; + NS_IMETHOD DoCommand(const nsAString & aCommandName, nsISupports *aCommandRefCon) = 0; protected: // utility methods to get/set the "state" attribute on the command node in the XUL - nsresult GetInterfaceNode(const nsAReadableString & nodeID, nsIEditorShell* editorShell, nsIDOMElement **outNode); + nsresult GetInterfaceNode(const nsAString & nodeID, nsIEditorShell* editorShell, nsIDOMElement **outNode); - nsresult GetCommandNodeState(const nsAReadableString & aCommandName, nsIEditorShell* editorShell, nsString& outNodeState); - nsresult SetCommandNodeState(const nsAReadableString & aCommandName, nsIEditorShell* editorShell, const nsString& inNodeState); + nsresult GetCommandNodeState(const nsAString & aCommandName, nsIEditorShell* editorShell, nsString& outNodeState); + nsresult SetCommandNodeState(const nsAString & aCommandName, nsIEditorShell* editorShell, const nsString& inNodeState); // are we in HTML edit mode (not source view or plain text editing) PRBool EditingHTML(nsIEditorShell* inEditorShell); @@ -256,7 +256,7 @@ protected: virtual nsresult GetCurrentState(nsIEditorShell *aEditorShell, nsString& outStateString, PRBool& outMixed); virtual nsresult SetState(nsIEditorShell *aEditorShell, nsString& newState); - NS_IMETHOD IsCommandEnabled(const nsAReadableString & aCommandName, nsISupports *aCommandRefCon, PRBool *_retval); + NS_IMETHOD IsCommandEnabled(const nsAString & aCommandName, nsISupports *aCommandRefCon, PRBool *_retval); virtual nsresult GetCurrentState(nsIEditor *aEditor, nsICommandParams* aParams); virtual nsresult SetState(nsIEditor *aEditor, nsString& newState); diff --git a/editor/composer/src/nsComposerCommandsUpdater.cpp b/editor/composer/src/nsComposerCommandsUpdater.cpp index a95dab2c363..d06c474d927 100644 --- a/editor/composer/src/nsComposerCommandsUpdater.cpp +++ b/editor/composer/src/nsComposerCommandsUpdater.cpp @@ -243,7 +243,7 @@ nsComposerCommandsUpdater::UpdateDirtyState(PRBool aNowDirty) } nsresult -nsComposerCommandsUpdater::CallUpdateCommands(const nsAReadableString& aCommand) +nsComposerCommandsUpdater::CallUpdateCommands(const nsAString& aCommand) { if (!mDocShell) { diff --git a/editor/composer/src/nsComposerCommandsUpdater.h b/editor/composer/src/nsComposerCommandsUpdater.h index b6729f77c09..aa54ea8acd9 100644 --- a/editor/composer/src/nsComposerCommandsUpdater.h +++ b/editor/composer/src/nsComposerCommandsUpdater.h @@ -93,7 +93,7 @@ protected: PRBool SelectionIsCollapsed(); nsresult UpdateDirtyState(PRBool aNowDirty); - nsresult CallUpdateCommands(const nsAReadableString& aCommand); + nsresult CallUpdateCommands(const nsAString& aCommand); nsresult PrimeUpdateTimer(); void TimerCallback(); diff --git a/editor/composer/src/nsComposerController.cpp b/editor/composer/src/nsComposerController.cpp index 25b8b081814..b21f8b18582 100644 --- a/editor/composer/src/nsComposerController.cpp +++ b/editor/composer/src/nsComposerController.cpp @@ -218,7 +218,7 @@ nsresult nsComposerController::RegisterComposerCommands(nsIControllerCommandMana * ======================================================================= */ NS_IMETHODIMP -nsComposerController::IsCommandEnabled(const nsAReadableString & aCommand, +nsComposerController::IsCommandEnabled(const nsAString & aCommand, PRBool *aResult) { NS_ENSURE_ARG_POINTER(aResult); @@ -226,7 +226,7 @@ nsComposerController::IsCommandEnabled(const nsAReadableString & aCommand, } NS_IMETHODIMP -nsComposerController::SupportsCommand(const nsAReadableString & aCommand, +nsComposerController::SupportsCommand(const nsAString & aCommand, PRBool *aResult) { NS_ENSURE_ARG_POINTER(aResult); @@ -234,13 +234,13 @@ nsComposerController::SupportsCommand(const nsAReadableString & aCommand, } NS_IMETHODIMP -nsComposerController::DoCommand(const nsAReadableString & aCommand) +nsComposerController::DoCommand(const nsAString & aCommand) { return mCommandManager->DoCommand(aCommand, mCommandRefCon); } NS_IMETHODIMP -nsComposerController::OnEvent(const nsAReadableString & aEventName) +nsComposerController::OnEvent(const nsAString & aEventName) { return NS_OK; } diff --git a/editor/composer/src/nsEditorShell.cpp b/editor/composer/src/nsEditorShell.cpp index 8e827e00855..c8db52049d8 100644 --- a/editor/composer/src/nsEditorShell.cpp +++ b/editor/composer/src/nsEditorShell.cpp @@ -2412,7 +2412,7 @@ nsEditorShell::GetString(const PRUnichar *stringName, PRUnichar **_retval) // Use this version within the shell: -void nsEditorShell::GetBundleString(const nsAReadableString &stringName, nsAWritableString &outString) +void nsEditorShell::GetBundleString(const nsAString &stringName, nsAString &outString) { outString.Truncate(); @@ -4818,7 +4818,7 @@ nsEditorShell::CheckPrefAndNormalizeTable() nsresult -nsEditorShell::DoControllerCommand(const nsAReadableString& aCommand) +nsEditorShell::DoControllerCommand(const nsAString& aCommand) { // Get the list of controllers... nsCOMPtr controllers; diff --git a/editor/composer/src/nsEditorShell.h b/editor/composer/src/nsEditorShell.h index ed6d5ce603a..5fb132f7aa0 100644 --- a/editor/composer/src/nsEditorShell.h +++ b/editor/composer/src/nsEditorShell.h @@ -151,7 +151,7 @@ class nsEditorShell : public nsIEditorShell, nsresult RemoveOneProperty(const nsString& aProp, const nsString& aAttr); nsresult DoFind(PRBool aFindNext); // To allow executing JavaScript commands from C++ via nsIEditorController interface - nsresult DoControllerCommand(const nsAReadableString& aCommand); + nsresult DoControllerCommand(const nsAString& aCommand); void Alert(const nsString& aTitle, const nsString& aMsg); // Bring up a Yes/No dialog WE REALLY NEED A Yes/No/Cancel dialog and would like to set our own caption as well! @@ -164,7 +164,7 @@ class nsEditorShell : public nsIEditorShell, // Get a string from the string bundle file. If the string is not found // this returns an empty string. - void GetBundleString(const nsAReadableString &stringName, nsAWritableString &outString); + void GetBundleString(const nsAString &stringName, nsAString &outString); // Get the text of the tag nsresult GetDocumentTitleString(nsString& title); diff --git a/editor/composer/src/nsEditorShellMouseListener.cpp b/editor/composer/src/nsEditorShellMouseListener.cpp index eeddb1d44ab..2fc24abffe6 100644 --- a/editor/composer/src/nsEditorShellMouseListener.cpp +++ b/editor/composer/src/nsEditorShellMouseListener.cpp @@ -165,7 +165,7 @@ PRBool GetParentCell(nsIDOMEvent* aMouseEvent, nsIDOMElement **aCellElement) } static -PRBool ElementIsType(nsIDOMElement *aElement, const nsAReadableString& aTag) +PRBool ElementIsType(nsIDOMElement *aElement, const nsAString& aTag) { if (aElement) {