Fixed some header issues and updated project files

2 files changed, 34 insertions, 27 deletions

diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 50464bcf..36b4a7a0 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -22,27 +22,26 @@
  */
 
 #include "serverdialog.h"
-
-#include <string>
+

 #include <iostream>
-#include "../utils/tostring.h"
-
-#include <guichan/widgets/label.hpp>
-
-#include "../main.h"
+#include <string>

+

+// TODO : Replace the dropdown by our own skinned one.

+#include <guichan/widgets/dropdown.hpp>

+#include <guichan/widgets/label.hpp>

+
+#include "button.h"

+#include "listbox.h"

+#include "ok_dialog.h"

+#include "scrollarea.h"

+#include "textfield.h"

+

+#include "../configuration.h"

+#include "../log.h"

 #include "../logindata.h"
-
-#include "log.h"
-#include "configuration.h"
-
-#include "button.h"
-#include "ok_dialog.h"
-#include "textfield.h"
-
-// TODO : Replace the dropdown by our own skinned one.
-#include <guichan/widgets/dropdown.hpp>
-#include "listbox.h"
-#include "scrollarea.h"
+#include "../main.h"

+

+#include "../utils/tostring.h"
 
 const short MAX_SERVERLIST = 5;
 
diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index be3361b0..687290f3 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -24,16 +24,20 @@
 #ifndef _TMW_SERVERDIALOG_H
 #define _TMW_SERVERDIALOG_H
 
-#include <iosfwd>
-#include <guichan/actionlistener.hpp>
+#include <iosfwd>

+#include <vector>

 
+#include <guichan/actionlistener.hpp>

+#include <guichan/listmodel.hpp>
+

+#include "login.h"
 #include "window.h"
+

 #include "../guichanfwd.h"
 
-#include "login.h"
 #include "../net/network.h"
 
-class LoginData;
+class LoginData;

 
 /**
  * A server structure to keep pairs of servers and ports.
@@ -50,7 +54,8 @@ struct Server {
 /**
  * Server and Port List Model
  */
-class ServersListModel : public gcn::ListModel {
+class ServersListModel : public gcn::ListModel

+{
     public:
         /**
          * Used to get number of line in the list
@@ -71,7 +76,8 @@ class ServersListModel : public gcn::ListModel {
         /**
          * Add an Element at the beginning of the server list
          */
-        void addFirstElement(Server server);
+        void addFirstElement(Server server);

+
     private:
         std::vector<Server> servers;
 };
@@ -79,7 +85,8 @@ class ServersListModel : public gcn::ListModel {
 /**
  * Listener used for handling the DropDown in the server Dialog.
  */
-class DropDownListener : public gcn::ActionListener {
+class DropDownListener : public gcn::ActionListener

+{
     public:
         DropDownListener(gcn::TextField *serverNameField,
                          gcn::TextField *serverPortField,
@@ -106,7 +113,8 @@ class DropDownListener : public gcn::ActionListener {
  *
  * \ingroup Interface
  */
-class ServerDialog : public Window, public gcn::ActionListener {
+class ServerDialog : public Window, public gcn::ActionListener

+{
     public:
         /**
          * Constructor