diff --git a/Source/Android/jni/ButtonManager.cpp b/Source/Android/jni/ButtonManager.cpp index fafc2ebe4d..554cc6f0e2 100644 --- a/Source/Android/jni/ButtonManager.cpp +++ b/Source/Android/jni/ButtonManager.cpp @@ -14,9 +14,10 @@ namespace ButtonManager { +namespace +{ const std::string touchScreenKey = "Touchscreen"; -std::unordered_map m_controllers; -std::vector configStrings = { +const std::vector configStrings = { // GC "InputA", "InputB", @@ -169,7 +170,8 @@ std::vector configStrings = { // Rumble "Rumble", }; -std::vector configTypes = { + +const std::vector configTypes = { // GC BUTTON_A, BUTTON_B, @@ -323,7 +325,9 @@ std::vector configTypes = { RUMBLE, }; -static void AddBind(const std::string& dev, sBind* bind) +std::unordered_map m_controllers; + +void AddBind(const std::string& dev, sBind* bind) { auto it = m_controllers.find(dev); if (it != m_controllers.end()) @@ -334,6 +338,7 @@ static void AddBind(const std::string& dev, sBind* bind) m_controllers[dev] = new InputDevice(dev); m_controllers[dev]->AddBind(bind); } +} // Anonymous namespace void Init(const std::string& gameId) {