Move ignorechoiceslistmodel into gui/models directory.

4 files changed, 58 insertions, 25 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b8b2b1925..bff6a6ae1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -142,6 +142,7 @@ SET(SRCS
     gui/models/extendednamesmodel.cpp
     gui/models/extendednamesmodel.h
     gui/models/fontsmodel.h
+    gui/models/ignorechoiceslistmodel.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 dec589c4b..7de2a97d0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -238,6 +238,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/models/extendednamesmodel.cpp \
 	      gui/models/extendednamesmodel.h \
 	      gui/models/fontsmodel.h \
+	      gui/models/ignorechoiceslistmodel.h \
 	      gui/widgets/flowcontainer.cpp \
 	      gui/widgets/flowcontainer.h \
 	      gui/widgets/tabs/gmtab.cpp \
diff --git a/src/gui/models/ignorechoiceslistmodel.h b/src/gui/models/ignorechoiceslistmodel.h
new file mode 100644
index 000000000..7234b57f2
--- /dev/null
+++ b/src/gui/models/ignorechoiceslistmodel.h
@@ -0,0 +1,55 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2008-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  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_IGNORECHOICESLISTMODEL_H
+#define GUI_MODELS_IGNORECHOICESLISTMODEL_H
+
+#include "being/playerrelations.h"
+
+#include "gui/models/playerrelationlistmodel.h"
+
+/**
+ * Class for choosing one of the various `what to do when ignoring a player' options
+ */
+class IgnoreChoicesListModel final : public ListModel
+{
+    public:
+        ~IgnoreChoicesListModel()
+        { }
+
+        int getNumberOfElements() override final
+        {
+            return static_cast<int>(player_relations.getPlayerIgnoreStrategies(
+                )->size());
+        }
+
+        std::string getElementAt(int i) override final
+        {
+            if (i >= getNumberOfElements() || i < 0)
+                return "???";
+
+            return (*player_relations.getPlayerIgnoreStrategies())
+                [i]->mDescription;
+        }
+};
+
+#endif  // GUI_MODELS_IGNORECHOICESLISTMODEL_H
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 8fa377e3d..1f85a23b4 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -26,6 +26,7 @@
 
 #include "being/localplayer.h"
 
+#include "gui/models/ignorechoiceslistmodel.h"
 #include "gui/models/playerrelationlistmodel.h"
 
 #include "gui/widgets/button.h"
@@ -178,31 +179,6 @@ protected:
     PlayerRelationListModel *mListModel;
 };
 
-/**
- * Class for choosing one of the various `what to do when ignoring a player' options
- */
-class IgnoreChoicesListModel final : public ListModel
-{
-public:
-    ~IgnoreChoicesListModel()
-    { }
-
-    int getNumberOfElements() override final
-    {
-        return static_cast<int>(player_relations.getPlayerIgnoreStrategies()
-                                ->size());
-    }
-
-    std::string getElementAt(int i) override final
-    {
-        if (i >= getNumberOfElements() || i < 0)
-            return "???";
-
-        return (*player_relations.getPlayerIgnoreStrategies())
-            [i]->mDescription;
-    }
-};
-
 static const std::string ACTION_DELETE("delete");
 static const std::string ACTION_TABLE("table");
 static const std::string ACTION_STRATEGY("strategy");