piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

HotkeyManager: Use std::array where applicable

Browse Source
This commit is contained in:
Lioncash
2018-06-14 09:48:39 -04:00
parent aae06f1cf7
commit d22d32372e
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/HotkeyManager.cpp
View File

@ -160,7 +160,7 @@ static_assert(NUM_HOTKEYS == hotkey_labels.size(), "Wrong count of hotkey_labels
namespace HotkeyManagerEmu namespace HotkeyManagerEmu
{ {
static u32 s_hotkeyDown[NUM_HOTKEY_GROUPS]; static std::array<u32, NUM_HOTKEY_GROUPS> s_hotkeyDown;
static HotkeyStatus s_hotkey; static HotkeyStatus s_hotkey;
static bool s_enabled; static bool s_enabled;
@ -217,8 +217,7 @@ void Initialize()
// load the saved controller config // load the saved controller config
s_config.LoadConfig(true); s_config.LoadConfig(true);
for (u32& key : s_hotkeyDown) s_hotkeyDown = {};
key = 0;
s_enabled = true; s_enabled = true;
} }
@ -269,7 +268,7 @@ constexpr std::array<HotkeyGroupInfo, NUM_HOTKEY_GROUPS> groups_info = {
HotkeyManager::HotkeyManager() HotkeyManager::HotkeyManager()
{ {
for (int group = 0; group < NUM_HOTKEY_GROUPS; group++) for (std::size_t group = 0; group < m_hotkey_groups.size(); group++)
{ {
m_hotkey_groups[group] = m_hotkey_groups[group] =
(m_keys[group] = new ControllerEmu::Buttons("Keys", groups_info[group].name)); (m_keys[group] = new ControllerEmu::Buttons("Keys", groups_info[group].name));
@ -294,7 +293,7 @@ std::string HotkeyManager::GetName() const
void HotkeyManager::GetInput(HotkeyStatus* const kb) void HotkeyManager::GetInput(HotkeyStatus* const kb)
{ {
const auto lock = GetStateLock(); const auto lock = GetStateLock();
for (int group = 0; group < NUM_HOTKEY_GROUPS; group++) for (std::size_t group = 0; group < groups_info.size(); group++)
{ {
const int group_count = (groups_info[group].last - groups_info[group].first) + 1; const int group_count = (groups_info[group].last - groups_info[group].first) + 1;
std::vector<u32> bitmasks(group_count); std::vector<u32> bitmasks(group_count);

4
Source/Core/Core/HotkeyManager.h
View File

@ -182,7 +182,7 @@ enum HotkeyGroup : int
struct HotkeyStatus struct HotkeyStatus
{ {
u32 button[NUM_HOTKEY_GROUPS]; std::array<u32, NUM_HOTKEY_GROUPS> button;
s8 err; s8 err;
}; };
@ -200,7 +200,7 @@ public:
void LoadDefaults(const ControllerInterface& ciface) override; void LoadDefaults(const ControllerInterface& ciface) override;
private: private:
ControllerEmu::Buttons* m_keys[NUM_HOTKEY_GROUPS]; std::array<ControllerEmu::Buttons*, NUM_HOTKEY_GROUPS> m_keys;
std::array<ControllerEmu::ControlGroup*, NUM_HOTKEY_GROUPS> m_hotkey_groups; std::array<ControllerEmu::ControlGroup*, NUM_HOTKEY_GROUPS> m_hotkey_groups;
}; };