diff --git a/Source/Core/Core/HotkeyManager.cpp b/Source/Core/Core/HotkeyManager.cpp index 7b3f04a5e6..8c897a32b3 100644 --- a/Source/Core/Core/HotkeyManager.cpp +++ b/Source/Core/Core/HotkeyManager.cpp @@ -239,7 +239,14 @@ void Shutdown() } } -const std::array groups_info = { +struct HotkeyGroupInfo +{ + const char* name; + Hotkey first; + Hotkey last; +}; + +constexpr std::array groups_info = { {{_trans("General"), HK_OPEN, HK_EXIT}, {_trans("Volume"), HK_VOLUME_DOWN, HK_VOLUME_TOGGLE_MUTE}, {_trans("Emulation Speed"), HK_DECREASE_EMULATION_SPEED, HK_TOGGLE_THROTTLE}, diff --git a/Source/Core/Core/HotkeyManager.h b/Source/Core/Core/HotkeyManager.h index f8cc2bdc66..29ece35861 100644 --- a/Source/Core/Core/HotkeyManager.h +++ b/Source/Core/Core/HotkeyManager.h @@ -180,13 +180,6 @@ enum HotkeyGroup : int NUM_HOTKEY_GROUPS, }; -struct HotkeyGroupInfo -{ - std::string name; - Hotkey first; - Hotkey last; -}; - struct HotkeyStatus { u32 button[NUM_HOTKEY_GROUPS];