Fix code style.

7 files changed, 18 insertions, 8 deletions

diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index ea2b7980c..3550883ba 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -173,9 +173,14 @@ void OutfitWindow::save()
             serverConfig.deleteKey("Outfit" + toString(o));
 
         if (mItemsUnequip[o])
+        {
             serverConfig.deleteKey("OutfitUnequip" + toString(o));
+        }
         else
-            serverConfig.setValue("OutfitUnequip" + toString(o), mItemsUnequip[o]);
+        {
+            serverConfig.setValue("OutfitUnequip" + toString(o),
+                mItemsUnequip[o]);
+        }
         outfitStr = "";
     }
     serverConfig.setValue("OutfitAwayIndex", mAwayOutfit);
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index ce82fa745..6e241fe11 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -1139,7 +1139,8 @@ void PopupMenu::showPopup(Window *parent, int x, int y, Item *item,
     {
         if (tradeWindow && tradeWindow->isVisible())
         {
-            mBrowserBox->addRow(strprintf("@@addtrade|%s@@", _("Add to trade")));
+            mBrowserBox->addRow(strprintf("@@addtrade|%s@@",
+                _("Add to trade")));
             if (cnt > 1)
             {
                 if (cnt > 10)
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 43e05aa70..d458a5156 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -278,7 +278,8 @@ void ShopWindow::addBuyItem(Item *item, int amount, int price)
 {
     if (!mBuyShopItems || !item)
         return;
-    mBuyShopItems->addItemNoDup(item->getId(), item->getColor(), amount, price);
+    mBuyShopItems->addItemNoDup(item->getId(),
+        item->getColor(), amount, price);
     updateButtonsAndLabels();
 }
 
@@ -286,7 +287,8 @@ void ShopWindow::addSellItem(Item *item, int amount, int price)
 {
     if (!mBuyShopItems || !item)
         return;
-    mSellShopItems->addItemNoDup(item->getId(), item->getColor(), amount, price);
+    mSellShopItems->addItemNoDup(item->getId(),
+        item->getColor(), amount, price);
     updateButtonsAndLabels();
 }
 
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index ede4c7a3d..ab53c38e6 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -161,7 +161,7 @@ void TradeWindow::addItem(int id, bool own, int quantity,
 }
 
 void TradeWindow::addItem2(int id, bool own, int quantity,
-                          int refine, unsigned char color, bool equipment)
+                           int refine, unsigned char color, bool equipment)
 {
     if (own)
         mMyInventory->addItem(id, quantity, refine, color, equipment);
diff --git a/src/gui/trade.h b/src/gui/trade.h
index be2b2673f..67515c013 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -75,7 +75,7 @@ class TradeWindow : public Window, gcn::ActionListener, gcn::SelectionListener
          * Add an item to the trade window.
          */
         void addItem2(int id, bool own, int quantity, int refine,
-                     unsigned char color, bool equipment);
+                      unsigned char color, bool equipment);
 
         /**
          * Change quantity of an item.
diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/widgets/shopitems.cpp
index c0b93508e..15f4292a5 100644
--- a/src/gui/widgets/shopitems.cpp
+++ b/src/gui/widgets/shopitems.cpp
@@ -54,7 +54,8 @@ void ShopItems::addItem(int id, unsigned char color, int amount, int price)
     mShopItems.push_back(new ShopItem(-1, id, color, amount, price));
 }
 
-void ShopItems::addItemNoDup(int id, unsigned char color, int amount, int price)
+void ShopItems::addItemNoDup(int id, unsigned char color,
+                             int amount, int price)
 {
     ShopItem *item = findItem(id, color);
     if (!item)
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index d0f6931aa..8f4cee1ac 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -116,7 +116,8 @@ void SpellShortcutContainer::draw(gcn::Graphics *graphics)
 
         g->drawImage(mBackgroundImg, itemX, itemY);
 
-        int itemId = spellShortcut->getItem((mNumber * SPELL_SHORTCUT_ITEMS) + i);
+        int itemId = spellShortcut->getItem(
+            (mNumber * SPELL_SHORTCUT_ITEMS) + i);
         if (selectedId >= 0 && itemId == selectedId)
         {
             g->drawRectangle(gcn::Rectangle(