Move playerrelationlistmodel into gui/models directory.

4 files changed, 71 insertions, 37 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 06dfac28e..b8b2b1925 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -179,6 +179,7 @@ SET(SRCS
     gui/widgets/listbox.h
     gui/models/namesmodel.cpp
     gui/models/namesmodel.h
+    gui/models/playerrelationlistmodel.h
     gui/widgets/passwordfield.cpp
     gui/widgets/passwordfield.h
     gui/widgets/playerbox.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index b8e8abc3f..dec589c4b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -277,6 +277,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/listbox.h \
 	      gui/models/namesmodel.cpp \
 	      gui/models/namesmodel.h \
+	      gui/models/playerrelationlistmodel.h \
 	      gui/widgets/passwordfield.cpp \
 	      gui/widgets/passwordfield.h \
 	      gui/widgets/playerbox.cpp \
diff --git a/src/gui/models/playerrelationlistmodel.h b/src/gui/models/playerrelationlistmodel.h
new file mode 100644
index 000000000..9251631f7
--- /dev/null
+++ b/src/gui/models/playerrelationlistmodel.h
@@ -0,0 +1,67 @@
+/*
+ *  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_PLAYERRELATIONLISTMODEL_H
+#define GUI_MODELS_PLAYERRELATIONLISTMODEL_H
+
+#include "being/playerrelations.h"
+
+#include "utils/gettext.h"
+
+static const char *const RELATION_NAMES[PlayerRelation::RELATIONS_NR] =
+{
+    // TRANSLATORS: relation type
+    N_("Neutral"),
+    // TRANSLATORS: relation type
+    N_("Friend"),
+    // TRANSLATORS: relation type
+    N_("Disregarded"),
+    // TRANSLATORS: relation type
+    N_("Ignored"),
+    // TRANSLATORS: relation type
+    N_("Erased"),
+    // TRANSLATORS: relation type
+    N_("Blacklisted"),
+    // TRANSLATORS: relation type
+    N_("Enemy")
+};
+
+class PlayerRelationListModel final : public ListModel
+{
+    public:
+        ~PlayerRelationListModel()
+        { }
+
+        int getNumberOfElements() override final
+        {
+            return PlayerRelation::RELATIONS_NR;
+        }
+
+        std::string getElementAt(int i) override final
+        {
+            if (i >= getNumberOfElements() || i < 0)
+                return "";
+            return gettext(RELATION_NAMES[i]);
+        }
+};
+
+#endif
diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp
index 1af4e1769..8fa377e3d 100644
--- a/src/gui/widgets/tabs/setup_relations.cpp
+++ b/src/gui/widgets/tabs/setup_relations.cpp
@@ -26,6 +26,8 @@
 
 #include "being/localplayer.h"
 
+#include "gui/models/playerrelationlistmodel.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/dropdown.h"
@@ -60,43 +62,6 @@ static const char *const table_titles[COLUMNS_NR] =
     N_("Relation")
 };
 
-static const char *const RELATION_NAMES[PlayerRelation::RELATIONS_NR] =
-{
-    // TRANSLATORS: relation type
-    N_("Neutral"),
-    // TRANSLATORS: relation type
-    N_("Friend"),
-    // TRANSLATORS: relation type
-    N_("Disregarded"),
-    // TRANSLATORS: relation type
-    N_("Ignored"),
-    // TRANSLATORS: relation type
-    N_("Erased"),
-    // TRANSLATORS: relation type
-    N_("Blacklisted"),
-    // TRANSLATORS: relation type
-    N_("Enemy")
-};
-
-class PlayerRelationListModel final : public ListModel
-{
-public:
-    ~PlayerRelationListModel()
-    { }
-
-    int getNumberOfElements() override final
-    {
-        return PlayerRelation::RELATIONS_NR;
-    }
-
-    std::string getElementAt(int i) override final
-    {
-        if (i >= getNumberOfElements() || i < 0)
-            return "";
-        return gettext(RELATION_NAMES[i]);
-    }
-};
-
 class PlayerTableModel final : public Widget2, public TableModel
 {
 public: