diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-02-24 13:34:47 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-02-24 13:34:47 -0500 |
| commit | ecfd6c40473a9eabaa1fd7d8c343fe5e5bb195c3 (patch) | |
| tree | 78058197c6e222a1f5e53874fcf66af2b4887980 /sigmod/Sound.cpp | |
| parent | 97fac7d7b30058574dc15d7c18382f104bafd833 (diff) | |
| download | sigen-ecfd6c40473a9eabaa1fd7d8c343fe5e5bb195c3.tar.gz sigen-ecfd6c40473a9eabaa1fd7d8c343fe5e5bb195c3.tar.xz sigen-ecfd6c40473a9eabaa1fd7d8c343fe5e5bb195c3.zip | |
Rename Sigmod::Sigmod to Sigmod::Game so that the identifiers don't clash when using namespace Sigmod
Diffstat (limited to 'sigmod/Sound.cpp')
| -rw-r--r-- | sigmod/Sound.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sigmod/Sound.cpp b/sigmod/Sound.cpp index c0f62820..58f33b31 100644 --- a/sigmod/Sound.cpp +++ b/sigmod/Sound.cpp @@ -23,8 +23,8 @@ #include "Sound.h" // Sigmod includes +#include "Game.h" #include "Macros.h" -#include "Sigmod.h" using namespace Sigmod; @@ -36,7 +36,7 @@ Sound::Sound(const Sound& sound) : *this = sound; } -Sound::Sound(const Sigmod* parent, const int id) : +Sound::Sound(const Game* parent, const int id) : Object(parent, id), m_name(""), m_type(SoundEffect), @@ -44,13 +44,13 @@ Sound::Sound(const Sigmod* parent, const int id) : { } -Sound::Sound(const Sound& sound, const Sigmod* parent, const int id) : +Sound::Sound(const Sound& sound, const Game* parent, const int id) : Object(parent, id) { *this = sound; } -Sound::Sound(const QDomElement& xml, const Sigmod* parent, const int id) : +Sound::Sound(const QDomElement& xml, const Game* parent, const int id) : Object(parent, id) { LOAD_ID(); |