Move listmodel into gui/modesl directory.

6 files changed, 11 insertions, 15 deletions

diff --git a/src/gui/widgets/tabs/setup_audio.h b/src/gui/widgets/tabs/setup_audio.h
index aaadebf32..b3736e814 100644
--- a/src/gui/widgets/tabs/setup_audio.h
+++ b/src/gui/widgets/tabs/setup_audio.h
@@ -39,7 +39,7 @@ class Setup_Audio final : public SetupTabScroll
         void apply() override final;
 
     private:
-        gcn::ListModel *mSoundModel;
+        ListModel *mSoundModel;
 
         SetupItemNames *mChannelsList;
 };
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 24bf229ef..ed371b364 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -39,7 +39,7 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabstrip.h"
 
-#include "gui/base/listmodel.hpp"
+#include "gui/models/listmodel.h"
 
 #include "debug.h"
 
@@ -51,7 +51,7 @@ static const int setupGroups = 9;
  *
  * \ingroup Interface
  */
-class KeyListModel final : public gcn::ListModel
+class KeyListModel final : public ListModel
 {
     public:
         KeyListModel() :
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index dd08d437b..1af4e1769 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -78,7 +78,7 @@ static const char *const RELATION_NAMES[PlayerRelation::RELATIONS_NR] =
     N_("Enemy")
 };
 
-class PlayerRelationListModel final : public gcn::ListModel
+class PlayerRelationListModel final : public ListModel
 {
 public:
     ~PlayerRelationListModel()
@@ -216,7 +216,7 @@ protected:
 /**
  * Class for choosing one of the various `what to do when ignoring a player' options
  */
-class IgnoreChoicesListModel final : public gcn::ListModel
+class IgnoreChoicesListModel final : public ListModel
 {
 public:
     ~IgnoreChoicesListModel()
diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h
index e32889008..9fc197ffc 100644
--- a/src/gui/widgets/tabs/setup_relations.h
+++ b/src/gui/widgets/tabs/setup_relations.h
@@ -33,15 +33,11 @@ class Button;
 class CheckBox;
 class DropDown;
 class GuiTable;
+class ListModel;
 class PlayerTableModel;
 class ScrollArea;
 class StaticTableModel;
 
-namespace gcn
-{
-    class ListModel;
-}
-
 class Setup_Relations final : public SetupTab,
                               public PlayerRelationsListener
 {
@@ -78,7 +74,7 @@ private:
 
     Button *mDeleteButton;
 
-    gcn::ListModel *mIgnoreActionChoicesModel;
+    ListModel *mIgnoreActionChoicesModel;
     DropDown *mIgnoreActionChoicesBox;
 };
 
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index b744eb0eb..1d5f0f910 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -116,7 +116,7 @@ const char *SIZE_NAME[maxFontSizes] =
     N_("Huge (23)"),
 };
 
-class FontSizeChoiceListModel final : public gcn::ListModel
+class FontSizeChoiceListModel final : public ListModel
 {
 public:
     ~FontSizeChoiceListModel()
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index 4e4408ce6..b587e8d5d 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -46,7 +46,7 @@
 
 #include "test/testmain.h"
 
-#include "gui/base/listmodel.hpp"
+#include "gui/models/listmodel.h"
 
 #include <algorithm>
 
@@ -54,7 +54,7 @@
 
 extern Graphics *mainGraphics;
 
-class ModeListModel final : public gcn::ListModel
+class ModeListModel final : public ListModel
 {
     public:
         ModeListModel();
@@ -159,7 +159,7 @@ int ModeListModel::getIndexOf(const std::string &widthXHeightMode)
     return -1;
 }
 
-class OpenGLListModel final : public gcn::ListModel
+class OpenGLListModel final : public ListModel
 {
 public:
     ~OpenGLListModel()