summaryrefslogtreecommitdiff
path: root/src/inputmanager.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-01-19 15:25:24 +0300
committerAndrei Karas <akaras@inbox.ru>2013-01-20 17:05:57 +0300
commit48071e171de41a23197c7328ba038331a936e0eb (patch)
tree73c7ef1da8e5dd76469d75c0336d88c3371e4263 /src/inputmanager.cpp
parentd07fba228b5251862ad670e1d4f079c9456fab4b (diff)
downloadmanaverse-48071e171de41a23197c7328ba038331a936e0eb.tar.gz
manaverse-48071e171de41a23197c7328ba038331a936e0eb.tar.bz2
manaverse-48071e171de41a23197c7328ba038331a936e0eb.tar.xz
manaverse-48071e171de41a23197c7328ba038331a936e0eb.zip
Replace for to FOR_EACH in some classes.
Diffstat (limited to 'src/inputmanager.cpp')
-rw-r--r--src/inputmanager.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
index 29b2a87a8..38a743822 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
@@ -653,8 +653,7 @@ void InputManager::updateKeyActionMap(KeyToActionMap &actionMap,
}
keySorter.keys = &keyData[0];
- for (KeyToActionMapIter it = actionMap.begin(), it_end = actionMap.end();
- it != it_end; ++ it)
+ FOR_EACH (KeyToActionMapIter, it, actionMap)
{
KeysVector *const keys = &it->second;
if (keys && keys->size() > 1)
@@ -669,8 +668,7 @@ bool InputManager::triggerAction(const KeysVector *const ptrs)
// logger->log("ptrs: %d", (int)ptrs.size());
- for (KeysVectorCIter it = ptrs->begin(), it_end = ptrs->end();
- it != it_end; ++ it)
+ FOR_EACHP (KeysVectorCIter, it, ptrs)
{
const int keyNum = *it;
if (keyNum < 0 || keyNum >= Input::KEY_TOTAL)