From c9f43996f3147100627ee2c6f9da993ceb160113 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 25 Apr 2012 02:26:34 +0300 Subject: Improve iterators part 2. --- src/inputmanager.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/inputmanager.cpp') diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp index 60e4a7bca..3a4ee1b9b 100644 --- a/src/inputmanager.cpp +++ b/src/inputmanager.cpp @@ -106,10 +106,9 @@ void InputManager::retrieve() StringVect keys; splitToStringVector(keys, keyStr, ','); - StringVectCIter it = keys.begin(); - StringVectCIter it_end = keys.end(); int i2 = 0; - for (; it != it_end && i2 < KeyFunctionSize; ++ it) + for (StringVectCIter it = keys.begin(), it_end = keys.end(); + it != it_end && i2 < KeyFunctionSize; ++ it) { std::string keyStr2 = *it; if (keyStr.size() < 2) @@ -619,9 +618,8 @@ void InputManager::updateKeyActionMap(KeyToActionMap &actionMap, } keySorter.keys = &keyData[0]; - KeyToActionMapIter it = actionMap.begin(); - KeyToActionMapIter it_end = actionMap.end(); - for (; it != it_end; ++ it) + for (KeyToActionMapIter it = actionMap.begin(), it_end = actionMap.end(); + it != it_end; ++ it) { KeysVector *keys = &it->second; if (keys && keys->size() > 1) @@ -635,10 +633,9 @@ bool InputManager::triggerAction(const KeysVector *ptrs) return false; // logger->log("ptrs: %d", (int)ptrs.size()); - KeysVectorCIter it = ptrs->begin(); - KeysVectorCIter it_end = ptrs->end(); - for (; it != it_end; ++ it) + for (KeysVectorCIter it = ptrs->begin(), it_end = ptrs->end(); + it != it_end; ++ it) { const int keyNum = *it; if (keyNum < 0 || keyNum >= Input::KEY_TOTAL) -- cgit v1.2.3-60-g2f50