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/MapTrainerTeamMemberWrapper.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'sigscript/MapTrainerTeamMemberWrapper.cpp') diff --git a/sigscript/MapTrainerTeamMemberWrapper.cpp b/sigscript/MapTrainerTeamMemberWrapper.cpp index a2c34a5d..90b55e2f 100644 --- a/sigscript/MapTrainerTeamMemberWrapper.cpp +++ b/sigscript/MapTrainerTeamMemberWrapper.cpp @@ -25,7 +25,10 @@ // Sigmod includes #include -Sigscript::MapTrainerTeamMemberWrapper* Sigscript::MapTrainerTeamMemberWrapper::create(const Sigmod::MapTrainerTeamMember* teamMember, MapTrainerWrapper* parent) +using namespace Sigmod; +using namespace Sigscript; + +MapTrainerTeamMemberWrapper* MapTrainerTeamMemberWrapper::create(const MapTrainerTeamMember* teamMember, MapTrainerWrapper* parent) { Signature sig = Signature(parent, Subsignature(teamMember->className(), teamMember->id())); if (!m_instances.contains(sig)) @@ -33,24 +36,24 @@ Sigscript::MapTrainerTeamMemberWrapper* Sigscript::MapTrainerTeamMemberWrapper:: return qobject_cast(m_instances[sig]); } -Sigscript::MapTrainerTeamMemberWrapper::MapTrainerTeamMemberWrapper(const Sigmod::MapTrainerTeamMember* teamMember, MapTrainerWrapper* parent) : +MapTrainerTeamMemberWrapper::MapTrainerTeamMemberWrapper(const MapTrainerTeamMember* teamMember, MapTrainerWrapper* parent) : ObjectWrapper(teamMember, parent), m_teamMember(teamMember) { } -Sigscript::SpeciesWrapper* Sigscript::MapTrainerTeamMemberWrapper::species() +SpeciesWrapper* MapTrainerTeamMemberWrapper::species() { return game()->species(m_teamMember->species()); } -int Sigscript::MapTrainerTeamMemberWrapper::level() const +int MapTrainerTeamMemberWrapper::level() const { ALLOW_OVERRIDE_SO(teamMember, int, level); return m_teamMember->level(); } -QList Sigscript::MapTrainerTeamMemberWrapper::abilities() +QList MapTrainerTeamMemberWrapper::abilities() { QList abilityIds = m_teamMember->ability(); QList abilities; @@ -59,7 +62,7 @@ QList Sigscript::MapTrainerTeamMemberWrapper::abilit return abilities; } -QMap Sigscript::MapTrainerTeamMemberWrapper::items() +QMap MapTrainerTeamMemberWrapper::items() { const QMap& itemMap = m_teamMember->item(); QList itemIds = itemMap.keys(); @@ -69,7 +72,7 @@ QMap Sigscript::MapTrainerTeamMemberWrapper::items return items; } -QList Sigscript::MapTrainerTeamMemberWrapper::moves() +QList MapTrainerTeamMemberWrapper::moves() { QList moveIds = m_teamMember->move(); QList moves; @@ -78,7 +81,7 @@ QList Sigscript::MapTrainerTeamMemberWrapper::moves() return moves; } -QList Sigscript::MapTrainerTeamMemberWrapper::natures() +QList MapTrainerTeamMemberWrapper::natures() { QList natureIds = m_teamMember->nature(); QList natures; -- cgit