Move themesmodel into gui/models directory.

5 files changed, 47 insertions, 11 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index af1191eee..06dfac28e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -141,6 +141,7 @@ SET(SRCS
     gui/models/extendedlistmodel.h
     gui/models/extendednamesmodel.cpp
     gui/models/extendednamesmodel.h
+    gui/models/fontsmodel.h
     gui/widgets/flowcontainer.cpp
     gui/widgets/flowcontainer.h
     gui/widgets/tabs/gmtab.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 733c470d0..b8e8abc3f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -237,6 +237,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/models/extendedlistmodel.h \
 	      gui/models/extendednamesmodel.cpp \
 	      gui/models/extendednamesmodel.h \
+	      gui/models/fontsmodel.h \
 	      gui/widgets/flowcontainer.cpp \
 	      gui/widgets/flowcontainer.h \
 	      gui/widgets/tabs/gmtab.cpp \
diff --git a/src/gui/models/fontsmodel.h b/src/gui/models/fontsmodel.h
new file mode 100644
index 000000000..b20d3386b
--- /dev/null
+++ b/src/gui/models/fontsmodel.h
@@ -0,0 +1,42 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2009-2010  Andrei Karas
+ *  Copyright (C) 2011-2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_MODELS_FONTSMODEL_H
+#define GUI_MODELS_FONTSMODEL_H
+
+#include "gui/theme.h"
+
+#include "gui/models/namesmodel.h"
+
+#include "debug.h"
+
+class FontsModel final : public NamesModel
+{
+    public:
+        FontsModel() :
+            NamesModel()
+        { Theme::fillFontsList(mNames); }
+
+        ~FontsModel()
+        { }
+};
+
+#endif  // GUI_MODELS_FONTSMODEL_H
diff --git a/src/gui/models/themesmodel.h b/src/gui/models/themesmodel.h
index b8b9dbae6..b19c698fc 100644
--- a/src/gui/models/themesmodel.h
+++ b/src/gui/models/themesmodel.h
@@ -22,6 +22,8 @@
 #ifndef GUI_MODELS_THEMESMODEL_H
 #define GUI_MODELS_THEMESMODEL_H
 
+#include "gui/theme.h"
+
 #include "gui/models/namesmodel.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index 7f2804c2f..4bde4b35e 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -27,6 +27,7 @@
 #include "gui/windows/okdialog.h"
 
 #include "gui/models/extendedlistmodel.h"
+#include "gui/models/fontsmodel.h"
 #include "gui/models/namesmodel.h"
 #include "gui/models/themesmodel.h"
 
@@ -55,17 +56,6 @@ const char* ACTION_JAPAN_FONT = "japanese font";
 const char* ACTION_CHINA_FONT = "chinese font";
 const char* ACTION_INFO = "info";
 
-class FontsModel final : public NamesModel
-{
-public:
-    FontsModel() :
-        NamesModel()
-    { Theme::fillFontsList(mNames); }
-
-    ~FontsModel()
-    { }
-};
-
 const int maxFontSizes = 16;
 
 const char *SIZE_NAME[maxFontSizes] =