Merge branch 'master' of git@gitorious.org:tmw/eathena

1 files changed, 7 insertions, 11 deletions

diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index 74745788..23de061d 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -22,17 +22,16 @@
 #ifndef _CHAR_SELECT_H
 #define _CHAR_SELECT_H
 
+#include <guichan/actionlistener.hpp>
+
 #include "window.h"
 
-#include "../guichanfwd.h"
-#include "../lockedarray.h"
 #include "../being.h"
+#include "../lockedarray.h"
 
-#include <guichan/actionlistener.hpp>
-
-class Player;
 class LocalPlayer;
 class Network;
+class Player;
 class PlayerBox;
 
 /**
@@ -65,8 +64,7 @@ class CharSelectDialog : public Window, public gcn::ActionListener
 
         gcn::Button *mSelectButton;
         gcn::Button *mCancelButton;
-        gcn::Button *mNewCharButton;
-        gcn::Button *mDelCharButton;
+        gcn::Button *mNewDelCharButton;
         gcn::Button *mPreviousButton;
         gcn::Button *mNextButton;
 
@@ -110,14 +108,12 @@ class CharCreateDialog : public Window, public gcn::ActionListener
          */
         ~CharCreateDialog();
 
-        void
-        action(const gcn::ActionEvent &event);
+        void action(const gcn::ActionEvent &event);
 
         /**
          * Unlocks the dialog, enabling the create character button again.
          */
-        void
-        unlock();
+        void unlock();
 
     private:
         /**