Moved Direction enumeration out of Global.h, awating deletion

4 files changed, 59 insertions, 29 deletions

diff --git a/sigmod/CMakeLists.txt b/sigmod/CMakeLists.txt
index ba6b2b12..8007c79b 100644
--- a/sigmod/CMakeLists.txt
+++ b/sigmod/CMakeLists.txt
@@ -10,6 +10,7 @@ SET(sigmod_HEADERS
     Badge.h
     CoinList.h
     CoinListItem.h
+    Direction.h
     EggGroup.h
     Global.h
     GlobalScript.h
diff --git a/sigmod/Direction.h b/sigmod/Direction.h
new file mode 100644
index 00000000..8201cbf2
--- /dev/null
+++ b/sigmod/Direction.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2009 Abshiehk Mukherjee <linkinpark342@gmail.com
+ * 
+ * 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 3 of the License, or
+ * (at your option) 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 SIGMOD_DIRECTION
+#define SIGMOD_DIRECTION
+
+// Qt includes
+#include <QtCore/QMetaType>
+#include <QtCore/QStringList>
+
+namespace Sigmod
+{
+
+/**
+ * \enum Direction
+ * \brief Enumeration of directions.
+ */
+enum Direction
+{
+    D_Up = 0,
+    D_Down = 1,
+    D_Left = 2,
+    D_Right = 3,
+    D_None = 4
+};
+/// Strings for the directions.
+const QStringList DirectionStr = QStringList() << "Up" << "Down" << "Left" << "Right" << "None";
+
+}
+Q_DECLARE_METATYPE(Sigmod::Direction)
+
+#endif
\ No newline at end of file
diff --git a/sigmod/Global.h b/sigmod/Global.h
index 378cfba0..2ce04deb 100644
--- a/sigmod/Global.h
+++ b/sigmod/Global.h
@@ -1,5 +1,6 @@
 /*
  * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2009 Abshiehk Mukherjee <linkinpark342@gmail.com
  * 
  * 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
@@ -22,10 +23,6 @@
 #ifndef SIGMOD_GLOBAL
 #define SIGMOD_GLOBAL
 
-// Qt includes
-#include <QtCore/QMetaType>
-#include <QtCore/QStringList>
-
 // KDE includes
 #include <kdemacros.h>
 
@@ -42,29 +39,4 @@
 #   define SIGMOD_EXPORT_DEPRECATED KDE_DEPRECATED SIGMOD_EXPORT /// Mark as deprecated
 #endif
 
-namespace Sigmod
-{
-/// Strings for the stats for a combined Special stat.
-const QStringList StatRBYStr = QStringList() << "HP" << "Attack" << "Defense" << "Speed" << "Special" << "" << "Accuracy" << "Evasion";
-/// Strings for the stats when the Special stat is split.
-const QStringList StatGSCStr = QStringList() << "HP" << "Attack" << "Defense" << "Speed" << "Special Attack" << "Special Defense" << "Accuracy" << "Evasion";
-
-/**
- * \enum Direction
- * \brief Enumeration of directions.
- */
-enum Direction
-{
-    D_Up = 0,
-    D_Down = 1,
-    D_Left = 2,
-    D_Right = 3,
-    D_None = 4
-};
-/// Strings for the directions.
-const QStringList DirectionStr = QStringList() << "Up" << "Down" << "Left" << "Right" << "None";
-
-}
-Q_DECLARE_METATYPE(Sigmod::Direction)
-
 #endif
diff --git a/sigmod/Stat.h b/sigmod/Stat.h
index 25496deb..53c9f317 100644
--- a/sigmod/Stat.h
+++ b/sigmod/Stat.h
@@ -22,6 +22,11 @@
 #ifndef SIGMOD_STAT
 #define SIGMOD_STAT
 
+// Qt includes
+#include <QtCore/QMetaType>
+#include <QtCore/QStringList>
+
+
 namespace Sigmod
 {
 /**
@@ -40,6 +45,12 @@ enum Stat
     ST_Accuracy = 6,
     ST_Evasion = 7
 };
+
+/// Strings for the stats for a combined Special stat.
+const QStringList StatRBYStr = QStringList() << "HP" << "Attack" << "Defense" << "Speed" << "Special" << "" << "Accuracy" << "Evasion";
+/// Strings for the stats when the Special stat is split.
+const QStringList StatGSCStr = QStringList() << "HP" << "Attack" << "Defense" << "Speed" << "Special Attack" << "Special Defense" << "Accuracy" << "Evasion";
+
 }
 Q_DECLARE_METATYPE(Sigmod::Stat)