From fd874f8a1e413b769245aa61a866bd536a551c3c Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Tue, 24 Feb 2009 16:33:13 -0500 Subject: Fixed up sigscript namespacing in sources --- sigscript/AbilityWrapper.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'sigscript/AbilityWrapper.cpp') diff --git a/sigscript/AbilityWrapper.cpp b/sigscript/AbilityWrapper.cpp index c1132207..a48d852b 100644 --- a/sigscript/AbilityWrapper.cpp +++ b/sigscript/AbilityWrapper.cpp @@ -24,7 +24,11 @@ // Sigmod includes #include -Sigscript::AbilityWrapper* Sigscript::AbilityWrapper::create(const Sigmod::Ability* ability, GameWrapper* parent) +using namespace Sigcore; +using namespace Sigmod; +using namespace Sigscript; + +AbilityWrapper* AbilityWrapper::create(const Ability* ability, GameWrapper* parent) { Signature sig = Signature(parent, Subsignature(ability->className(), ability->id())); if (!m_instances.contains(sig)) @@ -32,39 +36,39 @@ Sigscript::AbilityWrapper* Sigscript::AbilityWrapper::create(const Sigmod::Abili return qobject_cast(m_instances[sig]); } -Sigscript::AbilityWrapper::AbilityWrapper(const Sigmod::Ability* ability, GameWrapper* parent) : +AbilityWrapper::AbilityWrapper(const Ability* ability, GameWrapper* parent) : ObjectWrapper(ability, parent), m_ability(ability) { } -QString Sigscript::AbilityWrapper::name() const +QString AbilityWrapper::name() const { return m_ability->name(); } -int Sigscript::AbilityWrapper::priority() const +int AbilityWrapper::priority() const { ALLOW_OVERRIDE_SO(ability, int, priority); return m_ability->priority(); } -QString Sigscript::AbilityWrapper::description() const +QString AbilityWrapper::description() const { return m_ability->description(); } -Sigcore::Script Sigscript::AbilityWrapper::battleScript() const +Script AbilityWrapper::battleScript() const { return m_ability->battleScript(); } -Sigcore::Script Sigscript::AbilityWrapper::worldScript() const +Script AbilityWrapper::worldScript() const { return m_ability->worldScript(); } -Sigcore::Script Sigscript::AbilityWrapper::priorityScript() const +Script AbilityWrapper::priorityScript() const { return m_ability->priorityScript(); } -- cgit