summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/Android/ButtonManager.cpp
diff options
context:
space:
mode:
authorTillmann Karras <tilkax@gmail.com>2014-02-23 23:03:39 +0100
committerTillmann Karras <tilkax@gmail.com>2014-02-28 12:43:20 +0100
commit315a8ba1c04bf8cffd9b04096be898ac462fa89e (patch)
tree5655bdf4d940b3fdd372cb76181d70137982aefc /Source/Core/DolphinWX/Android/ButtonManager.cpp
parent5f0a8008f45f2c30a1aed044a428c5b4ce09ce88 (diff)
Various changes suggested by cppcheck
- remove unused variables - reduce the scope where it makes sense - correct limits (did you know that strcat()'s last parameter does not include the \0 that is always added?) - set some free()'d pointers to NULL
Diffstat (limited to 'Source/Core/DolphinWX/Android/ButtonManager.cpp')
-rw-r--r--Source/Core/DolphinWX/Android/ButtonManager.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Android/ButtonManager.cpp b/Source/Core/DolphinWX/Android/ButtonManager.cpp
index a8ebafdd20..e945f0638a 100644
--- a/Source/Core/DolphinWX/Android/ButtonManager.cpp
+++ b/Source/Core/DolphinWX/Android/ButtonManager.cpp
@@ -114,8 +114,7 @@ namespace ButtonManager
}
bool GetButtonPressed(int padID, ButtonType button)
{
- bool pressed = false;
- pressed = m_buttons[std::make_pair(padID, button)]->Pressed();
+ bool pressed = m_buttons[std::make_pair(padID, button)]->Pressed();
for (const auto& ctrl : m_controllers)
pressed |= ctrl.second->ButtonValue(padID, button);