From 531433248fbad49e2b8e9d90de9855f3ea9b2257 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 20 Jan 2013 19:01:23 +0300 Subject: Another part with FOR_EACH changes. --- src/gui/chatwindow.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/gui/chatwindow.cpp') diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 4a80a5df0..302c0c72b 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -613,11 +613,8 @@ void ChatWindow::removeAllWhispers() { std::list tabs; - for (TabMap::iterator iter = mWhispers.begin(), - iter_end = mWhispers.end(); iter != iter_end; ++ iter) - { + FOR_EACH (TabMap::iterator, iter, mWhispers) tabs.push_back(iter->second); - } for (std::list::iterator it = tabs.begin(); it != tabs.end(); ++it) @@ -687,8 +684,7 @@ void ChatWindow::doPresent() const std::string response; int playercount = 0; - for (ActorSpritesConstIterator it = actors.begin(), it_end = actors.end(); - it != it_end; ++it) + FOR_EACH (ActorSpritesConstIterator, it, actors) { if ((*it)->getType() == ActorSprite::PLAYER) { @@ -1504,8 +1500,7 @@ void ChatWindow::updateOnline(std::set &onlinePlayers) party = player_node->getParty(); guild = player_node->getGuild(); } - for (TabMap::const_iterator iter = mWhispers.begin(), - iter_end = mWhispers.end(); iter != iter_end; ++iter) + FOR_EACH (TabMap::const_iterator, iter, mWhispers) { if (!iter->second) return; -- cgit v1.2.3-60-g2f50