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/MapTrainerWrapper.cpp | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'sigscript/MapTrainerWrapper.cpp') diff --git a/sigscript/MapTrainerWrapper.cpp b/sigscript/MapTrainerWrapper.cpp index 084e204d..1e8da8fb 100644 --- a/sigscript/MapTrainerWrapper.cpp +++ b/sigscript/MapTrainerWrapper.cpp @@ -26,7 +26,11 @@ // Sigmod includes #include -Sigscript::MapTrainerWrapper* Sigscript::MapTrainerWrapper::create(const Sigmod::MapTrainer* trainer, MapWrapper* parent) +using namespace Sigcore; +using namespace Sigmod; +using namespace Sigscript; + +MapTrainerWrapper* MapTrainerWrapper::create(const MapTrainer* trainer, MapWrapper* parent) { Signature sig = Signature(parent, Subsignature(trainer->className(), trainer->id())); if (!m_instances.contains(sig)) @@ -34,34 +38,34 @@ Sigscript::MapTrainerWrapper* Sigscript::MapTrainerWrapper::create(const Sigmod: return qobject_cast(m_instances[sig]); } -Sigscript::MapTrainerWrapper::MapTrainerWrapper(const Sigmod::MapTrainer* trainer, MapWrapper* parent) : +MapTrainerWrapper::MapTrainerWrapper(const MapTrainer* trainer, MapWrapper* parent) : ObjectWrapper(trainer, parent), m_trainer(trainer) { } -QString Sigscript::MapTrainerWrapper::name() const +QString MapTrainerWrapper::name() const { return m_trainer->name(); } -Sigscript::TrainerWrapper* Sigscript::MapTrainerWrapper::trainerClass() +TrainerWrapper* MapTrainerWrapper::trainerClass() { return game()->trainer(m_trainer->trainerClass()); } -QPoint Sigscript::MapTrainerWrapper::position() const +QPoint MapTrainerWrapper::position() const { ALLOW_OVERRIDE_SO(trainer, QPoint, position); return m_trainer->position(); } -int Sigscript::MapTrainerWrapper::numberFight() const +int MapTrainerWrapper::numberFight() const { return m_trainer->numberFight(); } -QList Sigscript::MapTrainerWrapper::leadTeamMember() +QList MapTrainerWrapper::leadTeamMember() { QList teamMembers; foreach (int member, m_trainer->leadTeamMember()) @@ -69,17 +73,17 @@ QList Sigscript::MapTrainerWrapper::lea return teamMembers; } -Sigcore::Script Sigscript::MapTrainerWrapper::script() const +Script MapTrainerWrapper::script() const { return m_trainer->script(); } -Sigscript::MapTrainerTeamMemberWrapper* Sigscript::MapTrainerWrapper::teamMember(const int index) +MapTrainerTeamMemberWrapper* MapTrainerWrapper::teamMember(const int index) { return MapTrainerTeamMemberWrapper::create(m_trainer->teamMember(index), this); } -int Sigscript::MapTrainerWrapper::teamMemberCount() const +int MapTrainerWrapper::teamMemberCount() const { return m_trainer->teamMemberCount(); } -- cgit