Fix code style and some new compilation warnings.

7 files changed, 14 insertions, 8 deletions

diff --git a/src/gui/connectiondialog.h b/src/gui/connectiondialog.h
index 623a66455..e6a1c03f3 100644
--- a/src/gui/connectiondialog.h
+++ b/src/gui/connectiondialog.h
@@ -55,7 +55,6 @@ class ConnectionDialog : public Window, gcn::ActionListener
         void draw(gcn::Graphics *graphics);
 
     private:
-        gcn::Label *mLabel;
         State mCancelState;
 };
 
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 1a164687c..90813ed80 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -92,6 +92,9 @@ PopupMenu::PopupMenu():
     mBrowserBox->setHighlightMode(BrowserBox::BACKGROUND);
     mBrowserBox->setOpaque(false);
     mBrowserBox->setLinkHandler(this);
+    mRenameListener.setMapItem(0);
+    mRenameListener.setDialog(0);
+
     add(mBrowserBox);
 }
 
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 7fc87c02a..221a94747 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -140,7 +140,7 @@ void QuitDialog::action(const gcn::ActionEvent &event)
             Client::setState(STATE_EXIT);
         }
         else if (Net::getGameHandler()->isConnected()
-            && mSwitchAccountServer->isSelected())
+                 && mSwitchAccountServer->isSelected())
         {
             Client::setState(STATE_SWITCH_SERVER);
         }
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 58d3d0957..8dc1ed46d 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -356,7 +356,8 @@ void StatusWindow::event(Channels channel _UNUSED_,
                     // new job exp limit, we fixing it
                     lvl ++;
                     blocked = true;
-                    PlayerInfo::setStatExperience(id, exp.first, 20000 + lvl * 150);
+                    PlayerInfo::setStatExperience(
+                        id, exp.first, 20000 + lvl * 150);
                     PlayerInfo::setStatBase(id, lvl);
                     blocked = false;
                 }
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 4c1e40bb9..f6621ee11 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -170,7 +170,10 @@ class LayoutCell
             FILL
         };
 
-        LayoutCell(): mType(NONE) {}
+        LayoutCell():
+            mWidget(0),
+            mType(NONE)
+        { }
 
         ~LayoutCell();
 
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index 8ce252150..0426c8c79 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -30,14 +30,14 @@
 float ShortcutContainer::mAlpha = 1.0;
 
 ShortcutContainer::ShortcutContainer():
-    mGridWidth(1),
-    mGridHeight(1),
     mBackgroundImg(0),
     mMaxItems(0),
     mBoxWidth(1),
     mBoxHeight(1),
     mCursorPosX(0),
-    mCursorPosY(0)
+    mCursorPosY(0),
+    mGridWidth(1),
+    mGridHeight(1)
 {
 }
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index e7c181de2..67339e361 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -300,7 +300,7 @@ void TextField::handlePaste()
     std::string text = getText();
     std::string::size_type caretPos = getCaretPosition();
 
-    if (RetrieveBuffer(text, caretPos))
+    if (retrieveBuffer(text, caretPos))
     {
         setText(text);
         setCaretPosition(static_cast<unsigned>(caretPos));