From f3a89322713a379678abc420d75230a9b17aa18f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 21 Jun 2013 21:29:51 +0300
Subject: fix code style.

---
 src/gui/widgets/characterviewnormal.cpp | 1 -
 src/gui/widgets/characterviewnormal.h   | 1 -
 src/gui/widgets/chattab.cpp             | 1 -
 src/gui/widgets/itemcontainer.cpp       | 2 --
 src/gui/widgets/popuplist.cpp           | 2 +-
 src/gui/widgets/vertcontainer.cpp       | 3 ++-
 src/gui/widgets/window.cpp              | 5 ++++-
 7 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/gui/widgets')

diff --git a/src/gui/widgets/characterviewnormal.cpp b/src/gui/widgets/characterviewnormal.cpp
index 74cb0bdec..50dd8f7e4 100644
--- a/src/gui/widgets/characterviewnormal.cpp
+++ b/src/gui/widgets/characterviewnormal.cpp
@@ -32,7 +32,6 @@ CharacterViewNormal::CharacterViewNormal(CharSelectDialog *const widget,
                                          *const entries,
                                          const int padding) :
     CharacterViewBase(widget, padding),
-    mSelectedEntry(nullptr),
     mCharacterEntries(entries)
 {
     addKeyListener(widget);
diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h
index d9b65d765..b8b8e1f7c 100644
--- a/src/gui/widgets/characterviewnormal.h
+++ b/src/gui/widgets/characterviewnormal.h
@@ -43,7 +43,6 @@ class CharacterViewNormal final : public CharacterViewBase
         void action(const gcn::ActionEvent &event A_UNUSED) override;
 
     private:
-        CharacterDisplay *mSelectedEntry;
         std::vector<CharacterDisplay*> *mCharacterEntries;
 };
 
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index cad16dde3..3ab9594fe 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -193,7 +193,6 @@ void ChatTab::chatLog(std::string line, Own own,
             lineColor = "##L";
             break;
         default:
-            logger->log1("ChatTab::chatLog incorrect value in switch");
             break;
     }
 
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 7f4846fce..997e1af7f 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -695,8 +695,6 @@ void ItemContainer::moveHighlight(const Direction direction)
             mHighlightedIndex += mGridColumns;
             break;
         default:
-            logger->log("warning moveHighlight unknown direction:"
-                        + toString(static_cast<unsigned>(direction)));
             break;
     }
 }
diff --git a/src/gui/widgets/popuplist.cpp b/src/gui/widgets/popuplist.cpp
index 8cea612ab..fea5225d7 100644
--- a/src/gui/widgets/popuplist.cpp
+++ b/src/gui/widgets/popuplist.cpp
@@ -135,7 +135,7 @@ void PopupList::mousePressed(gcn::MouseEvent& mouseEvent)
         releaseModalFocus();
 }
 
-void PopupList::focusGained(const gcn::Event& event A_UNUSED)
+void PopupList::focusGained(const gcn::Event& event)
 {
     const gcn::Widget *const source = event.getSource();
     if (!mVisible || source == this || source == mListBox
diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp
index 0611b3714..947080762 100644
--- a/src/gui/widgets/vertcontainer.cpp
+++ b/src/gui/widgets/vertcontainer.cpp
@@ -54,7 +54,8 @@ void VertContainer::add2(gcn::Widget *const widget, const bool resizable,
     widget->setPosition(mLeftSpacing, mNextY);
     if (resizable)
     {
-        widget->setSize(mDimension.width - mLeftSpacing, mVerticalItemSize * 5);
+        widget->setSize(mDimension.width - mLeftSpacing,
+            mVerticalItemSize * 5);
         mResizableWidgets.push_back(widget);
     }
     else if (widget->getHeight() > mVerticalItemSize)
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 94937cac6..674fc171d 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -1019,7 +1019,10 @@ void Window::adjustPositionAfterResize(const int oldScreenWidth,
     if (mDimension.x > 0 && mDimension.x > rightMargin)
         mDimension.x = mainGraphics->mWidth - rightMargin - mDimension.width;
     if (mDimension.y > 0 && mDimension.y > bottomMargin)
-        mDimension.y = mainGraphics->mHeight - bottomMargin - mDimension.height;
+    {
+        mDimension.y = mainGraphics->mHeight
+            - bottomMargin - mDimension.height;
+    }
 
     ensureOnScreen();
 }
-- 
cgit v1.2.3-60-g2f50