Rename Sigmod::Sigmod to Sigmod::Game so that the identifiers don't clash when using namespace Sigmod

1 files changed, 5 insertions, 5 deletions

diff --git a/sigmod/Move.cpp b/sigmod/Move.cpp
index 40e79999..42832c12 100644
--- a/sigmod/Move.cpp
+++ b/sigmod/Move.cpp
@@ -23,8 +23,8 @@
 #include "Move.h"
 
 // Sigmod includes
+#include "Game.h"
 #include "Macros.h"
-#include "Sigmod.h"
 
 // Qt includes
 #include <QtCore/QSet>
@@ -38,7 +38,7 @@ Move::Move(const Move& move) :
     *this = move;
 }
 
-Move::Move(const Sigmod* parent, const int id) :
+Move::Move(const Game* parent, const int id) :
         Object(parent, id),
         m_name(""),
         m_accuracy(1, 1),
@@ -54,13 +54,13 @@ Move::Move(const Sigmod* parent, const int id) :
 {
 }
 
-Move::Move(const Move& move, const Sigmod* parent, const int id) :
+Move::Move(const Move& move, const Game* parent, const int id) :
         Object(parent, id)
 {
     *this = move;
 }
 
-Move::Move(const QDomElement& xml, const Sigmod* parent, const int id) :
+Move::Move(const QDomElement& xml, const Game* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
@@ -142,7 +142,7 @@ CHECK_BEGIN(Move, Fraction&, accuracy)
     TBOUNDS_MOD(accuracy, 1, INT_MAX, accuracy.numerator());
 CHECK_END()
 CHECK_BOUNDS(Move, int, power, 0, INT_MAX)
-CHECK_INDEX(Move, int, type, sigmod(), type)
+CHECK_INDEX(Move, int, type, game(), type)
 CHECK(Move, bool, special)
 CHECK_BOUNDS(Move, int, powerPoints, 1, INT_MAX)
 CHECK(Move, int, priority)