Improve a bit iterators again.

6 files changed, 9 insertions, 13 deletions

diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 75a9b5fbc..966223685 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -607,8 +607,9 @@ void ChatWindow::removeAllWhispers()
 
 void ChatWindow::ignoreAllWhispers()
 {
-    TabMap::iterator iter;
-    for (iter = mWhispers.begin(); iter != mWhispers.end(); ++iter)
+    for (TabMap::iterator iter = mWhispers.begin();
+         iter != mWhispers.end();
+         ++ iter)
     {
         WhisperTab *tab = dynamic_cast<WhisperTab*>(iter->second);
         if (tab && player_relations.getRelation(tab->getNick())
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 2a46cf2ce..f01d74984 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -296,9 +296,7 @@ void OutfitWindow::copyOutfit(int src, int dst)
     }
 
     for (int i = 0; i < OUTFIT_ITEM_COUNT; i++)
-    {
         mItems[dst][i] = mItems[src][i];
-    }
 }
 
 void OutfitWindow::draw(gcn::Graphics *graphics)
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index c2429c550..319476591 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -337,9 +337,9 @@ void Viewport::_drawDebugPath(Graphics *graphics)
     // We draw the path proposed by mouse
 
     // Draw the path debug information for every beings.
-    ActorSpritesConstIterator it, it_end;
     const ActorSprites &actors = actorSpriteManager->getAll();
-    for (it = actors.begin(), it_end = actors.end() ; it != it_end; ++ it)
+    for (ActorSpritesConstIterator it = actors.begin(), it_end = actors.end();
+         it != it_end; ++ it)
     {
         Being *being = dynamic_cast<Being*>(*it);
         if (being && being != player_node)
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index d3f316021..438318fdc 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -232,9 +232,7 @@ void WhoIsOnline::updateWindow(std::vector<OnlinePlayer*> &friends,
 //        addedFromSection = false;
     }
     for (int i = 0; i < static_cast<int>(disregard.size()); i++)
-    {
         mBrowserBox->addRow(disregard.at(i)->getText());
-    }
 
     if (mScrollArea->getVerticalMaxScroll() <
         mScrollArea->getVerticalScrollAmount())
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 3f3bbe937..70f2c47fb 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -316,9 +316,8 @@ Item *ItemContainer::getSelectedItem() const
 
 void ItemContainer::distributeValueChangedEvent()
 {
-    SelectionListenerIterator i, i_end;
-
-    for (i = mSelectionListeners.begin(), i_end = mSelectionListeners.end();
+    for (SelectionListenerIterator i = mSelectionListeners.begin(),
+         i_end = mSelectionListeners.end();
          i != i_end; ++i)
     {
         if (*i)
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 2bebc69a7..7ecb8e2fa 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -393,9 +393,9 @@ void WindowMenu::loadButtons()
 
 void WindowMenu::saveButtons()
 {
-    std::vector <gcn::Button*>::iterator it, it_end;
     int i = 0;
-    for (it = mButtons.begin(), it_end = mButtons.end();
+    for (std::vector <gcn::Button*>::iterator it = mButtons.begin(),
+         it_end = mButtons.end();
          it != it_end; ++it)
     {
         Button *btn = dynamic_cast<Button*>(*it);