1 files changed, 14 insertions, 12 deletions

diff --git a/sigmod/test/TestSound.cpp b/sigmod/test/TestSound.cpp
index 37c42809..85318fa4 100644
--- a/sigmod/test/TestSound.cpp
+++ b/sigmod/test/TestSound.cpp
@@ -19,22 +19,24 @@
 #include "TestSound.h"
 
 // Sigmod includes
-#include "../Sigmod.h"
+#include "../Game.h"
 #include "../Sound.h"
 
 // Qt includes
 #include <QtCore/QFile>
 #include <QtTest/QTest>
 
+using namespace Sigmod;
+
 void TestSound::initTestCase()
 {
     TestSigmodObject::initTestCase();
     
-    m_sound1 = m_sigmod->newSound();
-    m_sound2 = m_sigmod->newSound();
-    m_sound3 = m_sigmod->newSound();
+    m_sound1 = m_game->newSound();
+    m_sound2 = m_game->newSound();
+    m_sound3 = m_game->newSound();
     
-    m_sound1->setType(Sigmod::Sound::Music);
+    m_sound1->setType(Sound::Music);
 }
 
 void TestSound::cleanupTestCase()
@@ -82,7 +84,7 @@ void TestSound::validation()
 
 void TestSound::saving()
 {
-    QDomDocument xml = Sigmod::Object::xml(m_sound1);
+    QDomDocument xml = Object::xml(m_sound1);
     QFile file("sound.xml");
     
     QVERIFY(file.open(QIODevice::WriteOnly));
@@ -96,7 +98,7 @@ void TestSound::loading()
     QFile file("sound.xml");
     
     m_sound1->setName("Bar");
-    m_sound1->setType(Sigmod::Sound::SoundEffect);
+    m_sound1->setType(Sound::SoundEffect);
     m_sound1->setData("blargh");
     
     QVERIFY(file.open(QIODevice::ReadOnly));
@@ -104,7 +106,7 @@ void TestSound::loading()
     m_sound1->load(xml.firstChildElement("Sound"));
     
     QCOMPARE(m_sound1->name(), QString("Foo"));
-    QCOMPARE(m_sound1->type(), Sigmod::Sound::Music);
+    QCOMPARE(m_sound1->type(), Sound::Music);
     QCOMPARE(m_sound1->data(), QByteArray("blah"));
 }
 
@@ -123,10 +125,10 @@ void TestSound::setName()
 
 void TestSound::setType()
 {
-    m_sound2->setType(Sigmod::Sound::Music);
-    m_sound2->setType(Sigmod::Sound::Music);
+    m_sound2->setType(Sound::Music);
+    m_sound2->setType(Sound::Music);
     
-    QCOMPARE(m_sound2->type(), Sigmod::Sound::Music);
+    QCOMPARE(m_sound2->type(), Sound::Music);
     
     QCOMPARE(m_changedCount, 1);
     
@@ -152,7 +154,7 @@ void TestSound::assignment()
     *m_sound3 = *m_sound2;
     
     QCOMPARE(m_sound3->name(), QString("Foo"));
-    QCOMPARE(m_sound3->type(), Sigmod::Sound::Music);
+    QCOMPARE(m_sound3->type(), Sound::Music);
     QCOMPARE(m_sound3->data(), QByteArray("blah"));
 }