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/Store.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/Store.cpp')
-rw-r--r-- | sigmod/Store.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sigmod/Store.cpp b/sigmod/Store.cpp index aa65228e..810e1840 100644 --- a/sigmod/Store.cpp +++ b/sigmod/Store.cpp @@ -23,8 +23,8 @@ #include "Store.h" // Sigmod includes +#include "Game.h" #include "Macros.h" -#include "Sigmod.h" using namespace Sigmod; @@ -34,19 +34,19 @@ Store::Store(const Store& store) : *this = store; } -Store::Store(const Sigmod* parent, const int id) : +Store::Store(const Game* parent, const int id) : Object(parent, id), m_name("") { } -Store::Store(const Store& store, const Sigmod* parent, const int id) : +Store::Store(const Store& store, const Game* parent, const int id) : Object(parent, id) { *this = store; } -Store::Store(const QDomElement& xml, const Sigmod* parent, const int id) : +Store::Store(const QDomElement& xml, const Game* parent, const int id) : Object(parent, id) { LOAD_ID(); @@ -87,7 +87,7 @@ GETTER(Store, QString, name) GETTER_LIST(Store, item) CHECK(Store, QString&, name) -CHECK_INDEX(Store, int, item, sigmod(), item) +CHECK_INDEX(Store, int, item, game(), item) Store& Store::operator=(const Store& rhs) { |