From 328dc604c264efa3a029c69232666a55007041f2 Mon Sep 17 00:00:00 2001 From: "aaronl%netscape.com" Date: Thu, 31 Jul 2003 08:09:39 +0000 Subject: [PATCH] Bug 214447. Shorten names in accessibility APIs. r=kyle, sr=alecf --- accessible/public/nsIAccessNode.idl | 12 +- accessible/public/nsIAccessible.idl | 65 ++--- accessible/public/nsIAccessibleSelectable.idl | 4 +- accessible/public/nsPIAccessible.idl | 6 +- accessible/src/atk/nsAccessibleWrap.cpp | 78 +++--- accessible/src/atk/nsAccessibleWrap.h | 2 +- accessible/src/atk/nsAppRootAccessible.cpp | 28 +-- accessible/src/atk/nsAppRootAccessible.h | 16 +- accessible/src/atk/nsDocAccessibleWrap.cpp | 6 +- accessible/src/atk/nsHTMLBlockAccessible.cpp | 8 +- accessible/src/atk/nsHTMLBlockAccessible.h | 6 +- .../src/atk/nsHTMLLinkAccessibleWrap.cpp | 2 +- .../src/atk/nsHTMLTableAccessibleWrap.cpp | 4 +- .../src/atk/nsHTMLTableAccessibleWrap.h | 2 +- accessible/src/atk/nsMaiInterfaceAction.cpp | 42 ++-- .../src/atk/nsMaiInterfaceComponent.cpp | 6 +- .../src/atk/nsMaiInterfaceSelection.cpp | 4 +- accessible/src/atk/nsRootAccessibleWrap.cpp | 6 +- accessible/src/atk/nsRootAccessibleWrap.h | 2 +- .../atk/nsXULFormControlAccessibleWrap.cpp | 2 +- .../src/atk/nsXULTreeAccessibleWrap.cpp | 14 +- accessible/src/base/nsAccessNode.cpp | 12 +- .../src/base/nsAccessibilityService.cpp | 16 +- accessible/src/base/nsAccessible.cpp | 227 +++++++++--------- accessible/src/base/nsAccessible.h | 6 +- accessible/src/base/nsAccessibleEventData.h | 1 + .../src/base/nsBaseWidgetAccessible.cpp | 48 ++-- accessible/src/base/nsBaseWidgetAccessible.h | 22 +- accessible/src/base/nsCaretAccessible.cpp | 12 +- accessible/src/base/nsCaretAccessible.h | 12 +- accessible/src/base/nsDocAccessible.cpp | 28 +-- accessible/src/base/nsDocAccessible.h | 10 +- .../src/base/nsFormControlAccessible.cpp | 22 +- accessible/src/base/nsFormControlAccessible.h | 16 +- accessible/src/base/nsOuterDocAccessible.cpp | 26 +- accessible/src/base/nsOuterDocAccessible.h | 10 +- accessible/src/base/nsRootAccessible.cpp | 20 +- accessible/src/base/nsRootAccessible.h | 4 +- accessible/src/base/nsTextAccessible.cpp | 8 +- accessible/src/base/nsTextAccessible.h | 8 +- accessible/src/html/nsHTMLAreaAccessible.cpp | 44 ++-- accessible/src/html/nsHTMLAreaAccessible.h | 20 +- .../src/html/nsHTMLFormControlAccessible.cpp | 68 +++--- .../src/html/nsHTMLFormControlAccessible.h | 50 ++-- accessible/src/html/nsHTMLImageAccessible.cpp | 24 +- accessible/src/html/nsHTMLImageAccessible.h | 10 +- accessible/src/html/nsHTMLLinkAccessible.cpp | 12 +- accessible/src/html/nsHTMLLinkAccessible.h | 6 +- .../src/html/nsHTMLSelectAccessible.cpp | 194 +++++++-------- accessible/src/html/nsHTMLSelectAccessible.h | 90 +++---- accessible/src/html/nsHTMLTableAccessible.cpp | 24 +- accessible/src/html/nsHTMLTableAccessible.h | 14 +- accessible/src/html/nsHTMLTextAccessible.cpp | 32 +-- accessible/src/html/nsHTMLTextAccessible.h | 20 +- accessible/src/msaa/nsAccessibleWrap.cpp | 60 ++--- accessible/src/msaa/nsDocAccessibleWrap.cpp | 2 +- accessible/src/msaa/nsTextAccessibleWrap.cpp | 4 +- .../src/xul/nsXULColorPickerAccessible.cpp | 18 +- .../src/xul/nsXULColorPickerAccessible.h | 12 +- .../src/xul/nsXULFormControlAccessible.cpp | 102 ++++---- .../src/xul/nsXULFormControlAccessible.h | 72 +++--- accessible/src/xul/nsXULMenuAccessible.cpp | 70 +++--- accessible/src/xul/nsXULMenuAccessible.h | 42 ++-- accessible/src/xul/nsXULSelectAccessible.cpp | 54 ++--- accessible/src/xul/nsXULSelectAccessible.h | 30 +-- accessible/src/xul/nsXULTabAccessible.cpp | 42 ++-- accessible/src/xul/nsXULTabAccessible.h | 34 +-- accessible/src/xul/nsXULTextAccessible.cpp | 14 +- accessible/src/xul/nsXULTextAccessible.h | 10 +- accessible/src/xul/nsXULTreeAccessible.cpp | 142 +++++------ accessible/src/xul/nsXULTreeAccessible.h | 66 ++--- 71 files changed, 1103 insertions(+), 1102 deletions(-) diff --git a/accessible/public/nsIAccessNode.idl b/accessible/public/nsIAccessNode.idl index 33a2dac62bd..1d24dba61cd 100644 --- a/accessible/public/nsIAccessNode.idl +++ b/accessible/public/nsIAccessNode.idl @@ -75,32 +75,32 @@ interface nsIAccessNode : nsISupports * @param childNum Zero-based child index * @return The nth nsIAccessNode child */ - nsIAccessNode getChildAt(in long childNum); + nsIAccessNode getChildNodeAt(in long childNum); /** * The parent nsIAccessNode */ - readonly attribute nsIAccessNode parent; + readonly attribute nsIAccessNode parentNode; /** * The first nsIAccessNode child */ - readonly attribute nsIAccessNode firstChild; + readonly attribute nsIAccessNode firstChildNode; /** * The last nsIAccessNode child */ - readonly attribute nsIAccessNode lastChild; + readonly attribute nsIAccessNode lastChildNode; /** * The previous nsIAccessNode sibling */ - readonly attribute nsIAccessNode previousSibling; + readonly attribute nsIAccessNode previousSiblingNode; /** * The next nsIAccessNode sibling */ - readonly attribute nsIAccessNode nextSibling; + readonly attribute nsIAccessNode nextSiblingNode; /** * The nsIAccessibleDocument that this nsIAccessNode diff --git a/accessible/public/nsIAccessible.idl b/accessible/public/nsIAccessible.idl index ca566c32684..31d63c6341b 100644 --- a/accessible/public/nsIAccessible.idl +++ b/accessible/public/nsIAccessible.idl @@ -60,91 +60,92 @@ interface nsIAccessible : nsISupports /** * Parent node in accessible tree. */ - readonly attribute nsIAccessible accParent; + readonly attribute nsIAccessible parent; /** * Next sibling in accessible tree */ - readonly attribute nsIAccessible accNextSibling; + readonly attribute nsIAccessible nextSibling; /** * Previous sibling in accessible tree */ - readonly attribute nsIAccessible accPreviousSibling; + readonly attribute nsIAccessible previousSibling; /** * First child in accessible tree */ - readonly attribute nsIAccessible accFirstChild; + readonly attribute nsIAccessible firstChild; /** * Last child in accessible tree */ - readonly attribute nsIAccessible accLastChild; + readonly attribute nsIAccessible lastChild; /** * Number of accessible children */ - readonly attribute long accChildCount; + readonly attribute long childCount; /** * Accessible name -- the main text equivalent for this node */ - attribute AString accName; + attribute AString name; /** * Accessible value -- a number or a secondary text equivalent for this node */ - readonly attribute AString accValue; + readonly attribute AString value; /** * Accessible description -- long text associated with this node */ - readonly attribute AString accDescription; + readonly attribute AString description; /** * Provides localized string of accesskey name, such as Alt+D. * The modifier may be affected by user and platform preferences. * Usually alt+letter, or just the letter alone for menu items. */ - readonly attribute AString accKeyboardShortcut; + readonly attribute AString keyboardShortcut; /** - * First child in accessible tree + * Provides localized string of global keyboard accelerator, such + * as Ctrl+O for Open file */ - readonly attribute AString accKeybinding; + readonly attribute AString keyBinding; /** * Enumerated accessible role. The values depend on platform because of variations. * See the ROLE_* constants defined later in this file. */ - readonly attribute unsigned long accRole; + readonly attribute unsigned long role; /** * Accessible states -- bit field which describes boolean properties of node. * See the STATE_* constants defined later in this file. */ - readonly attribute unsigned long accState; + readonly attribute unsigned long state; /** * Extended accessible states -- second bit field describing node */ - readonly attribute unsigned long accExtState; + readonly attribute unsigned long extState; /** * Help text associated with node */ - readonly attribute AString accHelp; + readonly attribute AString help; /** * Focused accessible child of node */ - readonly attribute nsIAccessible accFocused; + readonly attribute nsIAccessible focusedChild; /** * Accessible child which contains the coordinate at x,y */ - nsIAccessible accGetAt(in long x, in long y); + nsIAccessible getChildAtPoint(in long x, in long y); /** * Nth accessible child using zero-based index @@ -154,24 +155,24 @@ interface nsIAccessible : nsISupports /** * Accessible node geometrically to the right of this one */ - nsIAccessible accGetFromRight(); + nsIAccessible getAccessibleToRight(); /** * Accessible node geometrically to the left of this one */ - nsIAccessible accGetFromLeft(); + nsIAccessible getAccessibleToLeft(); /** * Accessible node geometrically above this one */ - nsIAccessible accGetFromAbove(); + nsIAccessible getAccessibleAbove(); /** * Accessible node geometrically below this one */ - nsIAccessible accGetFromBelow(); + nsIAccessible getAccessibleBelow(); - void accGetBounds(out long x, + void getBounds(out long x, out long y, out long width, out long height); @@ -179,23 +180,23 @@ interface nsIAccessible : nsISupports /** * Add this accessible to the current selection */ - void accAddSelection(); + void addSelection(); /** * Remove this accessible from the current selection */ - void accRemoveSelection(); + void removeSelection(); /** * Extend the current selection from its current accessible anchor node * to this accessible */ - void accExtendSelection(); + void extendSelection(); /** * Select this accessible node only */ - void accTakeSelection(); + void takeSelection(); /** * Focus this accessible node, @@ -205,28 +206,28 @@ interface nsIAccessible : nsISupports * will still set focus on that node, although normally that will not be visually * indicated in most style sheets. */ - void accTakeFocus(); + void takeFocus(); /** * The number of accessible actions associated with this accessible */ - readonly attribute PRUint8 accNumActions; + readonly attribute PRUint8 numActions; /** * The name of the accessible action at the given zero-based index */ - AString getAccActionName(in PRUint8 index); + AString getActionName(in PRUint8 index); /** * Perform the accessible action at the given zero-based index * Action number 0 is the default action */ - void accDoAction(in PRUint8 index); + void doAction(in PRUint8 index); /** * Get the DOM node described by this accessible node */ - nsIDOMNode accGetDOMNode(); + nsIDOMNode getDOMNode(); /** * Get a pointer to accessibility interface for this node, which is specific diff --git a/accessible/public/nsIAccessibleSelectable.idl b/accessible/public/nsIAccessibleSelectable.idl index 1eaa798ac29..ec2e4040186 100644 --- a/accessible/public/nsIAccessibleSelectable.idl +++ b/accessible/public/nsIAccessibleSelectable.idl @@ -73,14 +73,14 @@ interface nsIAccessibleSelectable : nsISupports * If the specified object is already selected, then it does nothing. * @throws NS_ERROR_FAILURE if the specified object is not selectable. */ - void addSelection(in long index); + void addChildToSelection(in long index); /** * Removes the specified child of the object from the object's selection. * If the specified object was not selected, then it does nothing. * @throws NS_ERROR_FAILURE if the specified object is not selectable. */ - void removeSelection(in long index); + void removeChildFromSelection(in long index); /** * Clears the selection in the object so that no children in the object diff --git a/accessible/public/nsPIAccessible.idl b/accessible/public/nsPIAccessible.idl index 4ce27ebb8f1..9a3f0d1d5e8 100644 --- a/accessible/public/nsPIAccessible.idl +++ b/accessible/public/nsPIAccessible.idl @@ -43,9 +43,9 @@ interface nsIAccessible; [scriptable, uuid(52F1BE88-84F7-4f7f-B31C-062AFE7DF15D)] interface nsPIAccessible : nsISupports { - [noscript] void setAccParent(in nsIAccessible aAccParent); - [noscript] void setAccFirstChild(in nsIAccessible aAccFirstChild); - [noscript] void setAccNextSibling(in nsIAccessible aAccNextSibling); + [noscript] void setParent(in nsIAccessible aAccParent); + [noscript] void setFirstChild(in nsIAccessible aAccFirstChild); + [noscript] void setNextSibling(in nsIAccessible aAccNextSibling); [noscript] void invalidateChildren(); [noscript] void fireToolkitEvent(in unsigned long aEvent, in nsIAccessible aTarget, in voidPtr aData); }; diff --git a/accessible/src/atk/nsAccessibleWrap.cpp b/accessible/src/atk/nsAccessibleWrap.cpp index 3300223494c..6f206753485 100644 --- a/accessible/src/atk/nsAccessibleWrap.cpp +++ b/accessible/src/atk/nsAccessibleWrap.cpp @@ -249,7 +249,7 @@ nsAccessibleWrap::CreateMaiInterfaces(void) // Add Action interface if the action count is more than zero. PRUint8 actionCount = 0; - rv = GetAccNumActions(&actionCount); + rv = GetNumActions(&actionCount); if (NS_SUCCEEDED(rv) && actionCount > 0) { MaiInterfaceAction *maiInterfaceAction = new MaiInterfaceAction(this); NS_ENSURE_TRUE(maiInterfaceAction, NS_ERROR_OUT_OF_MEMORY); @@ -441,50 +441,50 @@ Returned AtkStatusSet never contain the following AtkStates. ******************************************************************************/ void -nsAccessibleWrap::TranslateStates(PRUint32 aAccState, void *aAtkStateSet) +nsAccessibleWrap::TranslateStates(PRUint32 aState, void *aAtkStateSet) { if (!aAtkStateSet) return; AtkStateSet *state_set = NS_STATIC_CAST(AtkStateSet *, aAtkStateSet); - if (aAccState & nsIAccessible::STATE_SELECTED) + if (aState & nsIAccessible::STATE_SELECTED) atk_state_set_add_state (state_set, ATK_STATE_SELECTED); - if (aAccState & nsIAccessible::STATE_FOCUSED) + if (aState & nsIAccessible::STATE_FOCUSED) atk_state_set_add_state (state_set, ATK_STATE_FOCUSED); - if (aAccState & nsIAccessible::STATE_PRESSED) + if (aState & nsIAccessible::STATE_PRESSED) atk_state_set_add_state (state_set, ATK_STATE_PRESSED); - if (aAccState & nsIAccessible::STATE_CHECKED) + if (aState & nsIAccessible::STATE_CHECKED) atk_state_set_add_state (state_set, ATK_STATE_CHECKED); - if (aAccState & nsIAccessible::STATE_EXPANDED) + if (aState & nsIAccessible::STATE_EXPANDED) atk_state_set_add_state (state_set, ATK_STATE_EXPANDED); - if (aAccState & nsIAccessible::STATE_COLLAPSED) + if (aState & nsIAccessible::STATE_COLLAPSED) atk_state_set_add_state (state_set, ATK_STATE_EXPANDABLE); // The control can't accept input at this time - if (aAccState & nsIAccessible::STATE_BUSY) + if (aState & nsIAccessible::STATE_BUSY) atk_state_set_add_state (state_set, ATK_STATE_BUSY); - if (aAccState & nsIAccessible::STATE_FOCUSABLE) + if (aState & nsIAccessible::STATE_FOCUSABLE) atk_state_set_add_state (state_set, ATK_STATE_FOCUSABLE); - if (!(aAccState & nsIAccessible::STATE_INVISIBLE)) + if (!(aState & nsIAccessible::STATE_INVISIBLE)) atk_state_set_add_state (state_set, ATK_STATE_VISIBLE); - if (aAccState & nsIAccessible::STATE_SELECTABLE) + if (aState & nsIAccessible::STATE_SELECTABLE) atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE); - if (aAccState & nsIAccessible::STATE_SIZEABLE) + if (aState & nsIAccessible::STATE_SIZEABLE) atk_state_set_add_state (state_set, ATK_STATE_RESIZABLE); - if (aAccState & nsIAccessible::STATE_MULTISELECTABLE) + if (aState & nsIAccessible::STATE_MULTISELECTABLE) atk_state_set_add_state (state_set, ATK_STATE_MULTISELECTABLE); - if (!(aAccState & nsIAccessible::STATE_UNAVAILABLE)) + if (!(aState & nsIAccessible::STATE_UNAVAILABLE)) atk_state_set_add_state (state_set, ATK_STATE_ENABLED); // The following state is @@ -492,37 +492,37 @@ nsAccessibleWrap::TranslateStates(PRUint32 aAccState, void *aAtkStateSet) // This is only the states that there isn't already a mapping for in MSAA // See www.accessmozilla.org/article.php?sid=11 for information on the // mappings between accessibility API state - if (aAccState & nsIAccessible::STATE_INVALID) + if (aState & nsIAccessible::STATE_INVALID) atk_state_set_add_state (state_set, ATK_STATE_INVALID); - if (aAccState & nsIAccessible::STATE_ACTIVE) + if (aState & nsIAccessible::STATE_ACTIVE) atk_state_set_add_state (state_set, ATK_STATE_ACTIVE); - if (aAccState & nsIAccessible::STATE_EXPANDABLE) + if (aState & nsIAccessible::STATE_EXPANDABLE) atk_state_set_add_state (state_set, ATK_STATE_EXPANDABLE); - if (aAccState & nsIAccessible::STATE_MODAL) + if (aState & nsIAccessible::STATE_MODAL) atk_state_set_add_state (state_set, ATK_STATE_MODAL); - if (aAccState & nsIAccessible::STATE_MULTI_LINE) + if (aState & nsIAccessible::STATE_MULTI_LINE) atk_state_set_add_state (state_set, ATK_STATE_MULTI_LINE); - if (aAccState & nsIAccessible::STATE_SENSITIVE) + if (aState & nsIAccessible::STATE_SENSITIVE) atk_state_set_add_state (state_set, ATK_STATE_SENSITIVE); - if (aAccState & nsIAccessible::STATE_RESIZABLE) + if (aState & nsIAccessible::STATE_RESIZABLE) atk_state_set_add_state (state_set, ATK_STATE_RESIZABLE); - if (aAccState & nsIAccessible::STATE_SHOWING) + if (aState & nsIAccessible::STATE_SHOWING) atk_state_set_add_state (state_set, ATK_STATE_SHOWING); - if (aAccState & nsIAccessible::STATE_SINGLE_LINE) + if (aState & nsIAccessible::STATE_SINGLE_LINE) atk_state_set_add_state (state_set, ATK_STATE_SINGLE_LINE); - if (aAccState & nsIAccessible::STATE_TRANSIENT) + if (aState & nsIAccessible::STATE_TRANSIENT) atk_state_set_add_state (state_set, ATK_STATE_TRANSIENT); - if (aAccState & nsIAccessible::STATE_VERTICAL) + if (aState & nsIAccessible::STATE_VERTICAL) atk_state_set_add_state (state_set, ATK_STATE_VERTICAL); } @@ -611,7 +611,7 @@ getNameCB(AtkObject *aAtkObj) NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap; /* nsIAccessible is responsible for the non-NULL name */ - nsresult rv = accWrap->GetAccName(uniName); + nsresult rv = accWrap->GetName(uniName); NS_ENSURE_SUCCESS(rv, nsnull); len = uniName.Length(); if (len > 0) { @@ -639,7 +639,7 @@ getDescriptionCB(AtkObject *aAtkObj) NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap; /* nsIAccessible is responsible for the non-NULL description */ - nsresult rv = accWrap->GetAccDescription(uniDesc); + nsresult rv = accWrap->GetDescription(uniDesc); NS_ENSURE_SUCCESS(rv, nsnull); len = uniDesc.Length(); if (len > 0) { @@ -663,14 +663,14 @@ getRoleCB(AtkObject *aAtkObj) NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap; PRUint32 accRole; - nsresult rv = accWrap->GetAccRole(&accRole); + nsresult rv = accWrap->GetRole(&accRole); NS_ENSURE_SUCCESS(rv, ATK_ROLE_INVALID); //the cross-platform Accessible object returns the same value for //both "ATK_ROLE_MENU_ITEM" and "ATK_ROLE_MENU" if (accRole == ATK_ROLE_MENU_ITEM) { PRInt32 childCount = 0; - accWrap->GetAccChildCount(&childCount); + accWrap->GetChildCount(&childCount); if (childCount > 0) accRole = ATK_ROLE_MENU; } @@ -687,12 +687,12 @@ getParentCB(AtkObject *aAtkObj) NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap; nsCOMPtr accParent; - nsresult rv = accWrap->GetAccParent(getter_AddRefs(accParent)); + nsresult rv = accWrap->GetParent(getter_AddRefs(accParent)); if (NS_FAILED(rv) || !accParent) return nsnull; - nsIAccessible *tmpAccParent = accParent; + nsIAccessible *tmpParent = accParent; nsAccessibleWrap *accWrapParent = NS_STATIC_CAST(nsAccessibleWrap *, - tmpAccParent); + tmpParent); AtkObject *parentAtkObj = accWrapParent->GetAtkObject(); if (parentAtkObj && !aAtkObj->accessible_parent) { @@ -709,7 +709,7 @@ getChildCountCB(AtkObject *aAtkObj) NS_REINTERPRET_CAST(MaiAtkObject*, aAtkObj)->accWrap; PRInt32 count = 0; - accWrap->GetAccChildCount(&count); + accWrap->GetChildCount(&count); return count; } @@ -754,13 +754,13 @@ getIndexInParentCB(AtkObject *aAtkObj) NS_ENSURE_SUCCESS(accWrap->GetUniqueID(&accId), -1); nsCOMPtr accParent; - nsresult rv = accWrap->GetAccParent(getter_AddRefs(accParent)); + nsresult rv = accWrap->GetParent(getter_AddRefs(accParent)); if (NS_FAILED(rv) || !accParent) return -1; nsCOMPtr accChild; nsCOMPtr accTmpChild; - accWrap->GetAccFirstChild(getter_AddRefs(accChild)); + accWrap->GetFirstChild(getter_AddRefs(accChild)); PRInt32 currentIndex = -1; void *currentAccId = nsnull; @@ -772,7 +772,7 @@ getIndexInParentCB(AtkObject *aAtkObj) if (currentAccId == accId) break; } - accChild->GetAccNextSibling(getter_AddRefs(accTmpChild)); + accChild->GetNextSibling(getter_AddRefs(accTmpChild)); accChild = accTmpChild; } return currentIndex; @@ -789,11 +789,11 @@ refStateSetCB(AtkObject *aAtkObj) state_set = ATK_OBJECT_CLASS(parent_class)->ref_state_set(aAtkObj); PRUint32 accState = 0; - nsresult rv = accWrap->GetAccState(&accState); + nsresult rv = accWrap->GetState(&accState); NS_ENSURE_SUCCESS(rv, state_set); if (accState == 0) { - nsresult rv = accWrap->GetAccExtState(&accState); + nsresult rv = accWrap->GetExtState(&accState); NS_ENSURE_SUCCESS(rv, state_set); if (accState == 0) return state_set; diff --git a/accessible/src/atk/nsAccessibleWrap.h b/accessible/src/atk/nsAccessibleWrap.h index d2997a06e58..c4a8b601ad7 100644 --- a/accessible/src/atk/nsAccessibleWrap.h +++ b/accessible/src/atk/nsAccessibleWrap.h @@ -80,7 +80,7 @@ public: AtkObject * GetAtkObject(void); MaiInterface *GetMaiInterface(PRInt16 aIfaceType); - static void TranslateStates(PRUint32 aAccState, + static void TranslateStates(PRUint32 aState, void *aAtkStateSet); protected: AtkObject *mMaiAtkObject; diff --git a/accessible/src/atk/nsAppRootAccessible.cpp b/accessible/src/atk/nsAppRootAccessible.cpp index 1230e8fbe1d..92d36c1752f 100644 --- a/accessible/src/atk/nsAppRootAccessible.cpp +++ b/accessible/src/atk/nsAppRootAccessible.cpp @@ -560,27 +560,27 @@ NS_IMETHODIMP nsAppRootAccessible::Shutdown() return NS_OK; } -NS_IMETHODIMP nsAppRootAccessible::GetAccName(nsAString& _retval) +NS_IMETHODIMP nsAppRootAccessible::GetName(nsAString& _retval) { _retval = NS_LITERAL_STRING("Mozilla"); return NS_OK; } -NS_IMETHODIMP nsAppRootAccessible::GetAccDescription(nsAString& aDescription) +NS_IMETHODIMP nsAppRootAccessible::GetDescription(nsAString& aDescription) { aDescription = NS_LITERAL_STRING("Mozilla Root Accessible"); return NS_OK; } -NS_IMETHODIMP nsAppRootAccessible::GetAccRole(PRUint32 *aAccRole) +NS_IMETHODIMP nsAppRootAccessible::GetRole(PRUint32 *aRole) { - *aAccRole = ROLE_APPLICATION; + *aRole = ROLE_APPLICATION; return NS_OK; } -NS_IMETHODIMP nsAppRootAccessible::GetAccParent(nsIAccessible ** aAccParent) +NS_IMETHODIMP nsAppRootAccessible::GetParent(nsIAccessible ** aParent) { - *aAccParent = nsnull; + *aParent = nsnull; return NS_OK; } @@ -616,7 +616,7 @@ NS_IMETHODIMP nsAppRootAccessible::GetChildAt(PRInt32 aChildNum, return rv; } -NS_IMETHODIMP nsAppRootAccessible::GetAccChildCount(PRInt32 *aAccChildCount) +NS_IMETHODIMP nsAppRootAccessible::GetChildCount(PRInt32 *aAccChildCount) { PRUint32 count = 0; nsresult rv = NS_OK; @@ -632,27 +632,27 @@ NS_IMETHODIMP nsAppRootAccessible::GetAccChildCount(PRInt32 *aAccChildCount) return rv; } -NS_IMETHODIMP nsAppRootAccessible::GetAccFirstChild(nsIAccessible * *aAccFirstChild) +NS_IMETHODIMP nsAppRootAccessible::GetFirstChild(nsIAccessible * *aFirstChild) { nsCOMPtr firstChild; - *aAccFirstChild = nsnull; + *aFirstChild = nsnull; nsresult rv = NS_OK; rv = mChildren->QueryElementAt(0, NS_GET_IID(nsIAccessible), getter_AddRefs(firstChild)); if (firstChild) - NS_IF_ADDREF(*aAccFirstChild = firstChild); + NS_IF_ADDREF(*aFirstChild = firstChild); return rv; } -NS_IMETHODIMP nsAppRootAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) +NS_IMETHODIMP nsAppRootAccessible::GetNextSibling(nsIAccessible * *aNextSibling) { - *aAccNextSibling = nsnull; + *aNextSibling = nsnull; return NS_OK; } -NS_IMETHODIMP nsAppRootAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPreviousSibling) +NS_IMETHODIMP nsAppRootAccessible::GetPreviousSibling(nsIAccessible * *aPreviousSibling) { - *aAccPreviousSibling = nsnull; + *aPreviousSibling = nsnull; return NS_OK; } diff --git a/accessible/src/atk/nsAppRootAccessible.h b/accessible/src/atk/nsAppRootAccessible.h index c64834082f1..49e51c56f0b 100644 --- a/accessible/src/atk/nsAppRootAccessible.h +++ b/accessible/src/atk/nsAppRootAccessible.h @@ -77,16 +77,16 @@ public: NS_IMETHOD Shutdown(); /* virtual functions from nsAccessible */ - NS_IMETHOD GetAccName(nsAString & aAccName); - NS_IMETHOD GetAccDescription(nsAString & aAccDescription); - NS_IMETHOD GetAccRole(PRUint32 *aAccRole); - NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent); - NS_IMETHOD GetAccNextSibling(nsIAccessible * *aAccNextSibling); - NS_IMETHOD GetAccPreviousSibling(nsIAccessible **aAccPreviousSibling); + NS_IMETHOD GetName(nsAString & aName); + NS_IMETHOD GetDescription(nsAString & aDescription); + NS_IMETHOD GetRole(PRUint32 *aRole); + NS_IMETHOD GetParent(nsIAccessible * *aParent); + NS_IMETHOD GetNextSibling(nsIAccessible * *aNextSibling); + NS_IMETHOD GetPreviousSibling(nsIAccessible **aPreviousSibling); NS_IMETHOD GetChildAt(PRInt32 aChildNum, nsIAccessible **aChild); - NS_IMETHOD GetAccFirstChild(nsIAccessible * *aAccFirstChild); - NS_IMETHOD GetAccChildCount(PRInt32 *aAccChildCount); + NS_IMETHOD GetFirstChild(nsIAccessible * *aFirstChild); + NS_IMETHOD GetChildCount(PRInt32 *aAccChildCount); // return the atk object for app root accessible NS_IMETHOD GetNativeInterface(void **aOutAccessible); diff --git a/accessible/src/atk/nsDocAccessibleWrap.cpp b/accessible/src/atk/nsDocAccessibleWrap.cpp index eb0c5725792..c05d4251533 100644 --- a/accessible/src/atk/nsDocAccessibleWrap.cpp +++ b/accessible/src/atk/nsDocAccessibleWrap.cpp @@ -70,7 +70,7 @@ static char * sAtkPropertyNameArray[PROP_LAST] = { "accessible_table_summary" }; -static AtkStateType TranslateAState(PRUint32 aAccState); +static AtkStateType TranslateAState(PRUint32 aState); nsDocAccessibleWrap::nsDocAccessibleWrap(nsIDOMNode *aDOMNode, nsIWeakReference *aShell): @@ -405,9 +405,9 @@ NS_IMETHODIMP nsDocAccessibleWrap::FireToolkitEvent(PRUint32 aEvent, /* static */ AtkStateType -TranslateAState(PRUint32 aAccState) +TranslateAState(PRUint32 aState) { - switch (aAccState) { + switch (aState) { case nsIAccessible::STATE_SELECTED: return ATK_STATE_SELECTED; case nsIAccessible::STATE_FOCUSED: diff --git a/accessible/src/atk/nsHTMLBlockAccessible.cpp b/accessible/src/atk/nsHTMLBlockAccessible.cpp index 57fd0983006..5d383af3e31 100644 --- a/accessible/src/atk/nsHTMLBlockAccessible.cpp +++ b/accessible/src/atk/nsHTMLBlockAccessible.cpp @@ -46,7 +46,7 @@ nsBlockAccessible(aDomNode, aShell), nsAccessibleHyperText(aDomNode, aShell) { } -NS_IMETHODIMP nsHTMLBlockAccessible::GetAccName(nsAString& aName) +NS_IMETHODIMP nsHTMLBlockAccessible::GetName(nsAString& aName) { nsAutoString name(NS_LITERAL_STRING("Paragraph ")); name.AppendInt(GetIndex()); @@ -54,15 +54,15 @@ NS_IMETHODIMP nsHTMLBlockAccessible::GetAccName(nsAString& aName) return NS_OK; } -NS_IMETHODIMP nsHTMLBlockAccessible::GetAccRole(PRUint32 *aRole) +NS_IMETHODIMP nsHTMLBlockAccessible::GetRole(PRUint32 *aRole) { *aRole = ROLE_TEXT; return NS_OK; } -NS_IMETHODIMP nsHTMLBlockAccessible::GetAccState(PRUint32 *aState) +NS_IMETHODIMP nsHTMLBlockAccessible::GetState(PRUint32 *aState) { - nsAccessible::GetAccState(aState); + nsAccessible::GetState(aState); *aState &= ~STATE_FOCUSABLE; return NS_OK; } diff --git a/accessible/src/atk/nsHTMLBlockAccessible.h b/accessible/src/atk/nsHTMLBlockAccessible.h index 53552cfa554..f980da6db33 100644 --- a/accessible/src/atk/nsHTMLBlockAccessible.h +++ b/accessible/src/atk/nsHTMLBlockAccessible.h @@ -49,9 +49,9 @@ class nsHTMLBlockAccessible : public nsBlockAccessible, public: nsHTMLBlockAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAString& aName); - NS_IMETHOD GetAccRole(PRUint32 *aRole); - NS_IMETHOD GetAccState(PRUint32 *aState); + NS_IMETHOD GetName(nsAString& aName); + NS_IMETHOD GetRole(PRUint32 *aRole); + NS_IMETHOD GetState(PRUint32 *aState); NS_IMETHOD Shutdown(); }; diff --git a/accessible/src/atk/nsHTMLLinkAccessibleWrap.cpp b/accessible/src/atk/nsHTMLLinkAccessibleWrap.cpp index cd229bfd1bf..e2165ca2d9b 100644 --- a/accessible/src/atk/nsHTMLLinkAccessibleWrap.cpp +++ b/accessible/src/atk/nsHTMLLinkAccessibleWrap.cpp @@ -135,7 +135,7 @@ nsHTMLImageAccessible(aDomNode, aShell) /* readonly attribute long anchors; */ NS_IMETHODIMP nsHTMLImageMapAccessible::GetAnchors(PRInt32 *aAnchors) { - return GetAccChildCount(aAnchors); + return GetChildCount(aAnchors); } /* readonly attribute long startIndex; */ diff --git a/accessible/src/atk/nsHTMLTableAccessibleWrap.cpp b/accessible/src/atk/nsHTMLTableAccessibleWrap.cpp index 7f98a96cc1c..d7a3275b45b 100644 --- a/accessible/src/atk/nsHTMLTableAccessibleWrap.cpp +++ b/accessible/src/atk/nsHTMLTableAccessibleWrap.cpp @@ -113,7 +113,7 @@ nsHTMLTableAccessibleWrap::SetCaption(nsIAccessible *aCaption) NS_ENSURE_TRUE(table, NS_ERROR_FAILURE); nsCOMPtr domNode; - rv = aCaption->AccGetDOMNode(getter_AddRefs(domNode)); + rv = aCaption->GetDOMNode(getter_AddRefs(domNode)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr newDOMNode; @@ -551,7 +551,7 @@ nsHTMLTableAccessibleWrap(aDomNode, aShell) } NS_IMETHODIMP -nsHTMLTableHeadAccessible::GetAccRole(PRUint32 *aResult) +nsHTMLTableHeadAccessible::GetRole(PRUint32 *aResult) { *aResult = ROLE_COLUMNHEADER; return NS_OK; diff --git a/accessible/src/atk/nsHTMLTableAccessibleWrap.h b/accessible/src/atk/nsHTMLTableAccessibleWrap.h index 70db482d174..f5f5a818f57 100644 --- a/accessible/src/atk/nsHTMLTableAccessibleWrap.h +++ b/accessible/src/atk/nsHTMLTableAccessibleWrap.h @@ -82,7 +82,7 @@ public: nsHTMLTableHeadAccessible(nsIDOMNode *aDomNode, nsIWeakReference *aShell); /* nsIAccessible */ - NS_IMETHOD GetAccRole(PRUint32 *aResult); + NS_IMETHOD GetRole(PRUint32 *aResult); /* nsIAccessibleTable */ NS_IMETHOD GetCaption(nsIAccessible **aCaption); diff --git a/accessible/src/atk/nsMaiInterfaceAction.cpp b/accessible/src/atk/nsMaiInterfaceAction.cpp index 3dfa078a6e4..6007231b113 100644 --- a/accessible/src/atk/nsMaiInterfaceAction.cpp +++ b/accessible/src/atk/nsMaiInterfaceAction.cpp @@ -51,7 +51,7 @@ static gboolean doActionCB(AtkAction *aAction, gint aActionIndex); static gint getActionCountCB(AtkAction *aAction); static const gchar *getDescriptionCB(AtkAction *aAction, gint aActionIndex); static const gchar *getNameCB(AtkAction *aAction, gint aActionIndex); -static const gchar *getKeybindingCB(AtkAction *aAction, gint aActionIndex); +static const gchar *getKeyBindingCB(AtkAction *aAction, gint aActionIndex); static gboolean setDescriptionCB(AtkAction *aAction, gint aActionIndex, const gchar *aDesc); G_END_DECLS @@ -96,7 +96,7 @@ interfaceInitCB(AtkActionIface *aIface) aIface->do_action = doActionCB; aIface->get_n_actions = getActionCountCB; aIface->get_description = getDescriptionCB; - aIface->get_keybinding = getKeybindingCB; + aIface->get_keybinding = getKeyBindingCB; aIface->get_name = getNameCB; aIface->set_description = setDescriptionCB; } @@ -107,7 +107,7 @@ doActionCB(AtkAction *aAction, gint aActionIndex) nsAccessibleWrap *accWrap = GetAccessibleWrap(ATK_OBJECT(aAction)); NS_ENSURE_TRUE(accWrap, FALSE); - nsresult rv = accWrap->AccDoAction(aActionIndex); + nsresult rv = accWrap->DoAction(aActionIndex); return (NS_FAILED(rv)) ? FALSE : TRUE; } @@ -118,7 +118,7 @@ getActionCountCB(AtkAction *aAction) NS_ENSURE_TRUE(accWrap, 0); PRUint8 num = 0; - nsresult rv = accWrap->GetAccNumActions(&num); + nsresult rv = accWrap->GetNumActions(&num); return (NS_FAILED(rv)) ? 0 : NS_STATIC_CAST(gint, num); } @@ -144,7 +144,7 @@ getNameCB(AtkAction *aAction, gint aActionIndex) const char *name = action->GetName(); if (!name) { nsAutoString autoStr; - nsresult rv = accWrap->GetAccActionName(aActionIndex, autoStr); + nsresult rv = accWrap->GetActionName(aActionIndex, autoStr); NS_ENSURE_SUCCESS(rv, nsnull); action->SetName(autoStr); @@ -154,7 +154,7 @@ getNameCB(AtkAction *aAction, gint aActionIndex) } const gchar * -getKeybindingCB(AtkAction *aAction, gint aActionIndex) +getKeyBindingCB(AtkAction *aAction, gint aActionIndex) { nsAccessibleWrap *accWrap = GetAccessibleWrap(ATK_OBJECT(aAction)); NS_ENSURE_TRUE(accWrap, nsnull); @@ -167,26 +167,26 @@ getKeybindingCB(AtkAction *aAction, gint aActionIndex) if (action->GetKeyBinding()) return action->GetKeyBinding(); - //return all Keybindings including accesskey and shortcut + //return all KeyBindings including accesskey and shortcut - nsAutoString allKeybinding; + nsAutoString allKeyBinding; //get accesskey nsAutoString accessKey; - nsresult rv = accWrap->GetAccKeyboardShortcut(accessKey); + nsresult rv = accWrap->GetKeyboardShortcut(accessKey); if (NS_SUCCEEDED(rv) && !accessKey.IsEmpty()) { nsCOMPtr parentAccessible; - accWrap->GetAccParent(getter_AddRefs(parentAccessible)); + accWrap->GetParent(getter_AddRefs(parentAccessible)); if (parentAccessible) { PRUint32 role; - parentAccessible->GetAccRole(&role); + parentAccessible->GetRole(&role); if (role == ATK_ROLE_MENU_BAR) { //it is topmenu, change from "Alt+f" to "f;f" nsAutoString rightChar; accessKey.Right(rightChar, 1); - allKeybinding = rightChar + NS_LITERAL_STRING(";") + + allKeyBinding = rightChar + NS_LITERAL_STRING(";") + rightChar; } else if ((role == ATK_ROLE_MENU) || (role == ATK_ROLE_MENU_ITEM)) { @@ -196,7 +196,7 @@ getKeybindingCB(AtkAction *aAction, gint aActionIndex) while ((grandParentAcc) && (role != ATK_ROLE_MENU_BAR)) { nsAutoString grandParentKey; - grandParentAcc->GetAccKeyboardShortcut(grandParentKey); + grandParentAcc->GetKeyboardShortcut(grandParentKey); if (!grandParentKey.IsEmpty()) { nsAutoString rightChar; @@ -205,11 +205,11 @@ getKeybindingCB(AtkAction *aAction, gint aActionIndex) } nsCOMPtr tempAcc = grandParentAcc; - tempAcc->GetAccParent(getter_AddRefs(grandParentAcc)); + tempAcc->GetParent(getter_AddRefs(grandParentAcc)); if (grandParentAcc) - grandParentAcc->GetAccRole(&role); + grandParentAcc->GetRole(&role); } - allKeybinding = accessKey + NS_LITERAL_STRING(";") + + allKeyBinding = accessKey + NS_LITERAL_STRING(";") + allKey; } } @@ -217,15 +217,15 @@ getKeybindingCB(AtkAction *aAction, gint aActionIndex) //default process, rarely happens. nsAutoString rightChar; accessKey.Right(rightChar, 1); - allKeybinding = rightChar + NS_LITERAL_STRING(";") + rightChar; + allKeyBinding = rightChar + NS_LITERAL_STRING(";") + rightChar; } } else //don't have accesskey - allKeybinding = NS_LITERAL_STRING(";"); + allKeyBinding = NS_LITERAL_STRING(";"); //get shortcut nsAutoString keyBinding, subShortcut; - rv = accWrap->GetAccKeybinding(keyBinding); + rv = accWrap->GetKeyBinding(keyBinding); if (NS_SUCCEEDED(rv) && !keyBinding.IsEmpty()) { //change the shortcut from "Ctrl+Shift+L" to "L" @@ -252,8 +252,8 @@ getKeybindingCB(AtkAction *aAction, gint aActionIndex) } } - allKeybinding += NS_LITERAL_STRING(";") + subShortcut; - action->SetKeyBinding(allKeybinding); + allKeyBinding += NS_LITERAL_STRING(";") + subShortcut; + action->SetKeyBinding(allKeyBinding); return action->GetKeyBinding(); } diff --git a/accessible/src/atk/nsMaiInterfaceComponent.cpp b/accessible/src/atk/nsMaiInterfaceComponent.cpp index 72b60d5bceb..8d070e37c34 100644 --- a/accessible/src/atk/nsMaiInterfaceComponent.cpp +++ b/accessible/src/atk/nsMaiInterfaceComponent.cpp @@ -130,7 +130,7 @@ refAccessibleAtPointCB(AtkComponent *aComponent, } nsCOMPtr pointAcc; - nsresult rv = accWrap->AccGetAt(aAccX, aAccY, getter_AddRefs(pointAcc)); + nsresult rv = accWrap->GetChildAtPoint(aAccX, aAccY, getter_AddRefs(pointAcc)); if (NS_FAILED(rv)) return nsnull; @@ -157,7 +157,7 @@ getExtentsCB(AtkComponent *aComponent, return; PRInt32 nsAccX, nsAccY, nsAccWidth, nsAccHeight; - nsresult rv = accWrap->AccGetBounds(&nsAccX, &nsAccY, + nsresult rv = accWrap->GetBounds(&nsAccX, &nsAccY, &nsAccWidth, &nsAccHeight); if (NS_FAILED(rv)) return; @@ -178,6 +178,6 @@ grabFocusCB(AtkComponent *aComponent) nsAccessibleWrap *accWrap = GetAccessibleWrap(ATK_OBJECT(aComponent)); NS_ENSURE_TRUE(accWrap, FALSE); - nsresult rv = accWrap->AccTakeFocus(); + nsresult rv = accWrap->TakeFocus(); return (NS_FAILED(rv)) ? FALSE : TRUE; } diff --git a/accessible/src/atk/nsMaiInterfaceSelection.cpp b/accessible/src/atk/nsMaiInterfaceSelection.cpp index 58c0341c776..e61abf51a1a 100644 --- a/accessible/src/atk/nsMaiInterfaceSelection.cpp +++ b/accessible/src/atk/nsMaiInterfaceSelection.cpp @@ -115,7 +115,7 @@ addSelectionCB(AtkSelection *aSelection, gint i) getter_AddRefs(accSelection)); NS_ENSURE_TRUE(accSelection, FALSE); - return NS_SUCCEEDED(accSelection->AddSelection(i)); + return NS_SUCCEEDED(accSelection->AddChildToSelection(i)); } gboolean @@ -200,7 +200,7 @@ removeSelectionCB(AtkSelection *aSelection, gint i) getter_AddRefs(accSelection)); NS_ENSURE_TRUE(accSelection, FALSE); - nsresult rv = accSelection->RemoveSelection(i); + nsresult rv = accSelection->RemoveChildFromSelection(i); return (NS_FAILED(rv)) ? FALSE : TRUE; } diff --git a/accessible/src/atk/nsRootAccessibleWrap.cpp b/accessible/src/atk/nsRootAccessibleWrap.cpp index 21ebcb94b38..863a8dd8d4f 100644 --- a/accessible/src/atk/nsRootAccessibleWrap.cpp +++ b/accessible/src/atk/nsRootAccessibleWrap.cpp @@ -59,15 +59,15 @@ nsRootAccessibleWrap::~nsRootAccessibleWrap() root->RemoveRootAccessible(this); } -NS_IMETHODIMP nsRootAccessibleWrap::GetAccParent(nsIAccessible ** aAccParent) +NS_IMETHODIMP nsRootAccessibleWrap::GetParent(nsIAccessible ** aParent) { nsAppRootAccessible *root = nsAppRootAccessible::Create(); nsresult rv = NS_OK; if (root) { - NS_IF_ADDREF(*aAccParent = root); + NS_IF_ADDREF(*aParent = root); } else { - *aAccParent = nsnull; + *aParent = nsnull; rv = NS_ERROR_FAILURE; } return rv; diff --git a/accessible/src/atk/nsRootAccessibleWrap.h b/accessible/src/atk/nsRootAccessibleWrap.h index 8b74dd9a063..e1da34d4737 100644 --- a/accessible/src/atk/nsRootAccessibleWrap.h +++ b/accessible/src/atk/nsRootAccessibleWrap.h @@ -56,7 +56,7 @@ public: nsRootAccessibleWrap(nsIDOMNode *aDOMNode, nsIWeakReference* aShell); virtual ~nsRootAccessibleWrap(); - NS_IMETHOD GetAccParent(nsIAccessible ** aAccParent); + NS_IMETHOD GetParent(nsIAccessible ** aParent); }; #endif /* __NS_ROOT_ACCESSIBLE_WRAP_H__ */ diff --git a/accessible/src/atk/nsXULFormControlAccessibleWrap.cpp b/accessible/src/atk/nsXULFormControlAccessibleWrap.cpp index 600579f3342..8b9a11bce8c 100644 --- a/accessible/src/atk/nsXULFormControlAccessibleWrap.cpp +++ b/accessible/src/atk/nsXULFormControlAccessibleWrap.cpp @@ -65,7 +65,7 @@ NS_IMETHODIMP nsXULProgressMeterAccessibleWrap::GetMinimumValue(double *aMinimum NS_IMETHODIMP nsXULProgressMeterAccessibleWrap::GetCurrentValue(double *aCurrentValue) { nsAutoString currentValue; - GetAccValue(currentValue); + GetValue(currentValue); PRInt32 error; *aCurrentValue = currentValue.ToFloat(&error) / 100; return NS_OK; diff --git a/accessible/src/atk/nsXULTreeAccessibleWrap.cpp b/accessible/src/atk/nsXULTreeAccessibleWrap.cpp index 7c26df28b2f..0ea1d4eced6 100644 --- a/accessible/src/atk/nsXULTreeAccessibleWrap.cpp +++ b/accessible/src/atk/nsXULTreeAccessibleWrap.cpp @@ -82,10 +82,10 @@ NS_IMETHODIMP nsXULTreeAccessibleWrap::GetColumns(PRInt32 *aColumns) nsresult rv = NS_OK; nsCOMPtr acc; - rv = nsAccessible::GetAccFirstChild(getter_AddRefs(acc)); + rv = nsAccessible::GetFirstChild(getter_AddRefs(acc)); NS_ENSURE_TRUE(acc, NS_ERROR_FAILURE); - return acc->GetAccChildCount(aColumns); + return acc->GetChildCount(aColumns); } NS_IMETHODIMP nsXULTreeAccessibleWrap::GetColumnHeader(nsIAccessibleTable **aColumnHeader) @@ -93,7 +93,7 @@ NS_IMETHODIMP nsXULTreeAccessibleWrap::GetColumnHeader(nsIAccessibleTable **aCol nsresult rv = NS_OK; nsCOMPtr acc; - nsAccessible::GetAccFirstChild(getter_AddRefs(acc)); + nsAccessible::GetFirstChild(getter_AddRefs(acc)); NS_ENSURE_TRUE(acc, NS_ERROR_FAILURE); nsCOMPtr accTable(do_QueryInterface(acc, &rv)); @@ -206,7 +206,7 @@ NS_IMETHODIMP nsXULTreeAccessibleWrap::CellRefAt(PRInt32 aRow, PRInt32 aColumn, NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr columnNode; - rv = column->AccGetDOMNode(getter_AddRefs(columnNode)); + rv = column->GetDOMNode(getter_AddRefs(columnNode)); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr columnElement(do_QueryInterface(columnNode, &rv)); @@ -372,7 +372,7 @@ NS_IMETHODIMP nsXULTreeColumnsAccessibleWrap::SetSummary(const nsAString &aSumma NS_IMETHODIMP nsXULTreeColumnsAccessibleWrap::GetColumns(PRInt32 *aColumns) { - return GetAccChildCount(aColumns); + return GetChildCount(aColumns); } NS_IMETHODIMP nsXULTreeColumnsAccessibleWrap::GetColumnHeader(nsIAccessibleTable * *aColumnHeader) @@ -410,11 +410,11 @@ NS_IMETHODIMP nsXULTreeColumnsAccessibleWrap::GetSelectedRows(PRUint32 *rowsSize NS_IMETHODIMP nsXULTreeColumnsAccessibleWrap::CellRefAt(PRInt32 aRow, PRInt32 aColumn, nsIAccessible **_retval) { nsCOMPtr next, temp; - GetAccFirstChild(getter_AddRefs(next)); + GetFirstChild(getter_AddRefs(next)); NS_ENSURE_TRUE(next, NS_ERROR_FAILURE); for (PRInt32 col = 0; col < aColumn; col++) { - next->GetAccNextSibling(getter_AddRefs(temp)); + next->GetNextSibling(getter_AddRefs(temp)); NS_ENSURE_TRUE(temp, NS_ERROR_FAILURE); next = temp; diff --git a/accessible/src/base/nsAccessNode.cpp b/accessible/src/base/nsAccessNode.cpp index 469e1932324..0a6c15c3bdf 100755 --- a/accessible/src/base/nsAccessNode.cpp +++ b/accessible/src/base/nsAccessNode.cpp @@ -332,7 +332,7 @@ nsAccessNode::MakeAccessNode(nsIDOMNode *aNode, nsIAccessNode **aAccessNode) } NS_IMETHODIMP -nsAccessNode::GetFirstChild(nsIAccessNode **aAccessNode) +nsAccessNode::GetFirstChildNode(nsIAccessNode **aAccessNode) { NS_ENSURE_TRUE(mDOMNode, NS_ERROR_NULL_POINTER); @@ -344,7 +344,7 @@ nsAccessNode::GetFirstChild(nsIAccessNode **aAccessNode) } NS_IMETHODIMP -nsAccessNode::GetLastChild(nsIAccessNode **aAccessNode) +nsAccessNode::GetLastChildNode(nsIAccessNode **aAccessNode) { NS_ENSURE_TRUE(mDOMNode, NS_ERROR_NULL_POINTER); @@ -356,7 +356,7 @@ nsAccessNode::GetLastChild(nsIAccessNode **aAccessNode) } NS_IMETHODIMP -nsAccessNode::GetParent(nsIAccessNode **aAccessNode) +nsAccessNode::GetParentNode(nsIAccessNode **aAccessNode) { NS_ENSURE_TRUE(mDOMNode, NS_ERROR_NULL_POINTER); @@ -368,7 +368,7 @@ nsAccessNode::GetParent(nsIAccessNode **aAccessNode) } NS_IMETHODIMP -nsAccessNode::GetPreviousSibling(nsIAccessNode **aAccessNode) +nsAccessNode::GetPreviousSiblingNode(nsIAccessNode **aAccessNode) { NS_ENSURE_TRUE(mDOMNode, NS_ERROR_NULL_POINTER); @@ -380,7 +380,7 @@ nsAccessNode::GetPreviousSibling(nsIAccessNode **aAccessNode) } NS_IMETHODIMP -nsAccessNode::GetNextSibling(nsIAccessNode **aAccessNode) +nsAccessNode::GetNextSiblingNode(nsIAccessNode **aAccessNode) { NS_ENSURE_TRUE(mDOMNode, NS_ERROR_NULL_POINTER); @@ -392,7 +392,7 @@ nsAccessNode::GetNextSibling(nsIAccessNode **aAccessNode) } NS_IMETHODIMP -nsAccessNode::GetChildAt(PRInt32 aChildNum, nsIAccessNode **aAccessNode) +nsAccessNode::GetChildNodeAt(PRInt32 aChildNum, nsIAccessNode **aAccessNode) { nsCOMPtr child, content(do_QueryInterface(mDOMNode)); NS_ENSURE_TRUE(content, NS_ERROR_NULL_POINTER); diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp index 52b0b8c5727..33b3ab3f3ac 100644 --- a/accessible/src/base/nsAccessibilityService.cpp +++ b/accessible/src/base/nsAccessibilityService.cpp @@ -348,10 +348,10 @@ nsAccessibilityService::CreateHTML4ButtonAccessible(nsISupports *aFrame, nsIAcce } NS_IMETHODIMP -nsAccessibilityService::CreateHTMLAreaAccessible(nsIWeakReference *aShell, nsIDOMNode *aDOMNode, nsIAccessible *aAccParent, +nsAccessibilityService::CreateHTMLAreaAccessible(nsIWeakReference *aShell, nsIDOMNode *aDOMNode, nsIAccessible *aParent, nsIAccessible **_retval) { - *_retval = new nsHTMLAreaAccessible(aDOMNode, aAccParent, aShell); + *_retval = new nsHTMLAreaAccessible(aDOMNode, aParent, aShell); if (! *_retval) return NS_ERROR_OUT_OF_MEMORY; @@ -561,7 +561,7 @@ nsAccessibilityService::CreateHTMLObjectFrameAccessible(nsObjectFrame *aFrame, nsCOMPtr node; nsCOMPtr weakShell; nsIFrame *frame; - nsresult rv = GetInfo(NS_STATIC_CAST(nsIFrame*, aFrame), &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); + GetInfo(NS_STATIC_CAST(nsIFrame*, aFrame), &frame, getter_AddRefs(weakShell), getter_AddRefs(node)); // 1) for object elements containing either HTML or TXT documents nsCOMPtr domDoc; @@ -645,9 +645,9 @@ nsAccessibilityService::CreateHTMLRadioButtonAccessibleXBL(nsIDOMNode *aNode, ns NS_IMETHODIMP nsAccessibilityService::CreateHTMLSelectOptionAccessible(nsIDOMNode* aDOMNode, - nsIAccessible *aAccParent, - nsISupports* aPresContext, - nsIAccessible **_retval) + nsIAccessible *aParent, + nsISupports* aPresContext, + nsIAccessible **_retval) { nsCOMPtr presContext(do_QueryInterface(aPresContext)); NS_ASSERTION(presContext,"Error non prescontext passed to accessible factory!!!"); @@ -1578,10 +1578,10 @@ nsresult nsAccessibilityService::GetAccessible(nsIDOMNode *aNode, if (! newAcc) return NS_ERROR_FAILURE; PRUint32 role, state; - newAcc->GetAccRole(&role); + newAcc->GetRole(&role); // don't create the accessible object for popup widget when it's not visible if (role == nsIAccessible::ROLE_MENUPOPUP) { - newAcc->GetAccState(&state); + newAcc->GetState(&state); if (state & (nsIAccessible::STATE_INVISIBLE | nsIAccessible::STATE_OFFSCREEN)) return NS_ERROR_FAILURE; } diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp index 3b280dd0777..9b7bd3119b8 100644 --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -127,7 +127,7 @@ nsAccessible::~nsAccessible() { } -NS_IMETHODIMP nsAccessible::GetAccName(nsAString& _retval) +NS_IMETHODIMP nsAccessible::GetName(nsAString& _retval) { nsCOMPtr elt(do_QueryInterface(mDOMNode)); if (elt) @@ -135,7 +135,7 @@ NS_IMETHODIMP nsAccessible::GetAccName(nsAString& _retval) return NS_ERROR_FAILURE; } -NS_IMETHODIMP nsAccessible::GetAccDescription(nsAString& aDescription) +NS_IMETHODIMP nsAccessible::GetDescription(nsAString& aDescription) { // There are 3 conditions that make an accessible have no accDescription: // 1. it's a text node; or @@ -144,7 +144,7 @@ NS_IMETHODIMP nsAccessible::GetAccDescription(nsAString& aDescription) nsCOMPtr textContent(do_QueryInterface(mDOMNode)); if (!textContent) { nsAutoString name; - GetAccName(name); + GetName(name); if (!name.IsEmpty()) { // If there's already a name, we'll expose a description.if it's different than the name // If there is no name, then we know the title should really be exposed there @@ -159,7 +159,7 @@ NS_IMETHODIMP nsAccessible::GetAccDescription(nsAString& aDescription) return NS_OK; } -NS_IMETHODIMP nsAccessible::GetAccKeyboardShortcut(nsAString& _retval) +NS_IMETHODIMP nsAccessible::GetKeyboardShortcut(nsAString& _retval) { static PRInt32 gGeneralAccesskeyModifier = -1; // magic value of -1 indicates unitialized state @@ -192,19 +192,19 @@ NS_IMETHODIMP nsAccessible::GetAccKeyboardShortcut(nsAString& _retval) return NS_ERROR_FAILURE; } -NS_IMETHODIMP nsAccessible::SetAccParent(nsIAccessible *aParent) +NS_IMETHODIMP nsAccessible::SetParent(nsIAccessible *aParent) { mParent = aParent; return NS_OK; } -NS_IMETHODIMP nsAccessible::SetAccFirstChild(nsIAccessible *aFirstChild) +NS_IMETHODIMP nsAccessible::SetFirstChild(nsIAccessible *aFirstChild) { mFirstChild = aFirstChild; return NS_OK; } -NS_IMETHODIMP nsAccessible::SetAccNextSibling(nsIAccessible *aNextSibling) +NS_IMETHODIMP nsAccessible::SetNextSibling(nsIAccessible *aNextSibling) { mNextSibling = aNextSibling? aNextSibling: DEAD_END_ACCESSIBLE; return NS_OK; @@ -218,8 +218,8 @@ NS_IMETHODIMP nsAccessible::Shutdown() nsCOMPtr current(mFirstChild), next; while (current) { nsCOMPtr privateAcc(do_QueryInterface(current)); - privateAcc->SetAccParent(nsnull); - current->GetAccNextSibling(getter_AddRefs(next)); + privateAcc->SetParent(nsnull); + current->GetNextSibling(getter_AddRefs(next)); current = next; } } @@ -242,34 +242,34 @@ NS_IMETHODIMP nsAccessible::InvalidateChildren() return NS_OK; } -NS_IMETHODIMP nsAccessible::GetAccParent(nsIAccessible ** aAccParent) +NS_IMETHODIMP nsAccessible::GetParent(nsIAccessible ** aParent) { if (!mWeakShell) { // This node has been shut down - *aAccParent = nsnull; + *aParent = nsnull; return NS_ERROR_FAILURE; } if (mParent) { - *aAccParent = mParent; - NS_ADDREF(*aAccParent); + *aParent = mParent; + NS_ADDREF(*aParent); return NS_OK; } - *aAccParent = nsnull; + *aParent = nsnull; // Last argument of PR_TRUE indicates to walk anonymous content nsAccessibleTreeWalker walker(mWeakShell, mDOMNode, PR_TRUE); if (NS_SUCCEEDED(walker.GetParent())) { - *aAccParent = mParent = walker.mState.accessible; - NS_ADDREF(*aAccParent); + *aParent = mParent = walker.mState.accessible; + NS_ADDREF(*aParent); } return NS_OK; } - /* readonly attribute nsIAccessible accNextSibling; */ -NS_IMETHODIMP nsAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) + /* readonly attribute nsIAccessible nextSibling; */ +NS_IMETHODIMP nsAccessible::GetNextSibling(nsIAccessible * *aNextSibling) { - *aAccNextSibling = nsnull; + *aNextSibling = nsnull; if (!mWeakShell) { // This node has been shut down return NS_ERROR_FAILURE; @@ -278,7 +278,7 @@ NS_IMETHODIMP nsAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) // If no parent, don't try to calculate a new sibling // It either means we're at the root or shutting down the parent if (mNextSibling != DEAD_END_ACCESSIBLE) { - NS_IF_ADDREF(*aAccNextSibling = mNextSibling); + NS_IF_ADDREF(*aNextSibling = mNextSibling); } return NS_OK; } @@ -287,12 +287,12 @@ NS_IMETHODIMP nsAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) nsAccessibleTreeWalker walker(mWeakShell, mDOMNode, PR_TRUE); if (NS_SUCCEEDED(walker.GetNextSibling())) { - *aAccNextSibling = walker.mState.accessible; - NS_ADDREF(*aAccNextSibling); - nsCOMPtr privateAcc(do_QueryInterface(*aAccNextSibling)); - privateAcc->SetAccParent(mParent); + *aNextSibling = walker.mState.accessible; + NS_ADDREF(*aNextSibling); + nsCOMPtr privateAcc(do_QueryInterface(*aNextSibling)); + privateAcc->SetParent(mParent); - mNextSibling = *aAccNextSibling; + mNextSibling = *aNextSibling; } if (!mNextSibling) @@ -301,10 +301,10 @@ NS_IMETHODIMP nsAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) return NS_OK; } - /* readonly attribute nsIAccessible accPreviousSibling; */ -NS_IMETHODIMP nsAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPreviousSibling) + /* readonly attribute nsIAccessible previousSibling; */ +NS_IMETHODIMP nsAccessible::GetPreviousSibling(nsIAccessible * *aPreviousSibling) { - *aAccPreviousSibling = nsnull; + *aPreviousSibling = nsnull; if (!mWeakShell) { // This node has been shut down @@ -314,31 +314,31 @@ NS_IMETHODIMP nsAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPreviousS // Last argument of PR_TRUE indicates to walk anonymous content nsAccessibleTreeWalker walker(mWeakShell, mDOMNode, PR_TRUE); if (NS_SUCCEEDED(walker.GetPreviousSibling())) { - *aAccPreviousSibling = walker.mState.accessible; - NS_ADDREF(*aAccPreviousSibling); + *aPreviousSibling = walker.mState.accessible; + NS_ADDREF(*aPreviousSibling); // Use last walker state to cache data on prev accessible - nsCOMPtr privateAcc(do_QueryInterface(*aAccPreviousSibling)); - privateAcc->SetAccParent(mParent); + nsCOMPtr privateAcc(do_QueryInterface(*aPreviousSibling)); + privateAcc->SetParent(mParent); } return NS_OK; } - /* readonly attribute nsIAccessible accFirstChild; */ -NS_IMETHODIMP nsAccessible::GetAccFirstChild(nsIAccessible * *aAccFirstChild) + /* readonly attribute nsIAccessible firstChild; */ +NS_IMETHODIMP nsAccessible::GetFirstChild(nsIAccessible * *aFirstChild) { PRInt32 numChildren; - GetAccChildCount(&numChildren); // Make sure we cache all of the children + GetChildCount(&numChildren); // Make sure we cache all of the children - NS_IF_ADDREF(*aAccFirstChild = mFirstChild); + NS_IF_ADDREF(*aFirstChild = mFirstChild); return NS_OK; } - /* readonly attribute nsIAccessible accFirstChild; */ -NS_IMETHODIMP nsAccessible::GetAccLastChild(nsIAccessible * *aAccLastChild) + /* readonly attribute nsIAccessible lastChild; */ +NS_IMETHODIMP nsAccessible::GetLastChild(nsIAccessible * *aLastChild) { - GetChildAt(-1, aAccLastChild); + GetChildAt(-1, aLastChild); return NS_OK; } @@ -348,7 +348,7 @@ NS_IMETHODIMP nsAccessible::GetChildAt(PRInt32 aChildNum, nsIAccessible **aChild // If aChildNum is out of range, last child is returned PRInt32 numChildren; - GetAccChildCount(&numChildren); + GetChildCount(&numChildren); if (aChildNum >= numChildren || !mWeakShell) { *aChild = nsnull; @@ -363,7 +363,7 @@ NS_IMETHODIMP nsAccessible::GetChildAt(PRInt32 aChildNum, nsIAccessible **aChild if (++index > aChildNum) { break; } - nextSibling->GetAccNextSibling(getter_AddRefs(current)); + nextSibling->GetNextSibling(getter_AddRefs(current)); } NS_IF_ADDREF(*aChild = nextSibling); @@ -384,19 +384,19 @@ void nsAccessible::CacheChildren(PRBool aWalkAnonContent) nsCOMPtr privatePrevAccessible; mAccChildCount = 0; walker.GetFirstChild(); - SetAccFirstChild(walker.mState.accessible); + SetFirstChild(walker.mState.accessible); while (walker.mState.accessible) { ++mAccChildCount; privatePrevAccessible = do_QueryInterface(walker.mState.accessible); - privatePrevAccessible->SetAccParent(this); + privatePrevAccessible->SetParent(this); walker.GetNextSibling(); - privatePrevAccessible->SetAccNextSibling(walker.mState.accessible); + privatePrevAccessible->SetNextSibling(walker.mState.accessible); } } } -/* readonly attribute long accChildCount; */ -NS_IMETHODIMP nsAccessible::GetAccChildCount(PRInt32 *aAccChildCount) +/* readonly attribute long childCount; */ +NS_IMETHODIMP nsAccessible::GetChildCount(PRInt32 *aAccChildCount) { CacheChildren(PR_TRUE); *aAccChildCount = mAccChildCount; @@ -470,7 +470,7 @@ PRBool nsAccessible::IsPartiallyVisible(PRBool *aIsOffscreen) return PR_FALSE; // Get the bounds of the current frame, relative to the current view. - // We don't use the more accurate AccGetBounds, because that is more expensive + // We don't use the more accurate GetBoundsRect, because that is more expensive // and the STATE_OFFSCREEN flag that this is used for only needs to be a rough indicator nsRect relFrameRect; @@ -542,11 +542,11 @@ nsresult nsAccessible::GetFocusedNode(nsIDOMNode *aCurrentNode, nsIDOMNode **aFo return NS_ERROR_FAILURE; } -/* readonly attribute wstring accState; */ -NS_IMETHODIMP nsAccessible::GetAccState(PRUint32 *aAccState) +/* readonly attribute wstring state; */ +NS_IMETHODIMP nsAccessible::GetState(PRUint32 *aState) { nsresult rv = NS_OK; - *aAccState = 0; + *aState = 0; nsCOMPtr currElement(do_QueryInterface(mDOMNode)); if (currElement) { @@ -557,30 +557,30 @@ NS_IMETHODIMP nsAccessible::GetAccState(PRUint32 *aAccState) PRBool isDisabled = PR_FALSE; currElement->HasAttribute(NS_LITERAL_STRING("disabled"), &isDisabled); if (isDisabled) - *aAccState |= STATE_UNAVAILABLE; + *aState |= STATE_UNAVAILABLE; else { - *aAccState |= STATE_FOCUSABLE; + *aState |= STATE_FOCUSABLE; nsCOMPtr focusedNode; if (NS_SUCCEEDED(GetFocusedNode(mDOMNode, getter_AddRefs(focusedNode))) && focusedNode == mDOMNode) - *aAccState |= STATE_FOCUSED; + *aState |= STATE_FOCUSED; } } // Check if STATE_OFFSCREEN bitflag should be turned on for this object PRBool isOffscreen; if (!IsPartiallyVisible(&isOffscreen)) { - *aAccState |= STATE_INVISIBLE; + *aState |= STATE_INVISIBLE; if (isOffscreen) - *aAccState |= STATE_OFFSCREEN; + *aState |= STATE_OFFSCREEN; } return rv; } - /* readonly attribute boolean accFocused; */ -NS_IMETHODIMP nsAccessible::GetAccFocused(nsIAccessible **aAccFocused) + /* readonly attribute boolean focusedChild; */ +NS_IMETHODIMP nsAccessible::GetFocusedChild(nsIAccessible **aFocusedChild) { - *aAccFocused = nsnull; + *aFocusedChild = nsnull; nsCOMPtr accService(do_GetService("@mozilla.org/accessibilityService;1")); @@ -591,8 +591,8 @@ NS_IMETHODIMP nsAccessible::GetAccFocused(nsIAccessible **aAccFocused) if (NS_SUCCEEDED(accService->GetAccessibleInWeakShell(focusedNode, mWeakShell, getter_AddRefs(accessible)))) { - *aAccFocused = accessible; - NS_ADDREF(*aAccFocused); + *aFocusedChild = accessible; + NS_ADDREF(*aFocusedChild); return NS_OK; } } @@ -600,11 +600,11 @@ NS_IMETHODIMP nsAccessible::GetAccFocused(nsIAccessible **aAccFocused) return NS_ERROR_FAILURE; } - /* nsIAccessible accGetChildAt (in long x, in long y); */ -NS_IMETHODIMP nsAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval) + /* nsIAccessible getChildAtPoint (in long x, in long y); */ +NS_IMETHODIMP nsAccessible::GetChildAtPoint(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval) { PRInt32 x, y, w, h; - AccGetBounds(&x,&y,&w,&h); + GetBounds(&x,&y,&w,&h); if (tx >= x && tx < x + w && ty >= y && ty < y + h) { @@ -612,9 +612,9 @@ NS_IMETHODIMP nsAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_re nsCOMPtr next; PRInt32 numChildren; // Make sure all children cached first - GetAccChildCount(&numChildren); + GetChildCount(&numChildren); - GetAccFirstChild(getter_AddRefs(child)); + GetFirstChild(getter_AddRefs(child)); PRInt32 cx,cy,cw,ch; @@ -622,18 +622,18 @@ NS_IMETHODIMP nsAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_re // First test if offscreen bit is set for menus // We don't want to walk into offscreen menus or menu items PRUint32 role = ROLE_NOTHING, state = 0; - child->GetAccRole(&role); + child->GetRole(&role); if (role == ROLE_MENUPOPUP || role == ROLE_MENUITEM || role == ROLE_SEPARATOR) { - child->GetAccState(&state); + child->GetState(&state); if (role == ROLE_MENUPOPUP && (state&STATE_OFFSCREEN) == 0) { // Skip menupopup layer and go straight to menuitem's - return child->AccGetAt(tx, ty, _retval); + return child->GetChildAtPoint(tx, ty, _retval); } } if ((state & STATE_OFFSCREEN) == 0) { // Don't walk into offscreen menu items - child->AccGetBounds(&cx,&cy,&cw,&ch); + child->GetBounds(&cx,&cy,&cw,&ch); if (tx >= cx && tx < cx + cw && ty >= cy && ty < cy + ch) { *_retval = child; @@ -641,7 +641,7 @@ NS_IMETHODIMP nsAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_re return NS_OK; } } - child->GetAccNextSibling(getter_AddRefs(next)); + child->GetNextSibling(getter_AddRefs(next)); child = next; } } @@ -651,7 +651,7 @@ NS_IMETHODIMP nsAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_re return NS_OK; } -NS_IMETHODIMP nsAccessible::AccGetDOMNode(nsIDOMNode **_retval) +NS_IMETHODIMP nsAccessible::GetDOMNode(nsIDOMNode **_retval) { *_retval = mDOMNode; NS_IF_ADDREF(*_retval); @@ -724,7 +724,7 @@ void nsAccessible::GetScrollOffset(nsRect *aRect) } -void nsAccessible::GetBounds(nsRect& aTotalBounds, nsIFrame** aBoundingFrame) +void nsAccessible::GetBoundsRect(nsRect& aTotalBounds, nsIFrame** aBoundingFrame) { /* * This method is used to determine the bounds of a content node. @@ -823,8 +823,8 @@ void nsAccessible::GetBounds(nsRect& aTotalBounds, nsIFrame** aBoundingFrame) } -/* void accGetBounds (out long x, out long y, out long width, out long height); */ -NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height) +/* void getBounds (out long x, out long y, out long width, out long height); */ +NS_IMETHODIMP nsAccessible::GetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height) { // This routine will get the entire rectange for all the frames in this node // ------------------------------------------------------------------------- @@ -844,7 +844,7 @@ NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, nsRect unionRectTwips; nsIFrame* aBoundingFrame = nsnull; - GetBounds(unionRectTwips, &aBoundingFrame); // Unions up all primary frames for this node and all siblings after it + GetBoundsRect(unionRectTwips, &aBoundingFrame); // Unions up all primary frames for this node and all siblings after it if (!aBoundingFrame) { *x = *y = *width = *height = 0; return NS_ERROR_FAILURE; @@ -860,7 +860,7 @@ NS_IMETHODIMP nsAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, nsRect orgRectPixels, pageRectPixels; GetScreenOrigin(presContext, aBoundingFrame, &orgRectPixels); PRUint32 role; - GetAccRole(&role); + GetRole(&role); if (role != ROLE_PANE) GetScrollOffset(&pageRectPixels); // Add scroll offsets if not the document itself *x += orgRectPixels.x - pageRectPixels.x; @@ -893,8 +893,8 @@ nsIFrame* nsAccessible::GetBoundsFrame() return GetFrame(); } -/* void accRemoveSelection (); */ -NS_IMETHODIMP nsAccessible::AccRemoveSelection() +/* void removeSelection (); */ +NS_IMETHODIMP nsAccessible::RemoveSelection() { nsCOMPtr control(do_QueryReferent(mWeakShell)); if (!control) { @@ -918,8 +918,8 @@ NS_IMETHODIMP nsAccessible::AccRemoveSelection() return NS_OK; } -/* void accTakeSelection (); */ -NS_IMETHODIMP nsAccessible::AccTakeSelection() +/* void takeSelection (); */ +NS_IMETHODIMP nsAccessible::TakeSelection() { nsCOMPtr control(do_QueryReferent(mWeakShell)); if (!control) @@ -965,8 +965,8 @@ NS_IMETHODIMP nsAccessible::AccTakeSelection() return NS_ERROR_FAILURE; } -/* void accTakeFocus (); */ -NS_IMETHODIMP nsAccessible::AccTakeFocus() +/* void takeFocus (); */ +NS_IMETHODIMP nsAccessible::TakeFocus() { nsCOMPtr content(do_QueryInterface(mDOMNode)); if (!content) { @@ -1204,7 +1204,7 @@ NS_IMETHODIMP nsAccessible::AppendLabelFor(nsIContent *aLookNode, const nsAStrin * 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(nsAString& _retval) +NS_IMETHODIMP nsAccessible::GetHTMLName(nsAString& _retval) { if (!mWeakShell || !mDOMNode) { return NS_ERROR_FAILURE; @@ -1246,7 +1246,7 @@ NS_IMETHODIMP nsAccessible::GetHTMLAccName(nsAString& _retval) label.CompressWhitespace(); if (label.IsEmpty()) - return nsAccessible::GetAccName(_retval); + return nsAccessible::GetName(_retval); _retval.Assign(label); @@ -1265,8 +1265,7 @@ NS_IMETHODIMP nsAccessible::GetHTMLAccName(nsAString& _retval) * the control that uses the control="controlID" syntax will use * the child label for its Name. */ -/* wstring getAccName (); */ -NS_IMETHODIMP nsAccessible::GetXULAccName(nsAString& _retval) +NS_IMETHODIMP nsAccessible::GetXULName(nsAString& _retval) { nsresult rv; nsAutoString label; @@ -1361,92 +1360,92 @@ NS_IMETHODIMP nsAccessible::FireToolkitEvent(PRUint32 aEvent, nsIAccessible *aTa // Not implemented by this class -/* DOMString getAccValue (); */ -NS_IMETHODIMP nsAccessible::GetAccValue(nsAString& _retval) +/* DOMString getValue (); */ +NS_IMETHODIMP nsAccessible::GetValue(nsAString& _retval) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void setAccName (in DOMString name); */ -NS_IMETHODIMP nsAccessible::SetAccName(const nsAString& name) +/* void setName (in DOMString name); */ +NS_IMETHODIMP nsAccessible::SetName(const nsAString& name) { return NS_ERROR_NOT_IMPLEMENTED; } -/* DOMString getKeybinding (); */ -NS_IMETHODIMP nsAccessible::GetAccKeybinding(nsAString& _retval) +/* DOMString getKeyBinding (); */ +NS_IMETHODIMP nsAccessible::GetKeyBinding(nsAString& _retval) { return NS_ERROR_NOT_IMPLEMENTED; } -/* unsigned long getAccRole (); */ -NS_IMETHODIMP nsAccessible::GetAccRole(PRUint32 *_retval) +/* unsigned long getRole (); */ +NS_IMETHODIMP nsAccessible::GetRole(PRUint32 *_retval) { return NS_ERROR_NOT_IMPLEMENTED; } /* PRUint8 getAccNumActions (); */ -NS_IMETHODIMP nsAccessible::GetAccNumActions(PRUint8 *_retval) +NS_IMETHODIMP nsAccessible::GetNumActions(PRUint8 *_retval) { return NS_ERROR_NOT_IMPLEMENTED; } /* DOMString getAccActionName (in PRUint8 index); */ -NS_IMETHODIMP nsAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) +NS_IMETHODIMP nsAccessible::GetActionName(PRUint8 index, nsAString& _retval) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void accDoAction (in PRUint8 index); */ -NS_IMETHODIMP nsAccessible::AccDoAction(PRUint8 index) +/* void doAction (in PRUint8 index); */ +NS_IMETHODIMP nsAccessible::DoAction(PRUint8 index) { return NS_ERROR_NOT_IMPLEMENTED; } -/* DOMString getAccHelp (); */ -NS_IMETHODIMP nsAccessible::GetAccHelp(nsAString& _retval) +/* DOMString getHelp (); */ +NS_IMETHODIMP nsAccessible::GetHelp(nsAString& _retval) { return NS_ERROR_NOT_IMPLEMENTED; } -/* nsIAccessible accGetFromRight(); */ -NS_IMETHODIMP nsAccessible::AccGetFromRight(nsIAccessible **_retval) +/* nsIAccessible getAccessibleToRight(); */ +NS_IMETHODIMP nsAccessible::GetAccessibleToRight(nsIAccessible **_retval) { return NS_ERROR_NOT_IMPLEMENTED; } -/* nsIAccessible accGetFromLeft(); */ -NS_IMETHODIMP nsAccessible::AccGetFromLeft(nsIAccessible **_retval) +/* nsIAccessible getAccessibleToLeft(); */ +NS_IMETHODIMP nsAccessible::GetAccessibleToLeft(nsIAccessible **_retval) { return NS_ERROR_NOT_IMPLEMENTED; } -/* nsIAccessible accGetFromAbove(); */ -NS_IMETHODIMP nsAccessible::AccGetFromAbove(nsIAccessible **_retval) +/* nsIAccessible getAccessibleAbove(); */ +NS_IMETHODIMP nsAccessible::GetAccessibleAbove(nsIAccessible **_retval) { return NS_ERROR_NOT_IMPLEMENTED; } -/* nsIAccessible accGetFromBelow(); */ -NS_IMETHODIMP nsAccessible::AccGetFromBelow(nsIAccessible **_retval) +/* nsIAccessible getAccessibleBelow(); */ +NS_IMETHODIMP nsAccessible::GetAccessibleBelow(nsIAccessible **_retval) { return NS_ERROR_NOT_IMPLEMENTED; } -/* void accAddSelection (); */ -NS_IMETHODIMP nsAccessible::AccAddSelection() +/* void addSelection (); */ +NS_IMETHODIMP nsAccessible::AddSelection() { return NS_ERROR_NOT_IMPLEMENTED; } -/* void accExtendSelection (); */ -NS_IMETHODIMP nsAccessible::AccExtendSelection() +/* void extendSelection (); */ +NS_IMETHODIMP nsAccessible::ExtendSelection() { return NS_ERROR_NOT_IMPLEMENTED; } -/* unsigned long getAccExtState (); */ -NS_IMETHODIMP nsAccessible::GetAccExtState(PRUint32 *_retval) +/* unsigned long getExtState (); */ +NS_IMETHODIMP nsAccessible::GetExtState(PRUint32 *_retval) { return NS_ERROR_NOT_IMPLEMENTED; } diff --git a/accessible/src/base/nsAccessible.h b/accessible/src/base/nsAccessible.h index 79b75657667..7e8b40fb2f9 100644 --- a/accessible/src/base/nsAccessible.h +++ b/accessible/src/base/nsAccessible.h @@ -86,12 +86,12 @@ public: protected: virtual nsIFrame* GetBoundsFrame(); - virtual void GetBounds(nsRect& aRect, nsIFrame** aRelativeFrame); + virtual void GetBoundsRect(nsRect& aRect, nsIFrame** aRelativeFrame); PRBool IsPartiallyVisible(PRBool *aIsOffscreen); 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 GetHTMLName(nsAString& _retval); + NS_IMETHOD GetXULName(nsAString& _retval); NS_IMETHOD AppendFlatStringFromSubtree(nsIContent *aContent, nsAString *aFlatString); NS_IMETHOD AppendFlatStringFromContentNode(nsIContent *aContent, nsAString *aFlatString); NS_IMETHOD AppendStringWithSpaces(nsAString *aFlatString, const nsAString& textEquivalent); diff --git a/accessible/src/base/nsAccessibleEventData.h b/accessible/src/base/nsAccessibleEventData.h index 1d824b17183..51a2b0d45e0 100644 --- a/accessible/src/base/nsAccessibleEventData.h +++ b/accessible/src/base/nsAccessibleEventData.h @@ -51,6 +51,7 @@ class nsAccessibleEventData: public nsIAccessibleEvent nsAccessibleEventData(PRUint32 aEventType, nsIAccessible *aAccessible, nsIAccessibleDocument *aDocAccessible, void *aEventData); + virtual ~nsAccessibleEventData() {}; NS_DECL_ISUPPORTS diff --git a/accessible/src/base/nsBaseWidgetAccessible.cpp b/accessible/src/base/nsBaseWidgetAccessible.cpp index af0827b5c87..71d2e6b8813 100644 --- a/accessible/src/base/nsBaseWidgetAccessible.cpp +++ b/accessible/src/base/nsBaseWidgetAccessible.cpp @@ -58,11 +58,11 @@ nsBlockAccessible::nsBlockAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell NS_IMPL_ISUPPORTS_INHERITED0(nsBlockAccessible, nsAccessible) /* nsIAccessible accGetAt (in long x, in long y); */ -NS_IMETHODIMP nsBlockAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval) +NS_IMETHODIMP nsBlockAccessible::GetChildAtPoint(PRInt32 tx, PRInt32 ty, nsIAccessible **_retval) { // We're going to find the child that contains coordinates (tx,ty) PRInt32 x,y,w,h; - AccGetBounds(&x,&y,&w,&h); // Get bounds for this accessible + GetBounds(&x,&y,&w,&h); // Get bounds for this accessible if (tx >= x && tx < x + w && ty >= y && ty < y + h) { // It's within this nsIAccessible, let's drill down @@ -70,11 +70,11 @@ NS_IMETHODIMP nsBlockAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible nsCOMPtr smallestChild; PRInt32 smallestArea = -1; nsCOMPtr next; - GetAccFirstChild(getter_AddRefs(child)); + GetFirstChild(getter_AddRefs(child)); PRInt32 cx,cy,cw,ch; // Child bounds while(child) { - child->AccGetBounds(&cx,&cy,&cw,&ch); + child->GetBounds(&cx,&cy,&cw,&ch); // ok if there are multiple frames the contain the point // and they overlap then pick the smallest. We need to do this @@ -92,7 +92,7 @@ NS_IMETHODIMP nsBlockAccessible::AccGetAt(PRInt32 tx, PRInt32 ty, nsIAccessible smallestChild = child; } } - child->GetAccNextSibling(getter_AddRefs(next)); + child->GetNextSibling(getter_AddRefs(next)); child = next; } @@ -124,22 +124,22 @@ nsAccessibleWrap(aNode, aShell) NS_IMPL_ISUPPORTS_INHERITED0(nsLeafAccessible, nsAccessible) -/* nsIAccessible getAccFirstChild (); */ -NS_IMETHODIMP nsLeafAccessible::GetAccFirstChild(nsIAccessible **_retval) +/* nsIAccessible getFirstChild (); */ +NS_IMETHODIMP nsLeafAccessible::GetFirstChild(nsIAccessible **_retval) { *_retval = nsnull; return NS_OK; } -/* nsIAccessible getAccLastChild (); */ -NS_IMETHODIMP nsLeafAccessible::GetAccLastChild(nsIAccessible **_retval) +/* nsIAccessible getLastChild (); */ +NS_IMETHODIMP nsLeafAccessible::GetLastChild(nsIAccessible **_retval) { *_retval = nsnull; return NS_OK; } /* long getAccChildCount (); */ -NS_IMETHODIMP nsLeafAccessible::GetAccChildCount(PRInt32 *_retval) +NS_IMETHODIMP nsLeafAccessible::GetChildCount(PRInt32 *_retval) { *_retval = 0; return NS_OK; @@ -160,7 +160,7 @@ nsLinkableAccessible::nsLinkableAccessible(nsIDOMNode* aNode, nsIWeakReference* NS_IMPL_ISUPPORTS_INHERITED0(nsLinkableAccessible, nsAccessible) -NS_IMETHODIMP nsLinkableAccessible::AccTakeFocus() +NS_IMETHODIMP nsLinkableAccessible::TakeFocus() { if (IsALink()) { mLinkContent->SetFocus(nsCOMPtr(GetPresContext())); @@ -169,10 +169,10 @@ NS_IMETHODIMP nsLinkableAccessible::AccTakeFocus() return NS_OK; } -/* long GetAccState (); */ -NS_IMETHODIMP nsLinkableAccessible::GetAccState(PRUint32 *aState) +/* long GetState (); */ +NS_IMETHODIMP nsLinkableAccessible::GetState(PRUint32 *aState) { - nsAccessible::GetAccState(aState); + nsAccessible::GetState(aState); if (IsALink()) { *aState |= STATE_LINKED; if (mIsLinkVisited) @@ -182,13 +182,13 @@ NS_IMETHODIMP nsLinkableAccessible::GetAccState(PRUint32 *aState) if (IsALink()) { // Make sure we also include all the states of the parent link, such as focusable, focused, etc. PRUint32 role; - GetAccRole(&role); + GetRole(&role); if (role != ROLE_LINK) { nsCOMPtr parentAccessible; - GetAccParent(getter_AddRefs(parentAccessible)); + GetParent(getter_AddRefs(parentAccessible)); if (parentAccessible) { PRUint32 orState = 0; - parentAccessible->GetAccState(&orState); + parentAccessible->GetState(&orState); *aState |= orState; } } @@ -206,7 +206,7 @@ NS_IMETHODIMP nsLinkableAccessible::GetAccState(PRUint32 *aState) } -NS_IMETHODIMP nsLinkableAccessible::GetAccValue(nsAString& _retval) +NS_IMETHODIMP nsLinkableAccessible::GetValue(nsAString& _retval) { if (IsALink()) { nsCOMPtr linkNode(do_QueryInterface(mLinkContent)); @@ -219,14 +219,14 @@ NS_IMETHODIMP nsLinkableAccessible::GetAccValue(nsAString& _retval) /* PRUint8 getAccNumActions (); */ -NS_IMETHODIMP nsLinkableAccessible::GetAccNumActions(PRUint8 *_retval) +NS_IMETHODIMP nsLinkableAccessible::GetNumActions(PRUint8 *_retval) { *_retval = eSingle_Action; return NS_OK; } /* wstring getAccActionName (in PRUint8 index); */ -NS_IMETHODIMP nsLinkableAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) +NS_IMETHODIMP nsLinkableAccessible::GetActionName(PRUint8 index, nsAString& _retval) { // Action 0 (default action): Jump to link if (index == eAction_Jump) { @@ -240,7 +240,7 @@ NS_IMETHODIMP nsLinkableAccessible::GetAccActionName(PRUint8 index, nsAString& _ } /* void accDoAction (in PRUint8 index); */ -NS_IMETHODIMP nsLinkableAccessible::AccDoAction(PRUint8 index) +NS_IMETHODIMP nsLinkableAccessible::DoAction(PRUint8 index) { // Action 0 (default action): Jump to link if (index == eAction_Jump) { @@ -270,7 +270,7 @@ NS_IMETHODIMP nsLinkableAccessible::AccDoAction(PRUint8 index) return NS_ERROR_INVALID_ARG; } -NS_IMETHODIMP nsLinkableAccessible::GetAccKeyboardShortcut(nsAString& _retval) +NS_IMETHODIMP nsLinkableAccessible::GetKeyboardShortcut(nsAString& _retval) { if (IsALink()) { nsresult rv; @@ -282,12 +282,12 @@ NS_IMETHODIMP nsLinkableAccessible::GetAccKeyboardShortcut(nsAString& _retval) rv = accService->GetAccessibleInWeakShell(linkNode, mWeakShell, getter_AddRefs(linkAccessible)); if (NS_SUCCEEDED(rv) && linkAccessible) - return linkAccessible->GetAccKeyboardShortcut(_retval); + return linkAccessible->GetKeyboardShortcut(_retval); else return rv; } } - return nsAccessible::GetAccKeyboardShortcut(_retval);; + return nsAccessible::GetKeyboardShortcut(_retval);; } PRBool nsLinkableAccessible::IsALink() diff --git a/accessible/src/base/nsBaseWidgetAccessible.h b/accessible/src/base/nsBaseWidgetAccessible.h index 81a2408e88c..083ee0a136f 100644 --- a/accessible/src/base/nsBaseWidgetAccessible.h +++ b/accessible/src/base/nsBaseWidgetAccessible.h @@ -59,7 +59,7 @@ class nsBlockAccessible : public nsAccessibleWrap public: nsBlockAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_DECL_ISUPPORTS_INHERITED - NS_IMETHOD AccGetAt(PRInt32 x, PRInt32 y, nsIAccessible **_retval); + NS_IMETHOD GetChildAtPoint(PRInt32 x, PRInt32 y, nsIAccessible **_retval); }; /** @@ -70,9 +70,9 @@ class nsLeafAccessible : public nsAccessibleWrap public: nsLeafAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_DECL_ISUPPORTS_INHERITED - NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); - NS_IMETHOD GetAccLastChild(nsIAccessible **_retval); - NS_IMETHOD GetAccChildCount(PRInt32 *_retval); + NS_IMETHOD GetFirstChild(nsIAccessible **_retval); + NS_IMETHOD GetLastChild(nsIAccessible **_retval); + NS_IMETHOD GetChildCount(PRInt32 *_retval); }; /** @@ -85,13 +85,13 @@ class nsLinkableAccessible : public nsAccessibleWrap public: nsLinkableAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_DECL_ISUPPORTS_INHERITED - NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); - NS_IMETHOD AccDoAction(PRUint8 index); - NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccValue(nsAString& _retval); - NS_IMETHOD AccTakeFocus(); - NS_IMETHOD GetAccKeyboardShortcut(nsAString& _retval); + NS_IMETHOD GetNumActions(PRUint8 *_retval); + NS_IMETHOD GetActionName(PRUint8 index, nsAString& _retval); + NS_IMETHOD DoAction(PRUint8 index); + NS_IMETHOD GetState(PRUint32 *_retval); + NS_IMETHOD GetValue(nsAString& _retval); + NS_IMETHOD TakeFocus(); + NS_IMETHOD GetKeyboardShortcut(nsAString& _retval); NS_IMETHOD Shutdown(); protected: diff --git a/accessible/src/base/nsCaretAccessible.cpp b/accessible/src/base/nsCaretAccessible.cpp index 503499fd79c..04e4d1b76a3 100644 --- a/accessible/src/base/nsCaretAccessible.cpp +++ b/accessible/src/base/nsCaretAccessible.cpp @@ -243,7 +243,7 @@ NS_IMETHODIMP nsCaretAccessible::NotifySelectionChanged(nsIDOMDocument *aDoc, ns } /** Return the caret's bounds */ -NS_IMETHODIMP nsCaretAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height) +NS_IMETHODIMP nsCaretAccessible::GetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height) { if (!mVisible) return NS_ERROR_FAILURE; // When root accessible hasn't yet called SetCaretBounds() @@ -254,30 +254,30 @@ NS_IMETHODIMP nsCaretAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *w return NS_OK; } -NS_IMETHODIMP nsCaretAccessible::GetAccRole(PRUint32 *_retval) +NS_IMETHODIMP nsCaretAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_CARET; return NS_OK; } -NS_IMETHODIMP nsCaretAccessible::GetAccState(PRUint32 *_retval) +NS_IMETHODIMP nsCaretAccessible::GetState(PRUint32 *_retval) { *_retval = mVisible? 0: STATE_INVISIBLE; return NS_OK; } -NS_IMETHODIMP nsCaretAccessible::GetAccParent(nsIAccessible **_retval) +NS_IMETHODIMP nsCaretAccessible::GetParent(nsIAccessible **_retval) { *_retval = nsnull; return NS_OK; } -NS_IMETHODIMP nsCaretAccessible::GetAccPreviousSibling(nsIAccessible **_retval) +NS_IMETHODIMP nsCaretAccessible::GetPreviousSibling(nsIAccessible **_retval) { *_retval = nsnull; return NS_OK; } -NS_IMETHODIMP nsCaretAccessible::GetAccNextSibling(nsIAccessible **_retval) +NS_IMETHODIMP nsCaretAccessible::GetNextSibling(nsIAccessible **_retval) { *_retval = nsnull; return NS_OK; diff --git a/accessible/src/base/nsCaretAccessible.h b/accessible/src/base/nsCaretAccessible.h index 3a0d5046ba8..efd8773940f 100644 --- a/accessible/src/base/nsCaretAccessible.h +++ b/accessible/src/base/nsCaretAccessible.h @@ -64,12 +64,12 @@ public: nsCaretAccessible(nsIDOMNode* aDocumentNode, nsIWeakReference* aShell, nsRootAccessible *aRootAccessible); /* ----- nsIAccessible ----- */ - NS_IMETHOD GetAccParent(nsIAccessible **_retval); - NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height); - NS_IMETHOD GetAccNextSibling(nsIAccessible **_retval); - NS_IMETHOD GetAccPreviousSibling(nsIAccessible **_retval); + NS_IMETHOD GetParent(nsIAccessible **_retval); + NS_IMETHOD GetRole(PRUint32 *_retval); + NS_IMETHOD GetState(PRUint32 *_retval); + NS_IMETHOD GetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height); + NS_IMETHOD GetNextSibling(nsIAccessible **_retval); + NS_IMETHOD GetPreviousSibling(nsIAccessible **_retval); /* ----- nsIAccessibleCaret ------ */ NS_IMETHOD AttachNewSelectionListener(nsIDOMNode *aFocusedNode); diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp index c53c333022e..8a4a07593b5 100644 --- a/accessible/src/base/nsDocAccessible.cpp +++ b/accessible/src/base/nsDocAccessible.cpp @@ -133,27 +133,27 @@ NS_INTERFACE_MAP_END_INHERITING(nsBlockAccessible) NS_IMPL_ADDREF_INHERITED(nsDocAccessible, nsBlockAccessible) NS_IMPL_RELEASE_INHERITED(nsDocAccessible, nsBlockAccessible) -NS_IMETHODIMP nsDocAccessible::GetAccName(nsAString& aAccName) +NS_IMETHODIMP nsDocAccessible::GetName(nsAString& aName) { - return GetTitle(aAccName); + return GetTitle(aName); } -NS_IMETHODIMP nsDocAccessible::GetAccRole(PRUint32 *_retval) +NS_IMETHODIMP nsDocAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_PANE; return NS_OK; } -NS_IMETHODIMP nsDocAccessible::GetAccValue(nsAString& aAccValue) +NS_IMETHODIMP nsDocAccessible::GetValue(nsAString& aValue) { - return GetURL(aAccValue); + return GetURL(aValue); } -NS_IMETHODIMP nsDocAccessible::GetAccState(PRUint32 *aAccState) +NS_IMETHODIMP nsDocAccessible::GetState(PRUint32 *aState) { - *aAccState = STATE_FOCUSABLE; + *aState = STATE_FOCUSABLE; if (mBusy == eBusyStateLoading) - *aAccState |= STATE_BUSY; + *aState |= STATE_BUSY; #ifdef DEBUG PRBool isEditable; @@ -162,7 +162,7 @@ NS_IMETHODIMP nsDocAccessible::GetAccState(PRUint32 *aAccState) if (isEditable) { // Just for debugging, to show we're in editor on pane object // We don't use STATE_MARQUEED for anything else - *aAccState |= STATE_MARQUEED; + *aState |= STATE_MARQUEED; } #endif return NS_OK; @@ -346,10 +346,10 @@ NS_IMETHODIMP nsDocAccessible::Init() // It should be changed to use GetAccessibleInWeakShell() nsCOMPtr accParent; accService->GetAccessibleFor(ownerNode, getter_AddRefs(accParent)); - nsCOMPtr privateAccParent(do_QueryInterface(accParent)); - if (privateAccParent) { - SetAccParent(accParent); - privateAccParent->SetAccFirstChild(this); + nsCOMPtr privateParent(do_QueryInterface(accParent)); + if (privateParent) { + SetParent(accParent); + privateParent->SetFirstChild(this); } } } @@ -412,7 +412,7 @@ nsIFrame* nsDocAccessible::GetFrame() return root; } -void nsDocAccessible::GetBounds(nsRect& aBounds, nsIFrame** aRelativeFrame) +void nsDocAccessible::GetBoundsRect(nsRect& aBounds, nsIFrame** aRelativeFrame) { *aRelativeFrame = GetFrame(); diff --git a/accessible/src/base/nsDocAccessible.h b/accessible/src/base/nsDocAccessible.h index 0f87d10ee96..20ce89b0387 100644 --- a/accessible/src/base/nsDocAccessible.h +++ b/accessible/src/base/nsDocAccessible.h @@ -76,10 +76,10 @@ class nsDocAccessible : public nsBlockAccessible, nsDocAccessible(nsIDOMNode *aNode, nsIWeakReference* aShell); virtual ~nsDocAccessible(); - NS_IMETHOD GetAccRole(PRUint32 *aAccRole); - NS_IMETHOD GetAccName(nsAString& aAccName); - NS_IMETHOD GetAccValue(nsAString& aAccValue); - NS_IMETHOD GetAccState(PRUint32 *aAccState); + NS_IMETHOD GetRole(PRUint32 *aRole); + NS_IMETHOD GetName(nsAString& aName); + NS_IMETHOD GetValue(nsAString& aValue); + NS_IMETHOD GetState(PRUint32 *aState); // ----- nsIScrollPositionListener --------------------------- NS_IMETHOD ScrollPositionWillChange(nsIScrollableView *aView, nscoord aX, nscoord aY); @@ -104,7 +104,7 @@ class nsDocAccessible : public nsBlockAccessible, NS_IMETHOD Init(); protected: - virtual void GetBounds(nsRect& aRect, nsIFrame** aRelativeFrame); + virtual void GetBoundsRect(nsRect& aRect, nsIFrame** aRelativeFrame); virtual nsIFrame* GetFrame(); virtual nsresult AddEventListeners(); virtual nsresult RemoveEventListeners(); diff --git a/accessible/src/base/nsFormControlAccessible.cpp b/accessible/src/base/nsFormControlAccessible.cpp index 7b9ab3a9092..745dda32dea 100644 --- a/accessible/src/base/nsFormControlAccessible.cpp +++ b/accessible/src/base/nsFormControlAccessible.cpp @@ -59,10 +59,10 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsFormControlAccessible, nsAccessible) * XUL states: focused, unavailable(disabled), focusable, ?protected? * HTML states: focused, unabailable(disabled), focusable, protected */ -NS_IMETHODIMP nsFormControlAccessible::GetAccState(PRUint32 *_retval) +NS_IMETHODIMP nsFormControlAccessible::GetState(PRUint32 *_retval) { // Get the focused state from the nsAccessible - nsAccessible::GetAccState(_retval); + nsAccessible::GetState(_retval); PRBool disabled = PR_FALSE; nsresult rv = NS_ERROR_FAILURE; @@ -94,19 +94,19 @@ 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(nsAString& _retval) +NS_IMETHODIMP nsFormControlAccessible::GetName(nsAString& _retval) { nsCOMPtr xulFormElement(do_QueryInterface(mDOMNode)); if (xulFormElement) - return GetXULAccName(_retval); + return GetXULName(_retval); else - return GetHTMLAccName(_retval); + return GetHTMLName(_retval); } /** * No Children */ -NS_IMETHODIMP nsFormControlAccessible::GetAccFirstChild(nsIAccessible **_retval) +NS_IMETHODIMP nsFormControlAccessible::GetFirstChild(nsIAccessible **_retval) { *_retval = nsnull; return NS_OK; @@ -115,7 +115,7 @@ NS_IMETHODIMP nsFormControlAccessible::GetAccFirstChild(nsIAccessible **_retval) /** * No Children */ -NS_IMETHODIMP nsFormControlAccessible::GetAccLastChild(nsIAccessible **_retval) +NS_IMETHODIMP nsFormControlAccessible::GetLastChild(nsIAccessible **_retval) { *_retval = nsnull; return NS_OK; @@ -124,7 +124,7 @@ NS_IMETHODIMP nsFormControlAccessible::GetAccLastChild(nsIAccessible **_retval) /** * No Children */ -NS_IMETHODIMP nsFormControlAccessible::GetAccChildCount(PRInt32 *_retval) +NS_IMETHODIMP nsFormControlAccessible::GetChildCount(PRInt32 *_retval) { *_retval = 0; return NS_OK; @@ -142,7 +142,7 @@ nsFormControlAccessible(aNode, aShell) /** * */ -NS_IMETHODIMP nsRadioButtonAccessible::GetAccNumActions(PRUint8 *_retval) +NS_IMETHODIMP nsRadioButtonAccessible::GetNumActions(PRUint8 *_retval) { *_retval = eSingle_Action; return NS_OK; @@ -151,7 +151,7 @@ NS_IMETHODIMP nsRadioButtonAccessible::GetAccNumActions(PRUint8 *_retval) /** * */ -NS_IMETHODIMP nsRadioButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) +NS_IMETHODIMP nsRadioButtonAccessible::GetActionName(PRUint8 index, nsAString& _retval) { if (index == eAction_Click) { nsAccessible::GetTranslatedString(NS_LITERAL_STRING("select"), _retval); @@ -163,7 +163,7 @@ NS_IMETHODIMP nsRadioButtonAccessible::GetAccActionName(PRUint8 index, nsAString /** * */ -NS_IMETHODIMP nsRadioButtonAccessible::GetAccRole(PRUint32 *_retval) +NS_IMETHODIMP nsRadioButtonAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_RADIOBUTTON; diff --git a/accessible/src/base/nsFormControlAccessible.h b/accessible/src/base/nsFormControlAccessible.h index 59796031f2c..d6aaaf368e2 100644 --- a/accessible/src/base/nsFormControlAccessible.h +++ b/accessible/src/base/nsFormControlAccessible.h @@ -52,11 +52,11 @@ class nsFormControlAccessible : public nsAccessibleWrap public: nsFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); NS_DECL_ISUPPORTS_INHERITED - NS_IMETHOD GetAccName(nsAString& _retval); - NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); - NS_IMETHOD GetAccLastChild(nsIAccessible **_retval); - NS_IMETHOD GetAccChildCount(PRInt32 *_retval); + NS_IMETHOD GetName(nsAString& _retval); + NS_IMETHOD GetState(PRUint32 *_retval); + NS_IMETHOD GetFirstChild(nsIAccessible **_retval); + NS_IMETHOD GetLastChild(nsIAccessible **_retval); + NS_IMETHOD GetChildCount(PRInt32 *_retval); }; /** @@ -67,9 +67,9 @@ class nsRadioButtonAccessible : public nsFormControlAccessible public: nsRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); + NS_IMETHOD GetRole(PRUint32 *_retval); + NS_IMETHOD GetNumActions(PRUint8 *_retval); + NS_IMETHOD GetActionName(PRUint8 index, nsAString& _retval); }; diff --git a/accessible/src/base/nsOuterDocAccessible.cpp b/accessible/src/base/nsOuterDocAccessible.cpp index 12e1694c727..66d694c41e2 100644 --- a/accessible/src/base/nsOuterDocAccessible.cpp +++ b/accessible/src/base/nsOuterDocAccessible.cpp @@ -54,39 +54,39 @@ nsOuterDocAccessible::nsOuterDocAccessible(nsIDOMNode* aNode, } /* attribute wstring accName; */ -NS_IMETHODIMP nsOuterDocAccessible::GetAccName(nsAString& aAccName) +NS_IMETHODIMP nsOuterDocAccessible::GetName(nsAString& aName) { nsCOMPtr accDoc(do_QueryInterface(mFirstChild)); if (!accDoc) { return NS_ERROR_FAILURE; } - nsresult rv = accDoc->GetTitle(aAccName); - if (NS_FAILED(rv) || aAccName.IsEmpty()) - rv = accDoc->GetURL(aAccName); + nsresult rv = accDoc->GetTitle(aName); + if (NS_FAILED(rv) || aName.IsEmpty()) + rv = accDoc->GetURL(aName); return rv; } -NS_IMETHODIMP nsOuterDocAccessible::GetAccValue(nsAString& aAccValue) +NS_IMETHODIMP nsOuterDocAccessible::GetValue(nsAString& aValue) { return NS_OK; } -/* unsigned long getAccRole (); */ -NS_IMETHODIMP nsOuterDocAccessible::GetAccRole(PRUint32 *_retval) +/* unsigned long getRole (); */ +NS_IMETHODIMP nsOuterDocAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_CLIENT; return NS_OK; } -NS_IMETHODIMP nsOuterDocAccessible::GetAccState(PRUint32 *aAccState) +NS_IMETHODIMP nsOuterDocAccessible::GetState(PRUint32 *aState) { - return nsAccessible::GetAccState(aAccState); + return nsAccessible::GetState(aState); } -NS_IMETHODIMP nsOuterDocAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, +NS_IMETHODIMP nsOuterDocAccessible::GetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height) { - return mFirstChild? mFirstChild->AccGetBounds(x, y, width, height): NS_ERROR_FAILURE; + return mFirstChild? mFirstChild->GetBounds(x, y, width, height): NS_ERROR_FAILURE; } NS_IMETHODIMP nsOuterDocAccessible::Init() @@ -121,8 +121,8 @@ NS_IMETHODIMP nsOuterDocAccessible::Init() getter_AddRefs(innerAccessible)); NS_ENSURE_TRUE(innerAccessible, NS_ERROR_FAILURE); - SetAccFirstChild(innerAccessible); // weak ref + SetFirstChild(innerAccessible); // weak ref nsCOMPtr privateInnerAccessible = do_QueryInterface(innerAccessible); - return privateInnerAccessible->SetAccParent(this); + return privateInnerAccessible->SetParent(this); } diff --git a/accessible/src/base/nsOuterDocAccessible.h b/accessible/src/base/nsOuterDocAccessible.h index 1938cee5542..aa9d89258a3 100644 --- a/accessible/src/base/nsOuterDocAccessible.h +++ b/accessible/src/base/nsOuterDocAccessible.h @@ -52,11 +52,11 @@ class nsOuterDocAccessible : public nsAccessibleWrap nsOuterDocAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAString& aAccName); - NS_IMETHOD GetAccValue(nsAString& AccValue); - NS_IMETHOD GetAccRole(PRUint32 *aAccRole); - NS_IMETHOD GetAccState(PRUint32 *aAccState); - NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, + NS_IMETHOD GetName(nsAString& aName); + NS_IMETHOD GetValue(nsAString& Value); + NS_IMETHOD GetRole(PRUint32 *aRole); + NS_IMETHOD GetState(PRUint32 *aState); + NS_IMETHOD GetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height); NS_IMETHOD Init(); diff --git a/accessible/src/base/nsRootAccessible.cpp b/accessible/src/base/nsRootAccessible.cpp index 6c3a5e857f8..27467986f55 100644 --- a/accessible/src/base/nsRootAccessible.cpp +++ b/accessible/src/base/nsRootAccessible.cpp @@ -109,20 +109,20 @@ nsRootAccessible::~nsRootAccessible() // helpers /* readonly attribute nsIAccessible accParent; */ -NS_IMETHODIMP nsRootAccessible::GetAccParent(nsIAccessible * *aAccParent) +NS_IMETHODIMP nsRootAccessible::GetParent(nsIAccessible * *aParent) { - *aAccParent = nsnull; + *aParent = nsnull; return NS_OK; } /* readonly attribute unsigned long accRole; */ -NS_IMETHODIMP nsRootAccessible::GetAccRole(PRUint32 *aAccRole) +NS_IMETHODIMP nsRootAccessible::GetRole(PRUint32 *aRole) { if (!mDocument) { return NS_ERROR_FAILURE; } - *aAccRole = ROLE_PANE; + *aRole = ROLE_PANE; // If it's a , use ROLE_DIALOG instead nsCOMPtr rootContent; @@ -133,7 +133,7 @@ NS_IMETHODIMP nsRootAccessible::GetAccRole(PRUint32 *aAccRole) nsAutoString name; rootElement->GetLocalName(name); if (name.Equals(NS_LITERAL_STRING("dialog"))) - *aAccRole = ROLE_DIALOG; + *aRole = ROLE_DIALOG; } } @@ -255,7 +255,7 @@ void nsRootAccessible::FireAccessibleFocusEvent(nsIAccessible *focusAccessible, privateFocusAcc->FireToolkitEvent(nsIAccessibleEvent::EVENT_FOCUS, focusAccessible, nsnull); NS_IF_RELEASE(gLastFocusedNode); PRUint32 role = ROLE_NOTHING; - focusAccessible->GetAccRole(&role); + focusAccessible->GetRole(&role); if (role != ROLE_MENUITEM && role != ROLE_LISTITEM) { // It must report all focus events on menu and list items gLastFocusedNode = focusNode; @@ -414,9 +414,9 @@ NS_IMETHODIMP nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent) privAcc->FireToolkitEvent(nsIAccessibleEvent::EVENT_MENUSTART, accessible, nsnull); else if (eventType.EqualsIgnoreCase("DOMMenuBarInactive")) { privAcc->FireToolkitEvent(nsIAccessibleEvent::EVENT_MENUEND, accessible, nsnull); - GetAccFocused(getter_AddRefs(accessible)); + GetFocusedChild(getter_AddRefs(accessible)); if (accessible) { - accessible->AccGetDOMNode(getter_AddRefs(targetNode)); + accessible->GetDOMNode(getter_AddRefs(targetNode)); FireAccessibleFocusEvent(accessible, targetNode); } } @@ -429,7 +429,7 @@ NS_IMETHODIMP nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent) menuEvent = nsIAccessibleEvent::EVENT_MENUPOPUPEND; if (menuEvent) { PRUint32 role = ROLE_NOTHING; - accessible->GetAccRole(&role); + accessible->GetRole(&role); if (role == ROLE_MENUPOPUP) privAcc->FireToolkitEvent(menuEvent, accessible, nsnull); } @@ -474,7 +474,7 @@ NS_IMETHODIMP nsRootAccessible::HandleEvent(nsIDOMEvent* aEvent) } else if (eventType.EqualsIgnoreCase("CheckboxStateChange") || // it's a XUL eventType.EqualsIgnoreCase("RadioStateChange")) { // it's a XUL - accessible->GetAccState(&stateData.state); + accessible->GetState(&stateData.state); stateData.enable = (stateData.state & STATE_CHECKED) != 0; stateData.state = STATE_CHECKED; privAcc->FireToolkitEvent(nsIAccessibleEvent::EVENT_STATE_CHANGE, accessible, &stateData); diff --git a/accessible/src/base/nsRootAccessible.h b/accessible/src/base/nsRootAccessible.h index c0469cad1f4..4ff6591622a 100644 --- a/accessible/src/base/nsRootAccessible.h +++ b/accessible/src/base/nsRootAccessible.h @@ -65,8 +65,8 @@ class nsRootAccessible : public nsDocAccessibleWrap, virtual ~nsRootAccessible(); /* attribute wstring accName; */ - NS_IMETHOD GetAccParent(nsIAccessible * *aAccParent); - NS_IMETHOD GetAccRole(PRUint32 *aAccRole); + NS_IMETHOD GetParent(nsIAccessible * *aParent); + NS_IMETHOD GetRole(PRUint32 *aRole); // ----- nsIDOMEventListener -------------------------- NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent); diff --git a/accessible/src/base/nsTextAccessible.cpp b/accessible/src/base/nsTextAccessible.cpp index ee9aa4d463d..8651003ff6d 100644 --- a/accessible/src/base/nsTextAccessible.cpp +++ b/accessible/src/base/nsTextAccessible.cpp @@ -55,7 +55,7 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsTextAccessible, nsLinkableAccessible) /** * We are text */ -NS_IMETHODIMP nsTextAccessible::GetAccRole(PRUint32 *_retval) +NS_IMETHODIMP nsTextAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_TEXT; return NS_OK; @@ -64,7 +64,7 @@ NS_IMETHODIMP nsTextAccessible::GetAccRole(PRUint32 *_retval) /** * No Children */ -NS_IMETHODIMP nsTextAccessible::GetAccFirstChild(nsIAccessible **_retval) +NS_IMETHODIMP nsTextAccessible::GetFirstChild(nsIAccessible **_retval) { *_retval = nsnull; return NS_OK; @@ -73,7 +73,7 @@ NS_IMETHODIMP nsTextAccessible::GetAccFirstChild(nsIAccessible **_retval) /** * No Children */ -NS_IMETHODIMP nsTextAccessible::GetAccLastChild(nsIAccessible **_retval) +NS_IMETHODIMP nsTextAccessible::GetLastChild(nsIAccessible **_retval) { *_retval = nsnull; return NS_OK; @@ -82,7 +82,7 @@ NS_IMETHODIMP nsTextAccessible::GetAccLastChild(nsIAccessible **_retval) /** * No Children */ -NS_IMETHODIMP nsTextAccessible::GetAccChildCount(PRInt32 *_retval) +NS_IMETHODIMP nsTextAccessible::GetChildCount(PRInt32 *_retval) { *_retval = 0; return NS_OK; diff --git a/accessible/src/base/nsTextAccessible.h b/accessible/src/base/nsTextAccessible.h index 73857328ad1..3907385b26f 100644 --- a/accessible/src/base/nsTextAccessible.h +++ b/accessible/src/base/nsTextAccessible.h @@ -53,10 +53,10 @@ public: NS_DECL_ISUPPORTS_INHERITED nsTextAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); - NS_IMETHOD GetAccLastChild(nsIAccessible **_retval); - NS_IMETHOD GetAccChildCount(PRInt32 *_retval); + NS_IMETHOD GetRole(PRUint32 *_retval); + NS_IMETHOD GetFirstChild(nsIAccessible **_retval); + NS_IMETHOD GetLastChild(nsIAccessible **_retval); + NS_IMETHOD GetChildCount(PRInt32 *_retval); }; diff --git a/accessible/src/html/nsHTMLAreaAccessible.cpp b/accessible/src/html/nsHTMLAreaAccessible.cpp index 3a691a74711..203b5a97513 100644 --- a/accessible/src/html/nsHTMLAreaAccessible.cpp +++ b/accessible/src/html/nsHTMLAreaAccessible.cpp @@ -49,35 +49,35 @@ // --- area ----- -nsHTMLAreaAccessible::nsHTMLAreaAccessible(nsIDOMNode *aDomNode, nsIAccessible *aAccParent, nsIWeakReference* aShell): +nsHTMLAreaAccessible::nsHTMLAreaAccessible(nsIDOMNode *aDomNode, nsIAccessible *aParent, nsIWeakReference* aShell): nsLinkableAccessible(aDomNode, aShell) { Init(); // Make sure we're in cache - mParent = aAccParent; + mParent = aParent; } -/* wstring getAccName (); */ -NS_IMETHODIMP nsHTMLAreaAccessible::GetAccName(nsAString & _retval) +/* wstring getName (); */ +NS_IMETHODIMP nsHTMLAreaAccessible::GetName(nsAString & _retval) { nsCOMPtr elt(do_QueryInterface(mDOMNode)); if (elt) { nsAutoString hrefString; elt->GetAttribute(NS_LITERAL_STRING("title"), _retval); if (_retval.IsEmpty()) - GetAccValue(_retval); + GetValue(_retval); } return NS_OK; } -/* unsigned long getAccRole (); */ -NS_IMETHODIMP nsHTMLAreaAccessible::GetAccRole(PRUint32 *_retval) +/* unsigned long getRole (); */ +NS_IMETHODIMP nsHTMLAreaAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_LINK; return NS_OK; } -/* wstring getAccDescription (); */ -NS_IMETHODIMP nsHTMLAreaAccessible::GetAccDescription(nsAString& _retval) +/* wstring getDescription (); */ +NS_IMETHODIMP nsHTMLAreaAccessible::GetDescription(nsAString& _retval) { // Still to do - follow IE's standard here nsCOMPtr area(do_QueryInterface(mDOMNode)); @@ -87,32 +87,32 @@ NS_IMETHODIMP nsHTMLAreaAccessible::GetAccDescription(nsAString& _retval) } -/* nsIAccessible getAccFirstChild (); */ -NS_IMETHODIMP nsHTMLAreaAccessible::GetAccFirstChild(nsIAccessible **_retval) +/* nsIAccessible getFirstChild (); */ +NS_IMETHODIMP nsHTMLAreaAccessible::GetFirstChild(nsIAccessible **_retval) { *_retval = nsnull; return NS_OK; } -/* nsIAccessible getAccLastChild (); */ -NS_IMETHODIMP nsHTMLAreaAccessible::GetAccLastChild(nsIAccessible **_retval) +/* nsIAccessible getLastChild (); */ +NS_IMETHODIMP nsHTMLAreaAccessible::GetLastChild(nsIAccessible **_retval) { *_retval = nsnull; return NS_OK; } /* long getAccChildCount (); */ -NS_IMETHODIMP nsHTMLAreaAccessible::GetAccChildCount(PRInt32 *_retval) +NS_IMETHODIMP nsHTMLAreaAccessible::GetChildCount(PRInt32 *_retval) { *_retval = 0; return NS_OK; } -NS_IMETHODIMP nsHTMLAreaAccessible::GetAccParent(nsIAccessible * *aAccParent) +NS_IMETHODIMP nsHTMLAreaAccessible::GetParent(nsIAccessible * *aParent) { - *aAccParent = mParent; - NS_IF_ADDREF(*aAccParent); + *aParent = mParent; + NS_IF_ADDREF(*aParent); return NS_OK; } @@ -131,18 +131,18 @@ nsIAccessible *nsHTMLAreaAccessible::GetAreaAccessible(nsIDOMNode *aDOMNode) } -NS_IMETHODIMP nsHTMLAreaAccessible::GetAccNextSibling(nsIAccessible * *aAccNextSibling) +NS_IMETHODIMP nsHTMLAreaAccessible::GetNextSibling(nsIAccessible * *aNextSibling) { - *aAccNextSibling = nsnull; + *aNextSibling = nsnull; nsCOMPtr nextNode; mDOMNode->GetNextSibling(getter_AddRefs(nextNode)); if (nextNode) - *aAccNextSibling = GetAreaAccessible(nextNode); + *aNextSibling = GetAreaAccessible(nextNode); return NS_OK; } /* readonly attribute nsIAccessible accPreviousSibling; */ -NS_IMETHODIMP nsHTMLAreaAccessible::GetAccPreviousSibling(nsIAccessible * *aAccPrevSibling) +NS_IMETHODIMP nsHTMLAreaAccessible::GetPreviousSibling(nsIAccessible * *aAccPrevSibling) { *aAccPrevSibling = nsnull; nsCOMPtr prevNode; @@ -154,7 +154,7 @@ NS_IMETHODIMP nsHTMLAreaAccessible::GetAccPreviousSibling(nsIAccessible * *aAccP /* void accGetBounds (out long x, out long y, out long width, out long height); */ -NS_IMETHODIMP nsHTMLAreaAccessible::AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height) +NS_IMETHODIMP nsHTMLAreaAccessible::GetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height) { // Essentially this uses GetRect on mAreas of nsImageMap from nsImageFrame diff --git a/accessible/src/html/nsHTMLAreaAccessible.h b/accessible/src/html/nsHTMLAreaAccessible.h index e988ccaaaec..7ee8b4f15f7 100644 --- a/accessible/src/html/nsHTMLAreaAccessible.h +++ b/accessible/src/html/nsHTMLAreaAccessible.h @@ -50,16 +50,16 @@ class nsHTMLAreaAccessible : public nsLinkableAccessible public: nsHTMLAreaAccessible(nsIDOMNode *domNode, nsIAccessible *accParent, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAString & _retval); - NS_IMETHOD GetAccRole(PRUint32 *_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(nsAString& _retval); - NS_IMETHOD AccGetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height); + NS_IMETHOD GetName(nsAString & _retval); + NS_IMETHOD GetRole(PRUint32 *_retval); + NS_IMETHOD GetFirstChild(nsIAccessible **_retval); + NS_IMETHOD GetLastChild(nsIAccessible **_retval); + NS_IMETHOD GetChildCount(PRInt32 *_retval); + NS_IMETHOD GetParent(nsIAccessible * *aParent); + NS_IMETHOD GetNextSibling(nsIAccessible * *aNextSibling); + NS_IMETHOD GetPreviousSibling(nsIAccessible * *aPreviousSibling); + NS_IMETHOD GetDescription(nsAString& _retval); + NS_IMETHOD GetBounds(PRInt32 *x, PRInt32 *y, PRInt32 *width, PRInt32 *height); protected: nsIAccessible *GetAreaAccessible(nsIDOMNode *aDOMNode); diff --git a/accessible/src/html/nsHTMLFormControlAccessible.cpp b/accessible/src/html/nsHTMLFormControlAccessible.cpp index 33cc95a0829..3260a89d776 100644 --- a/accessible/src/html/nsHTMLFormControlAccessible.cpp +++ b/accessible/src/html/nsHTMLFormControlAccessible.cpp @@ -55,24 +55,24 @@ nsFormControlAccessible(aNode, aShell) { } -NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccRole(PRUint32 *_retval) +NS_IMETHODIMP nsHTMLCheckboxAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_CHECKBUTTON; return NS_OK; } -NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccNumActions(PRUint8 *_retval) +NS_IMETHODIMP nsHTMLCheckboxAccessible::GetNumActions(PRUint8 *_retval) { *_retval = eSingle_Action; return NS_OK; } -NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) +NS_IMETHODIMP nsHTMLCheckboxAccessible::GetActionName(PRUint8 index, nsAString& _retval) { if (index == eAction_Click) { // 0 is the magic value for default action // check or uncheck PRUint32 state; - GetAccState(&state); + GetState(&state); if (state & STATE_CHECKED) nsAccessible::GetTranslatedString(NS_LITERAL_STRING("uncheck"), _retval); @@ -84,7 +84,7 @@ NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccActionName(PRUint8 index, nsAStrin return NS_ERROR_INVALID_ARG; } -NS_IMETHODIMP nsHTMLCheckboxAccessible::AccDoAction(PRUint8 index) +NS_IMETHODIMP nsHTMLCheckboxAccessible::DoAction(PRUint8 index) { if (index == 0) { // 0 is the magic value for default action nsCOMPtr htmlCheckboxElement(do_QueryInterface(mDOMNode)); @@ -97,9 +97,9 @@ NS_IMETHODIMP nsHTMLCheckboxAccessible::AccDoAction(PRUint8 index) return NS_ERROR_INVALID_ARG; } -NS_IMETHODIMP nsHTMLCheckboxAccessible::GetAccState(PRUint32 *_retval) +NS_IMETHODIMP nsHTMLCheckboxAccessible::GetState(PRUint32 *_retval) { - nsFormControlAccessible::GetAccState(_retval); + nsFormControlAccessible::GetState(_retval); PRBool checked = PR_FALSE; // Radio buttons and check boxes can be checked nsCOMPtr htmlCheckboxElement(do_QueryInterface(mDOMNode)); @@ -119,7 +119,7 @@ nsRadioButtonAccessible(aNode, aShell) { } -NS_IMETHODIMP nsHTMLRadioButtonAccessible::AccDoAction(PRUint8 index) +NS_IMETHODIMP nsHTMLRadioButtonAccessible::DoAction(PRUint8 index) { if (index == eAction_Click) { nsCOMPtr element(do_QueryInterface(mDOMNode)); @@ -131,9 +131,9 @@ NS_IMETHODIMP nsHTMLRadioButtonAccessible::AccDoAction(PRUint8 index) return NS_ERROR_INVALID_ARG; } -NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetAccState(PRUint32 *_retval) +NS_IMETHODIMP nsHTMLRadioButtonAccessible::GetState(PRUint32 *_retval) { - nsFormControlAccessible::GetAccState(_retval); + nsFormControlAccessible::GetState(_retval); PRBool checked = PR_FALSE; // Radio buttons and check boxes can be checked nsCOMPtr htmlRadioElement(do_QueryInterface(mDOMNode)); @@ -153,13 +153,13 @@ nsFormControlAccessible(aNode, aShell) { } -NS_IMETHODIMP nsHTMLButtonAccessible::GetAccNumActions(PRUint8 *_retval) +NS_IMETHODIMP nsHTMLButtonAccessible::GetNumActions(PRUint8 *_retval) { *_retval = eSingle_Action; return NS_OK; } -NS_IMETHODIMP nsHTMLButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) +NS_IMETHODIMP nsHTMLButtonAccessible::GetActionName(PRUint8 index, nsAString& _retval) { if (index == eAction_Click) { nsAccessible::GetTranslatedString(NS_LITERAL_STRING("press"), _retval); @@ -168,7 +168,7 @@ NS_IMETHODIMP nsHTMLButtonAccessible::GetAccActionName(PRUint8 index, nsAString& return NS_ERROR_INVALID_ARG; } -NS_IMETHODIMP nsHTMLButtonAccessible::AccDoAction(PRUint8 index) +NS_IMETHODIMP nsHTMLButtonAccessible::DoAction(PRUint8 index) { if (index == eAction_Click) { nsCOMPtr element(do_QueryInterface(mDOMNode)); @@ -180,9 +180,9 @@ NS_IMETHODIMP nsHTMLButtonAccessible::AccDoAction(PRUint8 index) return NS_ERROR_INVALID_ARG; } -NS_IMETHODIMP nsHTMLButtonAccessible::GetAccState(PRUint32 *_retval) +NS_IMETHODIMP nsHTMLButtonAccessible::GetState(PRUint32 *_retval) { - nsFormControlAccessible::GetAccState(_retval); + nsFormControlAccessible::GetState(_retval); nsCOMPtr element(do_QueryInterface(mDOMNode)); NS_ASSERTION(element, "No nsIDOMElement for button node!"); @@ -194,13 +194,13 @@ NS_IMETHODIMP nsHTMLButtonAccessible::GetAccState(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsHTMLButtonAccessible::GetAccRole(PRUint32 *_retval) +NS_IMETHODIMP nsHTMLButtonAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_PUSHBUTTON; return NS_OK; } -NS_IMETHODIMP nsHTMLButtonAccessible::GetAccName(nsAString& _retval) +NS_IMETHODIMP nsHTMLButtonAccessible::GetName(nsAString& _retval) { nsCOMPtr button(do_QueryInterface(mDOMNode)); @@ -228,13 +228,13 @@ nsLeafAccessible(aNode, aShell) { } -NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccNumActions(PRUint8 *_retval) +NS_IMETHODIMP nsHTML4ButtonAccessible::GetNumActions(PRUint8 *_retval) { *_retval = eSingle_Action; return NS_OK;; } -NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccActionName(PRUint8 index, nsAString& _retval) +NS_IMETHODIMP nsHTML4ButtonAccessible::GetActionName(PRUint8 index, nsAString& _retval) { if (index == eAction_Click) { nsAccessible::GetTranslatedString(NS_LITERAL_STRING("press"), _retval); @@ -243,7 +243,7 @@ NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccActionName(PRUint8 index, nsAString return NS_ERROR_INVALID_ARG; } -NS_IMETHODIMP nsHTML4ButtonAccessible::AccDoAction(PRUint8 index) +NS_IMETHODIMP nsHTML4ButtonAccessible::DoAction(PRUint8 index) { if (index == 0) { nsCOMPtr buttonElement(do_QueryInterface(mDOMNode)); @@ -257,15 +257,15 @@ NS_IMETHODIMP nsHTML4ButtonAccessible::AccDoAction(PRUint8 index) return NS_ERROR_INVALID_ARG; } -NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccRole(PRUint32 *_retval) +NS_IMETHODIMP nsHTML4ButtonAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_PUSHBUTTON; return NS_OK; } -NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccState(PRUint32 *_retval) +NS_IMETHODIMP nsHTML4ButtonAccessible::GetState(PRUint32 *_retval) { - nsAccessible::GetAccState(_retval); + nsAccessible::GetState(_retval); *_retval |= STATE_FOCUSABLE; nsCOMPtr element(do_QueryInterface(mDOMNode)); @@ -279,7 +279,7 @@ NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccState(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsHTML4ButtonAccessible::GetAccName(nsAString& _retval) +NS_IMETHODIMP nsHTML4ButtonAccessible::GetName(nsAString& _retval) { nsresult rv = NS_ERROR_FAILURE; nsCOMPtr content(do_QueryInterface(mDOMNode)); @@ -307,16 +307,16 @@ nsFormControlAccessible(aNode, aShell) NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLTextFieldAccessible, nsFormControlAccessible) -NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccRole(PRUint32 *_retval) +NS_IMETHODIMP nsHTMLTextFieldAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_TEXT; return NS_OK; } -NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccValue(nsAString& _retval) +NS_IMETHODIMP nsHTMLTextFieldAccessible::GetValue(nsAString& _retval) { PRUint32 state; - GetAccState(&state); + GetState(&state); if (state & STATE_PROTECTED) // Don't return password text! return NS_ERROR_FAILURE; @@ -340,7 +340,7 @@ NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccValue(nsAString& _retval) return NS_ERROR_FAILURE; } -NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccState(PRUint32 *_retval) +NS_IMETHODIMP nsHTMLTextFieldAccessible::GetState(PRUint32 *_retval) { // can be // focusable, focused, protected. readonly, unavailable, selected @@ -356,7 +356,7 @@ NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccState(PRUint32 *_retval) // to get the accessible state from. Doesn't add to cache // because Init() is not called. nsHTMLTextFieldAccessible tempAccessible(inputField, mWeakShell); - return tempAccessible.GetAccState(_retval); + return tempAccessible.GetState(_retval); } #endif @@ -364,7 +364,7 @@ NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccState(PRUint32 *_retval) return NS_ERROR_FAILURE; // Node has been Shutdown() } - nsAccessible::GetAccState(_retval); + nsAccessible::GetState(_retval); *_retval |= STATE_FOCUSABLE; nsCOMPtr textArea(do_QueryInterface(mDOMNode)); @@ -406,7 +406,7 @@ NS_IMETHODIMP nsHTMLTextFieldAccessible::GetAccState(PRUint32 *_retval) if (inputElement) { /////// ====== Must be a password field, so it uses nsIDOMHTMLFormControl ==== /////// PRUint32 moreStates = 0; - nsresult rv = nsFormControlAccessible::GetAccState(&moreStates); + nsresult rv = nsFormControlAccessible::GetState(&moreStates); *_retval |= moreStates; return rv; } @@ -432,13 +432,13 @@ nsAccessibleWrap(aNode, aShell) { } -NS_IMETHODIMP nsHTMLGroupboxAccessible::GetAccRole(PRUint32 *_retval) +NS_IMETHODIMP nsHTMLGroupboxAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_GROUPING; return NS_OK; } -NS_IMETHODIMP nsHTMLGroupboxAccessible::GetAccState(PRUint32 *_retval) +NS_IMETHODIMP nsHTMLGroupboxAccessible::GetState(PRUint32 *_retval) { // Groupbox doesn't support any states! *_retval = 0; @@ -446,7 +446,7 @@ NS_IMETHODIMP nsHTMLGroupboxAccessible::GetAccState(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsHTMLGroupboxAccessible::GetAccName(nsAString& _retval) +NS_IMETHODIMP nsHTMLGroupboxAccessible::GetName(nsAString& _retval) { nsCOMPtr element(do_QueryInterface(mDOMNode)); if (element) { diff --git a/accessible/src/html/nsHTMLFormControlAccessible.h b/accessible/src/html/nsHTMLFormControlAccessible.h index d0b9a85257f..4e1e37d5031 100644 --- a/accessible/src/html/nsHTMLFormControlAccessible.h +++ b/accessible/src/html/nsHTMLFormControlAccessible.h @@ -47,11 +47,11 @@ class nsHTMLCheckboxAccessible : public nsFormControlAccessible public: nsHTMLCheckboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); - NS_IMETHOD AccDoAction(PRUint8 index); - NS_IMETHOD GetAccState(PRUint32 *_retval); + NS_IMETHOD GetRole(PRUint32 *_retval); + NS_IMETHOD GetNumActions(PRUint8 *_retval); + NS_IMETHOD GetActionName(PRUint8 index, nsAString& _retval); + NS_IMETHOD DoAction(PRUint8 index); + NS_IMETHOD GetState(PRUint32 *_retval); }; class nsHTMLRadioButtonAccessible : public nsRadioButtonAccessible @@ -59,8 +59,8 @@ class nsHTMLRadioButtonAccessible : public nsRadioButtonAccessible public: nsHTMLRadioButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); - NS_IMETHOD AccDoAction(PRUint8 index); - NS_IMETHOD GetAccState(PRUint32 *_retval); + NS_IMETHOD DoAction(PRUint8 index); + NS_IMETHOD GetState(PRUint32 *_retval); }; class nsHTMLButtonAccessible : public nsFormControlAccessible @@ -68,12 +68,12 @@ class nsHTMLButtonAccessible : public nsFormControlAccessible public: nsHTMLButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccName(nsAString& _retval); - NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); - NS_IMETHOD AccDoAction(PRUint8 index); + NS_IMETHOD GetRole(PRUint32 *_retval); + NS_IMETHOD GetState(PRUint32 *_retval); + NS_IMETHOD GetName(nsAString& _retval); + NS_IMETHOD GetNumActions(PRUint8 *_retval); + NS_IMETHOD GetActionName(PRUint8 index, nsAString& _retval); + NS_IMETHOD DoAction(PRUint8 index); }; class nsHTML4ButtonAccessible : public nsLeafAccessible @@ -81,12 +81,12 @@ class nsHTML4ButtonAccessible : public nsLeafAccessible public: nsHTML4ButtonAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccName(nsAString& _retval); - NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccNumActions(PRUint8 *_retval); - NS_IMETHOD GetAccActionName(PRUint8 index, nsAString& _retval); - NS_IMETHOD AccDoAction(PRUint8 index); + NS_IMETHOD GetRole(PRUint32 *_retval); + NS_IMETHOD GetName(nsAString& _retval); + NS_IMETHOD GetState(PRUint32 *_retval); + NS_IMETHOD GetNumActions(PRUint8 *_retval); + NS_IMETHOD GetActionName(PRUint8 index, nsAString& _retval); + NS_IMETHOD DoAction(PRUint8 index); }; class nsHTMLTextFieldAccessible : public nsFormControlAccessible @@ -97,18 +97,18 @@ public: nsHTMLTextFieldAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccValue(nsAString& _retval); - NS_IMETHOD GetAccState(PRUint32 *_retval); + NS_IMETHOD GetRole(PRUint32 *_retval); + NS_IMETHOD GetValue(nsAString& _retval); + NS_IMETHOD GetState(PRUint32 *_retval); }; class nsHTMLGroupboxAccessible : public nsAccessibleWrap { public: nsHTMLGroupboxAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccName(nsAString& _retval); + NS_IMETHOD GetRole(PRUint32 *_retval); + NS_IMETHOD GetState(PRUint32 *_retval); + NS_IMETHOD GetName(nsAString& _retval); }; #endif diff --git a/accessible/src/html/nsHTMLImageAccessible.cpp b/accessible/src/html/nsHTMLImageAccessible.cpp index 201e28dc845..b4a82be0417 100644 --- a/accessible/src/html/nsHTMLImageAccessible.cpp +++ b/accessible/src/html/nsHTMLImageAccessible.cpp @@ -73,12 +73,12 @@ nsLinkableAccessible(aDOMNode, aShell) } } -NS_IMETHODIMP nsHTMLImageAccessible::GetAccState(PRUint32 *_retval) +NS_IMETHODIMP nsHTMLImageAccessible::GetState(PRUint32 *_retval) { // The state is a bitfield, get our inherited state, then logically OR it with STATE_ANIMATED if this // is an animated image. - nsLinkableAccessible::GetAccState(_retval); + nsLinkableAccessible::GetState(_retval); nsCOMPtr content(do_QueryInterface(mDOMNode)); nsCOMPtr imageRequest; @@ -102,8 +102,8 @@ NS_IMETHODIMP nsHTMLImageAccessible::GetAccState(PRUint32 *_retval) } -/* wstring getAccName (); */ -NS_IMETHODIMP nsHTMLImageAccessible::GetAccName(nsAString& _retval) +/* wstring getName (); */ +NS_IMETHODIMP nsHTMLImageAccessible::GetName(nsAString& _retval) { nsresult rv = NS_ERROR_FAILURE; @@ -120,8 +120,8 @@ NS_IMETHODIMP nsHTMLImageAccessible::GetAccName(nsAString& _retval) return rv; } -/* wstring getAccRole (); */ -NS_IMETHODIMP nsHTMLImageAccessible::GetAccRole(PRUint32 *_retval) +/* wstring getRole (); */ +NS_IMETHODIMP nsHTMLImageAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_GRAPHIC; return NS_OK; @@ -135,7 +135,7 @@ nsIAccessible *nsHTMLImageAccessible::CreateAreaAccessible(PRInt32 areaNum) if (areaNum == -1) { PRInt32 numAreaMaps; - GetAccChildCount(&numAreaMaps); + GetChildCount(&numAreaMaps); if (numAreaMaps<=0) return nsnull; areaNum = NS_STATIC_CAST(PRUint32,numAreaMaps-1); @@ -166,16 +166,16 @@ nsIAccessible *nsHTMLImageAccessible::CreateAreaAccessible(PRInt32 areaNum) } -/* nsIAccessible getAccFirstChild (); */ -NS_IMETHODIMP nsHTMLImageAccessible::GetAccFirstChild(nsIAccessible **_retval) +/* nsIAccessible getFirstChild (); */ +NS_IMETHODIMP nsHTMLImageAccessible::GetFirstChild(nsIAccessible **_retval) { *_retval = CreateAreaAccessible(0); return NS_OK; } -/* nsIAccessible getAccLastChild (); */ -NS_IMETHODIMP nsHTMLImageAccessible::GetAccLastChild(nsIAccessible **_retval) +/* nsIAccessible getLastChild (); */ +NS_IMETHODIMP nsHTMLImageAccessible::GetLastChild(nsIAccessible **_retval) { *_retval = CreateAreaAccessible(-1); return NS_OK; @@ -183,7 +183,7 @@ NS_IMETHODIMP nsHTMLImageAccessible::GetAccLastChild(nsIAccessible **_retval) #ifdef NEVER /* long getAccChildCount (); */ -NS_IMETHODIMP nsHTMLImageAccessible::GetAccChildCount(PRInt32 *_retval) +NS_IMETHODIMP nsHTMLImageAccessible::GetChildCount(PRInt32 *_retval) { *_retval = 0; if (mMapElement) { diff --git a/accessible/src/html/nsHTMLImageAccessible.h b/accessible/src/html/nsHTMLImageAccessible.h index e55c7b8f182..601b3734be6 100644 --- a/accessible/src/html/nsHTMLImageAccessible.h +++ b/accessible/src/html/nsHTMLImageAccessible.h @@ -53,11 +53,11 @@ class nsHTMLImageAccessible : public nsLinkableAccessible public: nsHTMLImageAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAString& _retval); - NS_IMETHOD GetAccState(PRUint32 *_retval); - NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccFirstChild(nsIAccessible **_retval); - NS_IMETHOD GetAccLastChild(nsIAccessible **_retval); + NS_IMETHOD GetName(nsAString& _retval); + NS_IMETHOD GetState(PRUint32 *_retval); + NS_IMETHOD GetRole(PRUint32 *_retval); + NS_IMETHOD GetFirstChild(nsIAccessible **_retval); + NS_IMETHOD GetLastChild(nsIAccessible **_retval); protected: nsIAccessible *CreateAreaAccessible(PRInt32 areaNum); diff --git a/accessible/src/html/nsHTMLLinkAccessible.cpp b/accessible/src/html/nsHTMLLinkAccessible.cpp index 6201fca8920..cd90b5b12a6 100644 --- a/accessible/src/html/nsHTMLLinkAccessible.cpp +++ b/accessible/src/html/nsHTMLLinkAccessible.cpp @@ -46,8 +46,8 @@ nsLinkableAccessible(aDomNode, aShell) { } -/* wstring getAccName (); */ -NS_IMETHODIMP nsHTMLLinkAccessible::GetAccName(nsAString& _retval) +/* wstring getName (); */ +NS_IMETHODIMP nsHTMLLinkAccessible::GetName(nsAString& _retval) { if (!IsALink()) // Also initializes private data members return NS_ERROR_FAILURE; @@ -55,17 +55,17 @@ NS_IMETHODIMP nsHTMLLinkAccessible::GetAccName(nsAString& _retval) return AppendFlatStringFromSubtree(mLinkContent,&_retval); } -/* unsigned long getAccRole (); */ -NS_IMETHODIMP nsHTMLLinkAccessible::GetAccRole(PRUint32 *_retval) +/* unsigned long getRole (); */ +NS_IMETHODIMP nsHTMLLinkAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_LINK; return NS_OK; } -NS_IMETHODIMP nsHTMLLinkAccessible::GetAccState(PRUint32 *_retval) +NS_IMETHODIMP nsHTMLLinkAccessible::GetState(PRUint32 *_retval) { - nsLinkableAccessible::GetAccState(_retval); + nsLinkableAccessible::GetState(_retval); *_retval &= ~(STATE_READONLY|STATE_SELECTABLE); return NS_OK; diff --git a/accessible/src/html/nsHTMLLinkAccessible.h b/accessible/src/html/nsHTMLLinkAccessible.h index c953ee0f68b..90fe005e9fa 100644 --- a/accessible/src/html/nsHTMLLinkAccessible.h +++ b/accessible/src/html/nsHTMLLinkAccessible.h @@ -48,9 +48,9 @@ class nsHTMLLinkAccessible : public nsLinkableAccessible public: nsHTMLLinkAccessible(nsIDOMNode* aDomNode, nsIWeakReference* aShell); - NS_IMETHOD GetAccName(nsAString& _retval); - NS_IMETHOD GetAccRole(PRUint32 *_retval); - NS_IMETHOD GetAccState(PRUint32 *_retval); + NS_IMETHOD GetName(nsAString& _retval); + NS_IMETHOD GetRole(PRUint32 *_retval); + NS_IMETHOD GetState(PRUint32 *_retval); }; #endif diff --git a/accessible/src/html/nsHTMLSelectAccessible.cpp b/accessible/src/html/nsHTMLSelectAccessible.cpp index 78d113bc6be..9caf785342b 100644 --- a/accessible/src/html/nsHTMLSelectAccessible.cpp +++ b/accessible/src/html/nsHTMLSelectAccessible.cpp @@ -262,13 +262,13 @@ NS_IMETHODIMP nsHTMLSelectableAccessible::GetSelectionCount(PRInt32 *aSelectionC return NS_OK; } -NS_IMETHODIMP nsHTMLSelectableAccessible::AddSelection(PRInt32 aIndex) +NS_IMETHODIMP nsHTMLSelectableAccessible::AddChildToSelection(PRInt32 aIndex) { PRBool isSelected; return ChangeSelection(aIndex, eSelection_Add, &isSelected); } -NS_IMETHODIMP nsHTMLSelectableAccessible::RemoveSelection(PRInt32 aIndex) +NS_IMETHODIMP nsHTMLSelectableAccessible::RemoveChildFromSelection(PRInt32 aIndex) { PRBool isSelected; return ChangeSelection(aIndex, eSelection_Remove, &isSelected); @@ -323,9 +323,9 @@ nsHTMLSelectListAccessible::nsHTMLSelectListAccessible(nsIDOMNode* aDOMNode, * STATE_MULTISELECTABLE * STATE_EXTSELECTABLE */ -NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccState(PRUint32 *_retval) +NS_IMETHODIMP nsHTMLSelectListAccessible::GetState(PRUint32 *_retval) { - nsHTMLSelectableAccessible::GetAccState(_retval); + nsHTMLSelectableAccessible::GetState(_retval); nsCOMPtr select (do_QueryInterface(mDOMNode)); if ( select ) { PRBool multiple; @@ -337,7 +337,7 @@ NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccState(PRUint32 *_retval) return NS_OK; } -NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccRole(PRUint32 *_retval) +NS_IMETHODIMP nsHTMLSelectListAccessible::GetRole(PRUint32 *_retval) { *_retval = ROLE_LIST; return NS_OK; @@ -348,14 +348,14 @@ NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccRole(PRUint32 *_retval) * Gets the first child of the DOM node and creates and returns * a nsHTMLSelectOptionAccessible. */ -NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccFirstChild(nsIAccessible **aAccFirstChild) +NS_IMETHODIMP nsHTMLSelectListAccessible::GetFirstChild(nsIAccessible **aFirstChild) { nsCOMPtr first; mDOMNode->GetFirstChild(getter_AddRefs(first)); nsCOMPtr accService(do_GetService("@mozilla.org/accessibilityService;1")); - nsresult rv = accService->GetAccessibleInWeakShell(first, mWeakShell, aAccFirstChild); - mFirstChild = *aAccFirstChild; + nsresult rv = accService->GetAccessibleInWeakShell(first, mWeakShell, aFirstChild); + mFirstChild = *aFirstChild; return rv; } @@ -363,13 +363,13 @@ NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccFirstChild(nsIAccessible **aAccF * Gets the last child of the DOM node and creates and returns * a nsHTMLSelectOptionAccessible. */ -NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccLastChild(nsIAccessible **aAccLastChild) +NS_IMETHODIMP nsHTMLSelectListAccessible::GetLastChild(nsIAccessible **aLastChild) { nsCOMPtr last; mDOMNode->GetLastChild(getter_AddRefs(last)); nsCOMPtr accService(do_GetService("@mozilla.org/accessibilityService;1")); - return accService->GetAccessibleInWeakShell(last, mWeakShell, aAccLastChild); + return accService->GetAccessibleInWeakShell(last, mWeakShell, aLastChild); } /** @@ -378,7 +378,7 @@ NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccLastChild(nsIAccessible **aAccLa * flat tree under the Select List. */ -NS_IMETHODIMP nsHTMLSelectListAccessible::GetAccChildCount(PRInt32 *aAccChildCount) +NS_IMETHODIMP nsHTMLSelectListAccessible::GetChildCount(PRInt32 *aAccChildCount) { // Count the number of