Used custom widgets where appropriate and some cleanup

Replaced many gcn::Label with Label, gcn::Slider with Slider in
character creation dialog. Also cleaned up includes.

1 files changed, 16 insertions, 11 deletions

diff --git a/src/gui/serverdialog.h b/src/gui/serverdialog.h
index 492f5a2b..9906e04a 100644
--- a/src/gui/serverdialog.h
+++ b/src/gui/serverdialog.h
@@ -22,26 +22,26 @@
 #ifndef SERVERDIALOG_H
 #define SERVERDIALOG_H
 
-#include <iosfwd>
-#include <vector>
+#include "gui/window.h"
 
-#include <guichan/actionlistener.hpp>
-#include <guichan/listmodel.hpp>
-#include "./widgets/dropdown.h"
+#include "guichanfwd.h"
 
-#include "login.h"
-#include "window.h"
+#include "net/tmwserv/network.h"
 
-#include "../guichanfwd.h"
+#include <guichan/actionlistener.hpp>
+#include <guichan/listmodel.hpp>
 
-#include "../net/tmwserv/network.h"
+#include <string>
+#include <vector>
 
+class DropDown;
 class LoginData;
 
 /**
  * A server structure to keep pairs of servers and ports.
  */
-struct Server {
+struct Server
+{
     Server():
         port(0)
     {}
@@ -60,18 +60,23 @@ class ServersListModel : public gcn::ListModel
          * Used to get number of line in the list
          */
         int getNumberOfElements();
+
         /**
          * Used to get an element from the list
          */
         std::string getElementAt(int elementIndex);
+
         /**
          * Used to get the corresponding Server struct
          */
-        Server getServer(int elementIndex) { return servers[elementIndex]; };
+        Server getServer(int elementIndex) const
+        { return servers[elementIndex]; }
+
         /**
          * Add an Element at the end of the server list
          */
         void addElement(Server server);
+
         /**
          * Add an Element at the beginning of the server list
          */