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/botcheckerwindow.cpp | 6 ++---- src/gui/buydialog.cpp | 3 +-- src/gui/buyselldialog.cpp | 3 +-- src/gui/charselectdialog.cpp | 8 +++----- src/gui/chatwindow.cpp | 11 +++-------- src/gui/editdialog.cpp | 5 +---- src/gui/equipmentwindow.cpp | 4 +--- src/gui/helpwindow.cpp | 6 ++---- src/gui/inventorywindow.cpp | 3 +-- src/gui/itemamountwindow.cpp | 5 +---- src/gui/minimap.cpp | 4 +--- src/gui/ministatuswindow.cpp | 17 +++++++---------- src/gui/npcdialog.cpp | 17 +++++++---------- src/gui/npcpostdialog.cpp | 5 +---- src/gui/palette.cpp | 5 +---- src/gui/popupmenu.cpp | 10 ++++------ src/gui/questswindow.cpp | 6 ++---- src/gui/sdlfont.cpp | 6 ++---- src/gui/selldialog.cpp | 5 +---- src/gui/serverdialog.cpp | 3 +-- src/gui/setup.cpp | 11 +++-------- src/gui/shopwindow.cpp | 15 +++++---------- src/gui/shortcutwindow.cpp | 5 +---- src/gui/skilldialog.cpp | 12 +++--------- src/gui/socialwindow.cpp | 3 +-- src/gui/statuswindow.cpp | 5 +---- src/gui/textcommandeditor.cpp | 5 +---- src/gui/theme.cpp | 4 +--- src/gui/userpalette.cpp | 9 +++------ src/gui/viewport.cpp | 12 ++++-------- src/gui/whoisonline.cpp | 18 ++++-------------- src/gui/windowmenu.cpp | 5 ++--- src/map.cpp | 5 +++-- 33 files changed, 75 insertions(+), 166 deletions(-) (limited to 'src') diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp index 3164ca7c5..5e2841879 100644 --- a/src/gui/botcheckerwindow.cpp +++ b/src/gui/botcheckerwindow.cpp @@ -110,8 +110,7 @@ public: && botCheckerWindow->mEnabled) { std::set beings = actorSpriteManager->getAll(); - for (ActorSprites::const_iterator i = beings.begin(), - i_end = beings.end(); i != i_end; ++i) + FOR_EACH (ActorSprites::const_iterator, i, beings) { Being *const being = dynamic_cast(*i); @@ -396,8 +395,7 @@ void BotCheckerWindow::reset() if (actorSpriteManager) { std::set beings = actorSpriteManager->getAll(); - for (ActorSprites::const_iterator i = beings.begin(), - i_end = beings.end(); i != i_end; ++i) + FOR_EACH (ActorSprites::const_iterator, i, beings) { Being *const being = dynamic_cast(*i); diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp index 24ac63a00..e18b0965d 100644 --- a/src/gui/buydialog.cpp +++ b/src/gui/buydialog.cpp @@ -346,8 +346,7 @@ void BuyDialog::setVisible(bool visible) void BuyDialog::closeAll() { - for (DialogList::const_iterator it = instances.begin(), - it_end = instances.end(); it != it_end; ++it) + FOR_EACH (DialogList::const_iterator, it, instances) { if (*it) (*it)->close(); diff --git a/src/gui/buyselldialog.cpp b/src/gui/buyselldialog.cpp index c1d1207df..973df6182 100644 --- a/src/gui/buyselldialog.cpp +++ b/src/gui/buyselldialog.cpp @@ -132,8 +132,7 @@ void BuySellDialog::action(const gcn::ActionEvent &event) void BuySellDialog::closeAll() { - for (DialogList::const_iterator it = instances.begin(), - it_end = instances.end(); it != it_end; ++it) + FOR_EACH (DialogList::const_iterator, it, instances) { if (*it) (*it)->close(); diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index 82daaeced..a912b9198 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -461,15 +461,13 @@ void CharSelectDialog::attemptCharacterSelect(const int index) void CharSelectDialog::setCharacters(const Net::Characters &characters) { // Reset previous characters - for (std::vector::const_iterator - iter = mCharacterEntries.begin(), iter_end = mCharacterEntries.end(); - iter != iter_end; ++iter) + FOR_EACH (std::vector::const_iterator, + iter, mCharacterEntries) { (*iter)->setCharacter(nullptr); } - for (Net::Characters::const_iterator i = characters.begin(), - i_end = characters.end(); i != i_end; ++i) + FOR_EACH (Net::Characters::const_iterator, i, characters) { if (!*i) continue; 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; diff --git a/src/gui/editdialog.cpp b/src/gui/editdialog.cpp index 94546becb..938bccaad 100644 --- a/src/gui/editdialog.cpp +++ b/src/gui/editdialog.cpp @@ -66,11 +66,8 @@ EditDialog::EditDialog(const std::string &title, const std::string &msg, void EditDialog::action(const gcn::ActionEvent &event) { // Proxy button events to our listeners - for (ActionListenerIterator i = mActionListeners.begin(), - i_end = mActionListeners.end(); i != i_end; ++i) - { + FOR_EACH (ActionListenerIterator, i, mActionListeners) (*i)->action(event); - } if (event.getId() == mEventOk) scheduleDelete(); diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp index f2fe34a31..af2c8f083 100644 --- a/src/gui/equipmentwindow.cpp +++ b/src/gui/equipmentwindow.cpp @@ -159,9 +159,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics) if (mLastRedraw) { mVertexes->clear(); - for (std::vector::const_iterator - it = mBoxes.begin(), it_end = mBoxes.end(); - it != it_end; ++ it, ++ i) + FOR_EACH (std::vector::const_iterator, it, mBoxes) { const EquipmentBox *const box = *it; if (!box) diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp index a9aead461..3dcc19dbb 100644 --- a/src/gui/helpwindow.cpp +++ b/src/gui/helpwindow.cpp @@ -132,8 +132,7 @@ void HelpWindow::loadTags() helpPath = paths.getStringValue("help"); StringVect lines; ResourceManager::loadTextFile(helpPath + "tags.idx", lines); - for (StringVectCIter it = lines.begin(), it_end = lines.end(); - it != it_end; ++ it) + FOR_EACH (StringVectCIter, it, lines) { const std::string &str = *it; const size_t idx = str.find('|'); @@ -164,8 +163,7 @@ void HelpWindow::search(const std::string &text0) mBrowserBox->clearRows(); loadFile("header"); loadFile("searchmany"); - for (HelpNamesCIter it = names.begin(), it_end = names.end(); - it != it_end; ++ it) + FOR_EACH (HelpNamesCIter, it, names) { const char *const str = (*it).c_str(); mBrowserBox->addRow(strprintf(" -> @@%s|%s@@", str, diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 8d142328c..4b6256a8d 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -708,8 +708,7 @@ bool InventoryWindow::isInputFocused() const bool InventoryWindow::isAnyInputFocused() { - for (WindowList::const_iterator it = instances.begin(), - it_end = instances.end(); it != it_end; ++it) + FOR_EACH (WindowList::const_iterator, it, instances) { if ((*it) && (*it)->isInputFocused()) return true; diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp index 454460984..3ebc899c7 100644 --- a/src/gui/itemamountwindow.cpp +++ b/src/gui/itemamountwindow.cpp @@ -71,11 +71,8 @@ public: } } tempStrings.sort(); - for (std::list::const_iterator i = tempStrings.begin(), - i_end = tempStrings.end(); i != i_end; ++i) - { + FOR_EACH (std::list::const_iterator, i, tempStrings) mStrings.push_back(*i); - } } A_DELETE_COPY(ItemsModal) diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp index 995667cd7..b30703a7e 100644 --- a/src/gui/minimap.cpp +++ b/src/gui/minimap.cpp @@ -266,9 +266,7 @@ void Minimap::draw(gcn::Graphics *graphics) } const ActorSprites &actors = actorSpriteManager->getAll(); - - for (ActorSpritesConstIterator it = actors.begin(), it_end = actors.end(); - it != it_end; ++it) + FOR_EACH (ActorSpritesConstIterator, it, actors) { if (!(*it) || (*it)->getType() == ActorSprite::FLOOR_ITEM) continue; diff --git a/src/gui/ministatuswindow.cpp b/src/gui/ministatuswindow.cpp index b1c6eba24..5e4559c9c 100644 --- a/src/gui/ministatuswindow.cpp +++ b/src/gui/ministatuswindow.cpp @@ -48,6 +48,8 @@ extern volatile int tick_time; +typedef std::vector ::const_iterator ProgressBarVectorCIter; + MiniStatusWindow::MiniStatusWindow() : Popup("MiniStatus", "ministatus.xml"), InventoryListener(), @@ -124,8 +126,7 @@ MiniStatusWindow::~MiniStatusWindow() if (inv) inv->removeInventoyListener(this); - for (std::vector ::const_iterator it = mBars.begin(), - it_end = mBars.end(); it != it_end; ++it) + FOR_EACH (ProgressBarVectorCIter, it, mBars) { ProgressBar *bar = *it; if (!bar) @@ -154,13 +155,10 @@ void MiniStatusWindow::updateBars() { int x = 0; const ProgressBar *lastBar = nullptr; - for (std::vector ::const_iterator it = mBars.begin(), - it_end = mBars.end(); it != it_end; ++it) - { + FOR_EACH (ProgressBarVectorCIter, it, mBars) safeRemove(*it); - } - for (std::vector ::const_iterator it = mBars.begin(), - it_end = mBars.end(); it != it_end; ++it) + + FOR_EACH (ProgressBarVectorCIter, it, mBars) { ProgressBar *const bar = *it; if (!bar) @@ -456,8 +454,7 @@ void MiniStatusWindow::loadBars() void MiniStatusWindow::saveBars() { int i = 0; - for (std::vector ::const_iterator it = mBars.begin(), - it_end = mBars.end(); it != it_end; ++it) + FOR_EACH (ProgressBarVectorCIter, it, mBars) { const ProgressBar *const bar = *it; if (!bar->isVisible()) diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index f2067d847..31b13e91f 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -60,6 +60,8 @@ NpcDialog::DialogList NpcDialog::instances; +typedef std::vector::iterator ImageVectorIter; + NpcDialog::NpcDialog(const int npcId) : Window(_("NPC"), false, nullptr, "npc.xml"), gcn::ActionListener(), @@ -209,8 +211,7 @@ NpcDialog::~NpcDialog() delete mListScrollArea; mListScrollArea = nullptr; - for (std::vector::iterator it = mImages.begin(), - it_end = mImages.end(); it != it_end; ++ it) + FOR_EACH (ImageVectorIter, it, mImages) { if (*it) (*it)->decRef(); @@ -378,8 +379,7 @@ const Image *NpcDialog::getImageAt(int i) void NpcDialog::choiceRequest() { mItems.clear(); - for (std::vector::iterator it = mImages.begin(), - it_end = mImages.end(); it != it_end; ++ it) + FOR_EACH (ImageVectorIter, it, mImages) { if (*it) (*it)->decRef(); @@ -459,8 +459,7 @@ bool NpcDialog::isInputFocused() const bool NpcDialog::isAnyInputFocused() { - for (DialogList::const_iterator it = instances.begin(), - it_end = instances.end(); it != it_end; ++it) + FOR_EACH (DialogList::const_iterator, it, instances) { if ((*it) && (*it)->isInputFocused()) return true; @@ -519,8 +518,7 @@ NpcDialog *NpcDialog::getActive() if (instances.size() == 1) return instances.front(); - for (DialogList::const_iterator it = instances.begin(), - it_end = instances.end(); it != it_end; ++it) + FOR_EACH (DialogList::const_iterator, it, instances) { if ((*it) && (*it)->isFocused()) return (*it); @@ -531,8 +529,7 @@ NpcDialog *NpcDialog::getActive() void NpcDialog::closeAll() { - for (DialogList::const_iterator it = instances.begin(), - it_end = instances.end(); it != it_end; ++it) + FOR_EACH (DialogList::const_iterator, it, instances) { if (*it) (*it)->close(); diff --git a/src/gui/npcpostdialog.cpp b/src/gui/npcpostdialog.cpp index b5e85938e..5135e56bd 100644 --- a/src/gui/npcpostdialog.cpp +++ b/src/gui/npcpostdialog.cpp @@ -125,9 +125,6 @@ void NpcPostDialog::setVisible(bool visible) void NpcPostDialog::closeAll() { - for (DialogList::const_iterator it = instances.begin(), - it_end = instances.end(); it != it_end; ++it) - { + FOR_EACH (DialogList::const_iterator, it, instances) (*it)->close(); - } } diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index 26494fe43..c41fdfcd2 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -92,11 +92,8 @@ int Palette::getIdByChar(const signed char c, bool &valid) void Palette::advanceGradients() { - for (Palettes::const_iterator it = mInstances.begin(), - it_end = mInstances.end(); it != it_end; ++it) - { + FOR_EACH (Palettes::const_iterator, it, mInstances) (*it)->advanceGradient(); - } } void Palette::advanceGradient() 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::const_iterator it = beings.begin(), - it_end = beings.end(); it != it_end; ++it) + FOR_EACH (std::vector::const_iterator, it, beings) { const Being *const being = dynamic_cast(*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 names = windowMenu->getButtons(); - for (std::vector ::const_iterator it = names.begin(), + std::vector