summaryrefslogtreecommitdiff
path: root/src/gui/popupmenu.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-01-20 19:01:23 +0300
committerAndrei Karas <akaras@inbox.ru>2013-01-20 19:29:26 +0300
commit531433248fbad49e2b8e9d90de9855f3ea9b2257 (patch)
tree33937a65d8b18934879824fa4c2a6183d53d5e73 /src/gui/popupmenu.cpp
parent48071e171de41a23197c7328ba038331a936e0eb (diff)
downloadmv-531433248fbad49e2b8e9d90de9855f3ea9b2257.tar.gz
mv-531433248fbad49e2b8e9d90de9855f3ea9b2257.tar.bz2
mv-531433248fbad49e2b8e9d90de9855f3ea9b2257.tar.xz
mv-531433248fbad49e2b8e9d90de9855f3ea9b2257.zip
Another part with FOR_EACH changes.
Diffstat (limited to 'src/gui/popupmenu.cpp')
-rw-r--r--src/gui/popupmenu.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 09389f3ea..b71676b15 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -267,8 +267,7 @@ void PopupMenu::showPopup(const int x, const int y,
mY = y;
mBrowserBox->clearRows();
mBrowserBox->addRow(_("Players"));
- for (std::vector<ActorSprite*>::const_iterator it = beings.begin(),
- it_end = beings.end(); it != it_end; ++it)
+ FOR_EACH (std::vector<ActorSprite*>::const_iterator, it, beings)
{
const Being *const being = dynamic_cast<Being*>(*it);
const ActorSprite *const actor = *it;
@@ -650,8 +649,7 @@ void PopupMenu::showChangePos(const int x, const int y)
if (guild)
{
PositionsMap map = guild->getPositions();
- for (PositionsMap::const_iterator itr = map.begin(),
- itr_end = map.end(); itr != itr_end; ++itr)
+ FOR_EACH (PositionsMap::const_iterator, itr, map)
{
mBrowserBox->addRow(strprintf("@@guild-pos-%u|%s@@",
itr->first, itr->second.c_str()));
@@ -1905,8 +1903,8 @@ void PopupMenu::showPopup(const int x, const int y, Button *const button)
mY = y;
mBrowserBox->clearRows();
- std::vector <Button*> names = windowMenu->getButtons();
- for (std::vector <Button*>::const_iterator it = names.begin(),
+ std::vector<Button *> names = windowMenu->getButtons();
+ for (std::vector<Button *>::const_iterator it = names.begin(),
it_end = names.end(); it != it_end; ++ it)
{
const Button *const btn = dynamic_cast<Button*>(*it);