2 files changed, 3 insertions, 57 deletions
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index 2286a9b36..e236841a5 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -25,6 +25,8 @@
 
 #include "input/keydata.h"
 
+#include "gui/models/typelistmodel.h"
+
 #include "gui/windows/okdialog.h"
 #include "gui/windows/serverdialog.h"
 
@@ -36,29 +38,6 @@
 
 #include "utils/gettext.h"
 
-std::string TypeListModel::getElementAt(int elementIndex)
-{
-    if (elementIndex == 0)
-        return "TmwAthena";
-    else if (elementIndex == 1)
-        return "Evol";
-#ifdef EATHENA_SUPPORT
-    else if (elementIndex == 2)
-        return "eAthena";
-#ifdef MANASERV_SUPPORT
-    else if (elementIndex == 3)
-        return "ManaServ";
-#endif
-#else
-#ifdef MANASERV_SUPPORT
-    else if (elementIndex == 2)
-        return "ManaServ";
-#endif
-#endif
-    else
-        return "Unknown";
-}
-
 EditServerDialog::EditServerDialog(ServerDialog *const parent,
                                    ServerInfo server,
                                    const int index) :
diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h
index a3f649f0d..215666394 100644
--- a/src/gui/windows/editserverdialog.h
+++ b/src/gui/windows/editserverdialog.h
@@ -26,6 +26,7 @@ class Button;
 class TextField;
 class DropDown;
 class ServerDialog;
+class TypeListModel;
 
 #include "gui/widgets/window.h"
 
@@ -37,40 +38,6 @@ class ServerDialog;
 #include "gui/models/listmodel.h"
 
 /**
- * Server Type List Model
- */
-class TypeListModel : public ListModel
-{
-    public:
-        TypeListModel()
-        { }
-
-        /**
-         * Used to get number of line in the list
-         */
-        int getNumberOfElements() override final A_WARN_UNUSED
-#ifdef EATHENA_SUPPORT
-#ifdef MANASERV_SUPPORT
-        { return 4; }
-#else
-        { return 3; }
-#endif
-#else
-#ifdef MANASERV_SUPPORT
-        { return 3; }
-#else
-        { return 2; }
-#endif
-#endif
-
-        /**
-         * Used to get an element from the list
-         */
-        std::string getElementAt(int elementIndex)
-                                 override final A_WARN_UNUSED;
-};
-
-/**
  * The custom server addition dialog.
  *
  * \ingroup Interface