1 files changed, 20 insertions, 17 deletions

diff --git a/sigscript/TrainerWrapper.cpp b/sigscript/TrainerWrapper.cpp
index ed7447b7..bd9780ae 100644
--- a/sigscript/TrainerWrapper.cpp
+++ b/sigscript/TrainerWrapper.cpp
@@ -21,7 +21,10 @@
 // Sigscript includes
 #include "GameWrapper.h"
 
-Sigscript::TrainerWrapper* Sigscript::TrainerWrapper::create(const Sigmod::Trainer* trainer, GameWrapper* parent)
+using namespace Sigmod;
+using namespace Sigscript;
+
+TrainerWrapper* TrainerWrapper::create(const Trainer* trainer, GameWrapper* parent)
 {
     Signature sig = Signature(parent, Subsignature(trainer->className(), trainer->id()));
     if (!m_instances.contains(sig))
@@ -29,68 +32,68 @@ Sigscript::TrainerWrapper* Sigscript::TrainerWrapper::create(const Sigmod::Train
     return qobject_cast<TrainerWrapper*>(m_instances[sig]);
 }
 
-Sigscript::TrainerWrapper::TrainerWrapper(const Sigmod::Trainer* trainer, GameWrapper* parent) :
+TrainerWrapper::TrainerWrapper(const Trainer* trainer, GameWrapper* parent) :
         ObjectWrapper(trainer, parent),
         m_trainer(trainer)
 {
 }
 
-Sigmod::Trainer::Intelligence Sigscript::TrainerWrapper::intelligence(const QString& name) const
+Trainer::Intelligence TrainerWrapper::intelligence(const QString& name) const
 {
     if (name == "Ignorant")
-        return Sigmod::Trainer::Ignorant;
+        return Trainer::Ignorant;
     else if (name == "Determine")
-        return Sigmod::Trainer::Determine;
+        return Trainer::Determine;
     else if (name == "Remember")
-        return Sigmod::Trainer::Remember;
+        return Trainer::Remember;
     else if (name == "Cheating")
-        return Sigmod::Trainer::Cheating;
-    return QVariant(-1).value<Sigmod::Trainer::Intelligence>();
+        return Trainer::Cheating;
+    return QVariant(-1).value<Trainer::Intelligence>();
 }
 
-QString Sigscript::TrainerWrapper::TrainerWrapper::name() const
+QString TrainerWrapper::TrainerWrapper::name() const
 {
     return m_trainer->name();
 }
 
-int Sigscript::TrainerWrapper::TrainerWrapper::moneyFactor() const
+int TrainerWrapper::TrainerWrapper::moneyFactor() const
 {
     ALLOW_OVERRIDE_SO(trainer, int, moneyFactor);
     return m_trainer->moneyFactor();
 }
 
-Sigscript::SkinWrapper* Sigscript::TrainerWrapper::TrainerWrapper::skin()
+SkinWrapper* TrainerWrapper::TrainerWrapper::skin()
 {
     return game()->skin(m_trainer->skin());
 }
 
-int Sigscript::TrainerWrapper::TrainerWrapper::depth() const
+int TrainerWrapper::TrainerWrapper::depth() const
 {
     ALLOW_OVERRIDE_SO(trainer, int, depth);
     return m_trainer->depth();
 }
 
-Sigmod::Trainer::Intelligence Sigscript::TrainerWrapper::TrainerWrapper::teamIntel() const
+Trainer::Intelligence TrainerWrapper::TrainerWrapper::teamIntel() const
 {
     return m_trainer->teamIntel();
 }
 
-Sigmod::Trainer::Intelligence Sigscript::TrainerWrapper::TrainerWrapper::moveIntel() const
+Trainer::Intelligence TrainerWrapper::TrainerWrapper::moveIntel() const
 {
     return m_trainer->moveIntel();
 }
 
-Sigmod::Trainer::Intelligence Sigscript::TrainerWrapper::TrainerWrapper::itemIntel() const
+Trainer::Intelligence TrainerWrapper::TrainerWrapper::itemIntel() const
 {
     return m_trainer->itemIntel();
 }
 
-Sigmod::Trainer::Intelligence Sigscript::TrainerWrapper::TrainerWrapper::abilityIntel() const
+Trainer::Intelligence TrainerWrapper::TrainerWrapper::abilityIntel() const
 {
     return m_trainer->abilityIntel();
 }
 
-Sigmod::Trainer::Intelligence Sigscript::TrainerWrapper::TrainerWrapper::statIntel() const
+Trainer::Intelligence TrainerWrapper::TrainerWrapper::statIntel() const
 {
     return m_trainer->statIntel();
 }