From 7ca971f04907031b80ffbcb159e5af2f595e3af8 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Fri, 23 Sep 2005 23:47:32 +0000
Subject: Merged most of the changes in biggeruniverse's second memory cleanup
 patch.

---
 src/gui/char_select.h | 61 +++++++++++++++++++++++++++------------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

(limited to 'src/gui/char_select.h')

diff --git a/src/gui/char_select.h b/src/gui/char_select.h
index c4aac4b9..3751a440 100644
--- a/src/gui/char_select.h
+++ b/src/gui/char_select.h
@@ -29,16 +29,35 @@
 
 #include "../guichanfwd.h"
 
+#include <SDL_events.h>
+
 class PlayerBox;
 struct PLAYER_INFO;
-struct SDL_KeyboardEvent;
 
 /**
  * Character selection dialog.
  *
  * \ingroup Interface
  */
-class CharSelectDialog : public Window, public gcn::ActionListener {
+class CharSelectDialog : public Window, public gcn::ActionListener
+{
+    public:
+        /**
+         * Constructor.
+         */
+        CharSelectDialog();
+
+        /**
+         * Destructor.
+         */
+        ~CharSelectDialog();
+
+        void action(const std::string& eventId);
+
+        void setPlayerInfo(PLAYER_INFO* pi);
+
+        void logic();
+
     private:
         gcn::Button *selectButton;
         gcn::Button *cancelButton;
@@ -73,31 +92,30 @@ class CharSelectDialog : public Window, public gcn::ActionListener {
             private:
                 CharSelectDialog *master;
         };
+};
 
+/**
+ * Character creation dialog.
+ *
+ * \ingroup GUI
+ */
+class CharCreateDialog : public Window, public gcn::ActionListener
+{
     public:
         /**
          * Constructor.
          */
-        CharSelectDialog();
+        CharCreateDialog(Window *parent = NULL);
 
         /**
          * Destructor.
          */
-        ~CharSelectDialog();
+        ~CharCreateDialog();
 
         void action(const std::string& eventId);
 
-        void setPlayerInfo(PLAYER_INFO* pi);
-
-        void logic();
-};
+        std::string getName();
 
-/**
- * Character creation dialog.
- *
- * \ingroup GUI
- */
-class CharCreateDialog : public Window, public gcn::ActionListener {
     private:
         gcn::TextField *nameField;
         gcn::Label *nameLabel;
@@ -117,21 +135,6 @@ class CharCreateDialog : public Window, public gcn::ActionListener {
          * info.
          */
         void serverCharCreate();
-
-    public:
-        /**
-         * Constructor.
-         */
-        CharCreateDialog(Window *parent = NULL);
-
-        /**
-         * Destructor.
-         */
-        ~CharCreateDialog();
-
-        void action(const std::string& eventId);
-
-        std::string getName();
 };
 
 void charSelectInputHandler(SDL_KeyboardEvent *keyEvent);
-- 
cgit v1.2.3-70-g09d2