summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Android/ButtonManager.cpp
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2014-02-13 21:10:27 +1300
committerMatthew Parlane <parlane@gmail.com>2014-02-13 21:10:27 +1300
commit06329e24531b69a4856bbe05a8c89c57d9346de6 (patch)
treed2c3cd6256b09ebdc04b8c913b21c2e56d30c2e1 /Source/Core/DolphinWX/Android/ButtonManager.cpp
parent88526be3b5cfc33436d4390935d7982c4795520a (diff)
parent404624bf0b0125e5a408021c616ee9b9e2dde382 (diff)
Merge pull request #65 from Tilka/nits
Small changes
Diffstat (limited to 'Source/Core/DolphinWX/Android/ButtonManager.cpp')
-rw-r--r--Source/Core/DolphinWX/Android/ButtonManager.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp
index 5c71a7197a..7d4fb97f3d 100644
--- a/Source/Core/DolphinWX/Android/ButtonManager.cpp
+++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp
@@ -127,8 +127,8 @@ namespace ButtonManager
bool pressed = false;
pressed = m_buttons[std::make_pair(padID, button)]->Pressed();
- for (auto it = m_controllers.begin(); it != m_controllers.end(); ++it)
- pressed |= it->second->ButtonValue(padID, button);
+ for (const auto& ctrl : m_controllers)
+ pressed |= ctrl.second->ButtonValue(padID, button);
return pressed;
}
@@ -172,10 +172,10 @@ namespace ButtonManager
}
void Shutdown()
{
- for(auto it = m_buttons.begin(); it != m_buttons.end(); ++it)
- delete it->second;
- for (auto it = m_controllers.begin(); it != m_controllers.end(); ++it)
- delete it->second;
+ for (const auto& button : m_buttons)
+ delete button.second;
+ for (const auto& controller : m_controllers)
+ delete controller.second;
m_controllers.clear();
m_buttons.clear();
}