1 files changed, 15 insertions, 13 deletions

diff --git a/sigmod/test/TestMapTile.cpp b/sigmod/test/TestMapTile.cpp
index 2df855b5..dea3cde3 100644
--- a/sigmod/test/TestMapTile.cpp
+++ b/sigmod/test/TestMapTile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Ben Boeckel <MathStuf@gmail.com>
+ * Copyright 2008-2009 Ben Boeckel <MathStuf@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
@@ -19,19 +19,21 @@
 #include "TestMapTile.h"
 
 // Sigmod includes
+#include "../Game.h"
 #include "../Map.h"
 #include "../MapTile.h"
-#include "../Sigmod.h"
 
 // Qt includes
 #include <QtCore/QFile>
 #include <QtTest/QTest>
 
+using namespace Sigmod;
+
 void TestMapTile::initTestCase()
 {
     TestSigmodObject::initTestCase();
     
-    Sigmod::Map* map = m_sigmod->newMap();
+    Map* map = m_game->newMap();
     
     m_mapTile1 = map->newTile();
     m_mapTile2 = map->newTile();
@@ -68,7 +70,7 @@ void TestMapTile::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_sigmod->newTile();
+    m_game->newTile();
     
     m_mapTile1->setTile(0);
     m_mapTile1->validate();
@@ -76,8 +78,8 @@ void TestMapTile::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_sigmod->map(0)->setHeight(20);
-    m_sigmod->map(0)->setWidth(20);
+    m_game->map(0)->setHeight(20);
+    m_game->map(0)->setWidth(20);
     
     m_mapTile1->setPosition(QPoint(10, 10));
     m_mapTile1->validate();
@@ -85,8 +87,8 @@ void TestMapTile::validation()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_sigmod->map(0)->setHeight(5);
-    m_sigmod->map(0)->setWidth(5);
+    m_game->map(0)->setHeight(5);
+    m_game->map(0)->setWidth(5);
     
     m_mapTile1->validate();
     
@@ -96,7 +98,7 @@ void TestMapTile::validation()
 
 void TestMapTile::saving()
 {
-    QDomDocument xml = Sigmod::Object::xml(m_mapTile1);
+    QDomDocument xml = Object::xml(m_mapTile1);
     QFile file("mapTile.xml");
     
     QVERIFY(file.open(QIODevice::WriteOnly));
@@ -109,7 +111,7 @@ void TestMapTile::loading()
     QDomDocument xml;
     QFile file("mapTile.xml");
     
-    m_sigmod->newTile();
+    m_game->newTile();
     
     m_mapTile1->setTile(1);
     m_mapTile1->setPosition(QPoint(2, 2));
@@ -131,7 +133,7 @@ void TestMapTile::setTile()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 1);
     
-    m_sigmod->newTile();
+    m_game->newTile();
     
     m_mapTile2->setTile(2);
     m_mapTile2->setTile(2);
@@ -156,8 +158,8 @@ void TestMapTile::setPosition()
     QCOMPARE(m_warnings.size(), 0);
     QCOMPARE(m_errors.size(), 2);
     
-    m_sigmod->map(0)->setHeight(50);
-    m_sigmod->map(0)->setWidth(50);
+    m_game->map(0)->setHeight(50);
+    m_game->map(0)->setWidth(50);
     
     m_mapTile2->setPosition(QPoint(25, 25));
     m_mapTile2->setPosition(QPoint(25, 25));