From ecfd6c40473a9eabaa1fd7d8c343fe5e5bb195c3 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 24 Feb 2009 13:34:47 -0500 Subject: Rename Sigmod::Sigmod to Sigmod::Game so that the identifiers don't clash when using namespace Sigmod --- sigmod/GlobalScript.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sigmod/GlobalScript.cpp') diff --git a/sigmod/GlobalScript.cpp b/sigmod/GlobalScript.cpp index c25239f5..e5651121 100644 --- a/sigmod/GlobalScript.cpp +++ b/sigmod/GlobalScript.cpp @@ -23,8 +23,8 @@ #include "GlobalScript.h" // Sigmod includes +#include "Game.h" #include "Macros.h" -#include "Sigmod.h" using namespace Sigcore; using namespace Sigmod; @@ -35,20 +35,20 @@ GlobalScript::GlobalScript(const GlobalScript& globalScript) : *this = globalScript; } -GlobalScript::GlobalScript(const Sigmod* parent, const int id) : +GlobalScript::GlobalScript(const Game* parent, const int id) : Object(parent, id), m_name(""), m_script("", "") { } -GlobalScript::GlobalScript(const GlobalScript& globalScript, const Sigmod* parent, const int id) : +GlobalScript::GlobalScript(const GlobalScript& globalScript, const Game* parent, const int id) : Object(parent, id) { *this = globalScript; } -GlobalScript::GlobalScript(const QDomElement& xml, const Sigmod* parent, const int id) : +GlobalScript::GlobalScript(const QDomElement& xml, const Game* parent, const int id) : Object(parent, id) { LOAD_ID(); -- cgit