From 42e1dafd6dc312d85bad2605fb494af0b7895892 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 18 Oct 2016 18:09:24 -0400 Subject: [PATCH] Frame: Rename GetCmdForHotkey to GetMenuIDFromHotkey This more accurately describes what it's actually doing. This can also be a local function, since it's not needed anywhere else. --- Source/Core/DolphinWX/Frame.cpp | 10 +++++----- Source/Core/DolphinWX/Frame.h | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index a2c7de094b..a1f5d0608f 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -866,7 +866,7 @@ static bool IsHotkey(int id, bool held = false) return HotkeyManagerEmu::IsPressed(id, held); } -int GetCmdForHotkey(unsigned int key) +static int GetMenuIDFromHotkey(unsigned int key) { switch (key) { @@ -1288,11 +1288,11 @@ void CFrame::ParseHotkeys() if (IsHotkey(i)) { - int cmd = GetCmdForHotkey(i); - if (cmd >= 0) + const int id = GetMenuIDFromHotkey(i); + if (id >= 0) { - wxCommandEvent evt(wxEVT_MENU, cmd); - wxMenuItem* item = GetMenuBar()->FindItem(cmd); + wxCommandEvent evt(wxEVT_MENU, id); + wxMenuItem* item = GetMenuBar()->FindItem(id); if (item && item->IsCheckable()) { item->wxMenuItemBase::Toggle(); diff --git a/Source/Core/DolphinWX/Frame.h b/Source/Core/DolphinWX/Frame.h index d7bc35587c..883b2db9f4 100644 --- a/Source/Core/DolphinWX/Frame.h +++ b/Source/Core/DolphinWX/Frame.h @@ -342,8 +342,6 @@ private: DECLARE_EVENT_TABLE(); }; -int GetCmdForHotkey(unsigned int key); - void OnAfterLoadCallback(); void OnStoppedCallback();