From bfb3e97a064f4678bff0393fd462c9f662e2ce13 Mon Sep 17 00:00:00 2001 From: Markus Stange Date: Thu, 18 Mar 2021 02:30:38 +0000 Subject: [PATCH] Bug 1698662 - Rename arguments in nsMenuGroupOwnerX. r=harry Depends on D108545 Differential Revision: https://phabricator.services.mozilla.com/D108546 --- widget/cocoa/nsMenuGroupOwnerX.h | 6 +++--- widget/cocoa/nsMenuGroupOwnerX.mm | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/widget/cocoa/nsMenuGroupOwnerX.h b/widget/cocoa/nsMenuGroupOwnerX.h index 51b4c8cf6612..f726f3041740 100644 --- a/widget/cocoa/nsMenuGroupOwnerX.h +++ b/widget/cocoa/nsMenuGroupOwnerX.h @@ -27,10 +27,10 @@ class nsMenuGroupOwnerX : public nsMenuObjectX, public nsIMutationObserver { void RegisterForContentChanges(nsIContent* aContent, nsChangeObserver* aMenuObject); void UnregisterForContentChanges(nsIContent* aContent); - uint32_t RegisterForCommand(nsMenuItemX* aItem); + uint32_t RegisterForCommand(nsMenuItemX* aMenuItem); void UnregisterCommand(uint32_t aCommandID); - nsMenuItemX* GetMenuItemForCommandID(uint32_t inCommandID); - void AddMenuItemInfoToSet(MenuItemInfo* info); + nsMenuItemX* GetMenuItemForCommandID(uint32_t aCommandID); + void AddMenuItemInfoToSet(MenuItemInfo* aInfo); NS_DECL_ISUPPORTS NS_DECL_NSIMUTATIONOBSERVER diff --git a/widget/cocoa/nsMenuGroupOwnerX.mm b/widget/cocoa/nsMenuGroupOwnerX.mm index 6f534b979a5d..1003de5fb02b 100644 --- a/widget/cocoa/nsMenuGroupOwnerX.mm +++ b/widget/cocoa/nsMenuGroupOwnerX.mm @@ -71,7 +71,7 @@ void nsMenuGroupOwnerX::ContentAppended(nsIContent* aFirstNewContent) { void nsMenuGroupOwnerX::NodeWillBeDestroyed(const nsINode* aNode) {} -void nsMenuGroupOwnerX::AttributeWillChange(dom::Element* aContent, int32_t aNameSpaceID, +void nsMenuGroupOwnerX::AttributeWillChange(dom::Element* aElement, int32_t aNameSpaceID, nsAtom* aAttribute, int32_t aModType) {} void nsMenuGroupOwnerX::NativeAnonymousChildListChange(nsIContent* aContent, bool aIsRemove) {} @@ -165,7 +165,7 @@ nsChangeObserver* nsMenuGroupOwnerX::LookupContentChangeObserver(nsIContent* aCo // Given a menu item, creates a unique 4-character command ID and // maps it to the item. Returns the id for use by the client. -uint32_t nsMenuGroupOwnerX::RegisterForCommand(nsMenuItemX* inMenuItem) { +uint32_t nsMenuGroupOwnerX::RegisterForCommand(nsMenuItemX* aMenuItem) { // no real need to check for uniqueness. We always start afresh with each // window at 1. Even if we did get close to the reserved Apple command id's, // those don't start until at least ' ', which is integer 538976288. If @@ -175,23 +175,23 @@ uint32_t nsMenuGroupOwnerX::RegisterForCommand(nsMenuItemX* inMenuItem) { // make id unique ++mCurrentCommandID; - mCommandToMenuObjectTable.InsertOrUpdate(mCurrentCommandID, inMenuItem); + mCommandToMenuObjectTable.InsertOrUpdate(mCurrentCommandID, aMenuItem); return mCurrentCommandID; } // Removes the mapping between the given 4-character command ID // and its associated menu item. -void nsMenuGroupOwnerX::UnregisterCommand(uint32_t inCommandID) { - mCommandToMenuObjectTable.Remove(inCommandID); +void nsMenuGroupOwnerX::UnregisterCommand(uint32_t aCommandID) { + mCommandToMenuObjectTable.Remove(aCommandID); } -nsMenuItemX* nsMenuGroupOwnerX::GetMenuItemForCommandID(uint32_t inCommandID) { +nsMenuItemX* nsMenuGroupOwnerX::GetMenuItemForCommandID(uint32_t aCommandID) { nsMenuItemX* result; - if (mCommandToMenuObjectTable.Get(inCommandID, &result)) { + if (mCommandToMenuObjectTable.Get(aCommandID, &result)) { return result; } return nullptr; } -void nsMenuGroupOwnerX::AddMenuItemInfoToSet(MenuItemInfo* info) { [mInfoSet addObject:info]; } +void nsMenuGroupOwnerX::AddMenuItemInfoToSet(MenuItemInfo* aInfo) { [mInfoSet addObject:aInfo]; }