From 404624bf0b0125e5a408021c616ee9b9e2dde382 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Wed, 12 Feb 2014 16:00:34 +0100 Subject: Turn loops into range-based form and some things suggested by cppcheck and compiler warnings. --- Source/Core/DolphinWX/Android/ButtonManager.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Source/Core/DolphinWX/Android/ButtonManager.cpp') 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(); } -- cgit v1.2.3