1 files changed, 13 insertions, 12 deletions

diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index 04f43fb88..05691c2d2 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -44,7 +44,8 @@
 #include "debug.h"
 
 QuitDialog::QuitDialog(QuitDialog** pointerToMe):
-    Window(_("Quit"), true, NULL), mMyPointer(pointerToMe)
+    Window(_("Quit"), true, 0, "quit.xml"),
+    mMyPointer(pointerToMe)
 {
     mForceQuit = new RadioButton(_("Quit"), "quitdialog");
     mLogoutQuit = new RadioButton(_("Quit"), "quitdialog");
@@ -55,7 +56,7 @@ QuitDialog::QuitDialog(QuitDialog** pointerToMe):
 
     addKeyListener(this);
 
-    ContainerPlacer place = getPlacer(0, 0);
+    ContainerPlacer placer = getPlacer(0, 0);
 
     const State state = Client::getState();
 
@@ -67,25 +68,25 @@ QuitDialog::QuitDialog(QuitDialog** pointerToMe):
         state == STATE_UPDATE ||
         state == STATE_LOAD_DATA)
     {
-        placeOption(place, mForceQuit);
+        placeOption(placer, mForceQuit);
     }
     else
     {
         // Only added if we are connected to an accountserver or gameserver
-        placeOption(place, mLogoutQuit);
-        placeOption(place, mSwitchAccountServer);
+        placeOption(placer, mLogoutQuit);
+        placeOption(placer, mSwitchAccountServer);
 
         // Only added if we are connected to a gameserver
         if (state == STATE_GAME)
-            placeOption(place, mSwitchCharacter);
+            placeOption(placer, mSwitchCharacter);
     }
 
     mOptions[0]->setSelected(true);
 
-    place = getPlacer(0, 1);
+    placer = getPlacer(0, 1);
 
-    place(1, 0, mOkButton, 1);
-    place(2, 0, mCancelButton, 1);
+    placer(1, 0, mOkButton, 1);
+    placer(2, 0, mCancelButton, 1);
 
     reflowLayout(200, 0);
     setLocationRelativeTo(getParent());
@@ -109,9 +110,9 @@ QuitDialog::~QuitDialog()
     mSwitchCharacter = 0;
 }
 
-void QuitDialog::placeOption(ContainerPlacer &place, gcn::RadioButton *option)
+void QuitDialog::placeOption(ContainerPlacer &placer, gcn::RadioButton *option)
 {
-    place(0, static_cast<int>(mOptions.size()), option, 3);
+    placer(0, static_cast<int>(mOptions.size()), option, 3);
     mOptions.push_back(option);
 }
 
@@ -178,7 +179,7 @@ void QuitDialog::keyPressed(gcn::KeyEvent &keyEvent)
 
     if (dir != 0)
     {
-        std::vector<gcn::RadioButton*>::iterator it = mOptions.begin();
+        std::vector<gcn::RadioButton*>::const_iterator it = mOptions.begin();
 
         for (; it < mOptions.end(); ++it)
         {