summaryrefslogtreecommitdiffstats
path: root/sigmod/Map.h
diff options
context:
space:
mode:
authorBen Boeckel <MathStuf@gmail.com>2009-02-24 13:34:47 -0500
committerBen Boeckel <MathStuf@gmail.com>2009-02-24 13:34:47 -0500
commitecfd6c40473a9eabaa1fd7d8c343fe5e5bb195c3 (patch)
tree78058197c6e222a1f5e53874fcf66af2b4887980 /sigmod/Map.h
parent97fac7d7b30058574dc15d7c18382f104bafd833 (diff)
downloadsigen-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/Map.h')
-rw-r--r--sigmod/Map.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sigmod/Map.h b/sigmod/Map.h
index bc45e116..7b8edab0 100644
--- a/sigmod/Map.h
+++ b/sigmod/Map.h
@@ -30,12 +30,12 @@
namespace Sigmod
{
// Forward declarations
+class Game;
class MapEffect;
class MapTile;
class MapTrainer;
class MapWarp;
class MapWildList;
-class Sigmod;
class SIGMOD_EXPORT Map : public Object
{
@@ -52,9 +52,9 @@ class SIGMOD_EXPORT Map : public Object
static const QStringList TypeStr;
Map(const Map& map);
- Map(const Sigmod* parent, const int id);
- Map(const Map& map, const Sigmod* parent, const int id);
- Map(const QDomElement& xml, const Sigmod* parent, const int id = -1);
+ Map(const Game* parent, const int id);
+ Map(const Map& map, const Game* parent, const int id);
+ Map(const QDomElement& xml, const Game* parent, const int id = -1);
~Map();
void validate();