1 files changed, 12 insertions, 10 deletions

diff --git a/sigmod/test/TestSpeciesMove.cpp b/sigmod/test/TestSpeciesMove.cpp
index ec8b5454..979af8c3 100644
--- a/sigmod/test/TestSpeciesMove.cpp
+++ b/sigmod/test/TestSpeciesMove.cpp
@@ -19,8 +19,8 @@
 #include "TestSpeciesMove.h"
 
 // Sigmod includes
+#include "../Game.h"
 #include "../Rules.h"
-#include "../Sigmod.h"
 #include "../Species.h"
 #include "../SpeciesMove.h"
 
@@ -28,11 +28,13 @@
 #include <QtCore/QFile>
 #include <QtTest/QTest>
 
+using namespace Sigmod;
+
 void TestSpeciesMove::initTestCase()
 {
     TestSigmodObject::initTestCase();
     
-    Sigmod::Species* species = m_sigmod->newSpecies();
+    Species* species = m_game->newSpecies();
     
     m_speciesMove1 = species->newMove();
     m_speciesMove2 = species->newMove();
@@ -69,7 +71,7 @@ void TestSpeciesMove::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_sigmod->newMove();
+    m_game->newMove();
     
     m_speciesMove1->setMove(0);
     m_speciesMove1->validate();
@@ -77,7 +79,7 @@ void TestSpeciesMove::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_sigmod->rules()->setMaxLevel(25);
+    m_game->rules()->setMaxLevel(25);
     
     m_speciesMove1->setLevel(15);
     m_speciesMove1->validate();
@@ -85,14 +87,14 @@ void TestSpeciesMove::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_sigmod->rules()->setMaxLevel(10);
+    m_game->rules()->setMaxLevel(10);
     
     m_speciesMove1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 2);
     
-    m_sigmod->rules()->setMaxLevel(50);
+    m_game->rules()->setMaxLevel(50);
     
     m_speciesMove1->setWild(40);
     m_speciesMove1->validate();
@@ -100,7 +102,7 @@ void TestSpeciesMove::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 2);
     
-    m_sigmod->rules()->setMaxLevel(30);
+    m_game->rules()->setMaxLevel(30);
     
     m_speciesMove1->validate();
     
@@ -110,7 +112,7 @@ void TestSpeciesMove::validation()
 
 void TestSpeciesMove::saving()
 {
-    QDomDocument xml = Sigmod::Object::xml(m_speciesMove1);
+    QDomDocument xml = Object::xml(m_speciesMove1);
     QFile file("speciesMove.xml");
     
     QVERIFY(file.open(QIODevice::WriteOnly));
@@ -123,7 +125,7 @@ void TestSpeciesMove::loading()
     QDomDocument xml;
     QFile file("speciesMove.xml");
     
-    m_sigmod->newMove();
+    m_game->newMove();
     
     m_speciesMove1->setMove(1);
     m_speciesMove1->setLevel(5);
@@ -145,7 +147,7 @@ void TestSpeciesMove::setMove()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_sigmod->newMove();
+    m_game->newMove();
     
     m_speciesMove2->setMove(2);
     m_speciesMove2->setMove(2);