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/net/ea/inventoryhandler.cpp | 5 ++--- src/net/tmwa/loginhandler.cpp | 5 ++--- src/net/tmwa/network.cpp | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'src/net') diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index d870eff38..f28e9b396 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -431,9 +431,8 @@ void InventoryHandler::processPlayerStorageStatus(Net::MessageIn &msg) if (!mStorage) mStorage = new Inventory(Inventory::STORAGE, size); - Ea::InventoryItems::const_iterator it = mInventoryItems.begin(); - Ea::InventoryItems::const_iterator it_end = mInventoryItems.end(); - for (; it != it_end; ++it) + for (Ea::InventoryItems::const_iterator it = mInventoryItems.begin(), + it_end = mInventoryItems.end(); it != it_end; ++it) { mStorage->setItem((*it).slot, (*it).id, (*it).quantity, (*it).refine, (*it).color, (*it).equip); diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index 242270d13..e7fcc9cc6 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -197,9 +197,8 @@ void LoginHandler::processUpdateHost2(Net::MessageIn &msg) std::string updateHost = msg.readString(len); splitToStringVector(loginData.updateHosts, updateHost, '|'); - StringVectIter it = loginData.updateHosts.begin(); - StringVectIter it_end = loginData.updateHosts.end(); - for (; it != it_end; ++ it) + for (StringVectIter it = loginData.updateHosts.begin(), + it_end = loginData.updateHosts.end(); it != it_end; ++ it) { if (!checkPath(*it)) { diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index 306765ff4..956067f4a 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -218,8 +218,8 @@ void Network::unregisterHandler(MessageHandler *handler) void Network::clearHandlers() { - MessageHandlerIterator i; - for (i = mMessageHandlers.begin(); i != mMessageHandlers.end(); ++i) + for (MessageHandlerIterator i = mMessageHandlers.begin(); + i != mMessageHandlers.end(); ++i) { if (i->second) i->second->setNetwork(nullptr); -- cgit v1.2.3-60-g2f50