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/commandhandler.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/commandhandler.cpp') diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp index 95d987ead..0e0ec4cff 100644 --- a/src/commandhandler.cpp +++ b/src/commandhandler.cpp @@ -1214,7 +1214,8 @@ void showRes(std::string str, ResourceManager::Resources *res) debugChatTab->chatLog(str + toString(res->size())); logger->log(str + toString(res->size())); ResourceManager::ResourceIterator iter = res->begin(); - while (iter != res->end()) + ResourceManager::ResourceIterator iter_end = res->end(); + while (iter != iter_end) { if (iter->second && iter->second->getRefCount()) { @@ -1311,9 +1312,8 @@ void CommandHandler::replaceVars(std::string &str) StringVect names; std::string newStr = ""; actorSpriteManager->getPlayerNames(names, false); - StringVectCIter it = names.begin(); - StringVectCIter it_end = names.end(); - for (; it != it_end; ++ it) + for (StringVectCIter it = names.begin(), it_end = names.end(); + it != it_end; ++ it) { if (*it != player_node->getName()) newStr += *it + ","; @@ -1333,9 +1333,8 @@ void CommandHandler::replaceVars(std::string &str) if (player_node->isInParty() && (party = player_node->getParty())) { party->getNames(names); - StringVectCIter it = names.begin(); - StringVectCIter it_end = names.end(); - for (; it != it_end; ++ it) + for (StringVectCIter it = names.begin(), it_end = names.end(); + it != it_end; ++ it) { if (*it != player_node->getName()) newStr += *it + ","; -- cgit v1.2.3-60-g2f50