Move playerignorestrategy into separate file.

6 files changed, 62 insertions, 27 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index df09dc971..c7aab2541 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -760,6 +760,7 @@ SET(SRCS
     particle/particleinfo.h
     party.cpp
     party.h
+    being/playerignorestrategy.h
     being/playerinfo.cpp
     being/playerinfo.h
     being/playerrelation.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index ab0936910..9193ad2d6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -847,6 +847,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      particle/particleinfo.h \
 	      party.cpp \
 	      party.h \
+	      being/playerignorestrategy.h \
 	      being/playerinfo.cpp \
 	      being/playerinfo.h \
 	      being/playerrelation.cpp \
diff --git a/src/being/playerignorestrategy.h b/src/being/playerignorestrategy.h
new file mode 100644
index 000000000..21e9fe3a5
--- /dev/null
+++ b/src/being/playerignorestrategy.h
@@ -0,0 +1,56 @@
+/*
+ *  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 BEING_PLAYERIGNORESTRATEGY_H
+#define BEING_PLAYERIGNORESTRATEGY_H
+
+#include <string>
+
+#include "localconsts.h"
+
+/**
+ * Ignore strategy: describes how we should handle ignores.
+ */
+class PlayerIgnoreStrategy
+{
+    public:
+        std::string mDescription;
+        std::string mShortName;
+
+        A_DELETE_COPY(PlayerIgnoreStrategy)
+
+        virtual ~PlayerIgnoreStrategy()
+        { }
+
+        /**
+         * Handle the ignoring of the indicated action by the indicated player.
+         */
+        virtual void ignore(Being *const being,
+                            const unsigned int flags) const = 0;
+    protected:
+        PlayerIgnoreStrategy() :
+            mDescription(),
+            mShortName()
+        {
+        }
+};
+#endif  // BEING_PLAYERIGNORESTRATEGY_H
diff --git a/src/being/playerrelations.cpp b/src/being/playerrelations.cpp
index 90f19c236..cdba9bfb6 100644
--- a/src/being/playerrelations.cpp
+++ b/src/being/playerrelations.cpp
@@ -26,6 +26,7 @@
 #include "configuration.h"
 
 #include "being/localplayer.h"
+#include "being/playerignorestrategy.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/being/playerrelations.h b/src/being/playerrelations.h
index f0b7b4279..9f9e45c2e 100644
--- a/src/being/playerrelations.h
+++ b/src/being/playerrelations.h
@@ -33,36 +33,10 @@
 #include "localconsts.h"
 
 class Being;
+class PlayerIgnoreStrategy;
 class PlayerRelationsListener;
 
 /**
- * Ignore strategy: describes how we should handle ignores.
- */
-class PlayerIgnoreStrategy
-{
-    public:
-        std::string mDescription;
-        std::string mShortName;
-
-        A_DELETE_COPY(PlayerIgnoreStrategy)
-
-        virtual ~PlayerIgnoreStrategy()
-        { }
-
-        /**
-         * Handle the ignoring of the indicated action by the indicated player.
-         */
-        virtual void ignore(Being *const being,
-                            const unsigned int flags) const = 0;
-    protected:
-        PlayerIgnoreStrategy() :
-            mDescription(),
-            mShortName()
-        {
-        }
-};
-
-/**
  * Player relations class, represents any particular relations and/or
  * preferences the user of the local client has wrt other players (identified
  * by std::string).
diff --git a/src/gui/models/ignorechoiceslistmodel.h b/src/gui/models/ignorechoiceslistmodel.h
index 8ba3eadb1..c172c7d3e 100644
--- a/src/gui/models/ignorechoiceslistmodel.h
+++ b/src/gui/models/ignorechoiceslistmodel.h
@@ -27,6 +27,8 @@
 
 #include "gui/models/playerrelationlistmodel.h"
 
+#include "being/playerignorestrategy.h"
+
 /**
  * Class for choosing one of the various `what to do when ignoring a player' options
  */