1 files changed, 15 insertions, 13 deletions

diff --git a/sigmod/test/TestCoinListItem.cpp b/sigmod/test/TestCoinListItem.cpp
index c1939cde..67d478e7 100644
--- a/sigmod/test/TestCoinListItem.cpp
+++ b/sigmod/test/TestCoinListItem.cpp
@@ -21,17 +21,19 @@
 // Sigmod includes
 #include "../CoinList.h"
 #include "../CoinListItem.h"
-#include "../Sigmod.h"
+#include "../Game.h"
 
 // Qt includes
 #include <QtCore/QFile>
 #include <QtTest/QTest>
 
+using namespace Sigmod;
+
 void TestCoinListItem::initTestCase()
 {
     TestSigmodObject::initTestCase();
     
-    Sigmod::CoinList* coinList = m_sigmod->newCoinList();
+    CoinList* coinList = m_game->newCoinList();
     
     m_item1 = coinList->newItem();
     m_item2 = coinList->newItem();
@@ -68,7 +70,7 @@ void TestCoinListItem::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 2);
     
-    m_sigmod->newItem();
+    m_game->newItem();
     
     m_item1->setObject(0);
     m_item1->validate();
@@ -76,13 +78,13 @@ void TestCoinListItem::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 3);
     
-    m_item1->setType(Sigmod::CoinListItem::Species);
+    m_item1->setType(CoinListItem::Species);
     m_item1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 5);
     
-    m_sigmod->newSpecies();
+    m_game->newSpecies();
     m_item1->validate();
     
     QCOMPARE(m_warnings.size(), 0);
@@ -97,7 +99,7 @@ void TestCoinListItem::validation()
 
 void TestCoinListItem::saving()
 {
-    QDomDocument xml = Sigmod::Object::xml(m_item1);
+    QDomDocument xml = Object::xml(m_item1);
     QFile file("coinListItem.xml");
     
     QVERIFY(file.open(QIODevice::WriteOnly));
@@ -110,9 +112,9 @@ void TestCoinListItem::loading()
     QDomDocument xml;
     QFile file("coinListItem.xml");
     
-    m_sigmod->newItem();
+    m_game->newItem();
     
-    m_item1->setType(Sigmod::CoinListItem::Item);
+    m_item1->setType(CoinListItem::Item);
     m_item1->setObject(1);
     m_item1->setCost(25);
     
@@ -120,17 +122,17 @@ void TestCoinListItem::loading()
     QVERIFY(xml.setContent(&file));
     m_item1->load(xml.firstChildElement("CoinListItem"));
     
-    QCOMPARE(m_item1->type(), Sigmod::CoinListItem::Species);
+    QCOMPARE(m_item1->type(), CoinListItem::Species);
     QCOMPARE(m_item1->object(), 0);
     QCOMPARE(m_item1->cost(), 20);
 }
 
 void TestCoinListItem::setType()
 {
-    m_item2->setType(Sigmod::CoinListItem::Species);
-    m_item2->setType(Sigmod::CoinListItem::Species);
+    m_item2->setType(CoinListItem::Species);
+    m_item2->setType(CoinListItem::Species);
     
-    QCOMPARE(m_item2->type(), Sigmod::CoinListItem::Species);
+    QCOMPARE(m_item2->type(), CoinListItem::Species);
     
     QCOMPARE(m_changedCount, 1);
     
@@ -168,7 +170,7 @@ void TestCoinListItem::assignment()
 {
     *m_item3 = *m_item2;
     
-    QCOMPARE(m_item3->type(), Sigmod::CoinListItem::Species);
+    QCOMPARE(m_item3->type(), CoinListItem::Species);
     QCOMPARE(m_item3->object(), 0);
     QCOMPARE(m_item3->cost(), 15);
 }