1 files changed, 14 insertions, 11 deletions
diff --git a/sigmod/test/TestTime.cpp b/sigmod/test/TestTime.cpp
index 452f10f9..13b6518e 100644
--- a/sigmod/test/TestTime.cpp
+++ b/sigmod/test/TestTime.cpp
@@ -19,20 +19,23 @@
 #include "TestTime.h"
 
 // Sigmod includes
-#include "../Sigmod.h"
+#include "../Game.h"
 #include "../Time.h"
 
 // Qt includes
 #include <QtCore/QFile>
 #include <QtTest/QTest>
 
+using namespace Sigcore;
+using namespace Sigmod;
+
 void TestTime::initTestCase()
 {
     TestSigmodObject::initTestCase();
     
-    m_time1 = m_sigmod->newTime();
-    m_time2 = m_sigmod->newTime();
-    m_time3 = m_sigmod->newTime();
+    m_time1 = m_game->newTime();
+    m_time2 = m_game->newTime();
+    m_time3 = m_game->newTime();
 }
 
 void TestTime::cleanupTestCase()
@@ -74,7 +77,7 @@ void TestTime::validation()
 
 void TestTime::saving()
 {
-    QDomDocument xml = Sigmod::Object::xml(m_time1);
+    QDomDocument xml = Object::xml(m_time1);
     QFile file("time.xml");
     
     QVERIFY(file.open(QIODevice::WriteOnly));
@@ -90,7 +93,7 @@ void TestTime::loading()
     m_time1->setName("Bar");
     m_time1->setHour(12);
     m_time1->setMinute(30);
-    m_time1->setScript(Sigcore::Script("python", "import os"));
+    m_time1->setScript(Script("python", "import os"));
     
     QVERIFY(file.open(QIODevice::ReadOnly));
     QVERIFY(xml.setContent(&file));
@@ -99,7 +102,7 @@ void TestTime::loading()
     QCOMPARE(m_time1->name(), QString("Foo"));
     QCOMPARE(m_time1->hour(), 0);
     QCOMPARE(m_time1->minute(), 0);
-    QCOMPARE(m_time1->script(), Sigcore::Script());
+    QCOMPARE(m_time1->script(), Script());
 }
 
 void TestTime::setName()
@@ -163,10 +166,10 @@ void TestTime::setMinute()
 
 void TestTime::setScript()
 {
-    m_time2->setScript(Sigcore::Script("python", "import os"));
-    m_time2->setScript(Sigcore::Script("python", "import os"));
+    m_time2->setScript(Script("python", "import os"));
+    m_time2->setScript(Script("python", "import os"));
     
-    QCOMPARE(m_time2->script(), Sigcore::Script("python", "import os"));
+    QCOMPARE(m_time2->script(), Script("python", "import os"));
     
     QCOMPARE(m_changedCount, 1);
     
@@ -181,7 +184,7 @@ void TestTime::assignment()
     QCOMPARE(m_time3->name(), QString("Foo"));
     QCOMPARE(m_time3->hour(), 12);
     QCOMPARE(m_time3->minute(), 30);
-    QCOMPARE(m_time3->script(), Sigcore::Script("python", "import os"));
+    QCOMPARE(m_time3->script(), Script("python", "import os"));
 }
 
 QTEST_APPLESS_MAIN(TestTime)