1 files changed, 11 insertions, 8 deletions
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 <sigmod/MapTrainerTeamMember.h>
 
-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<MapTrainerTeamMemberWrapper*>(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::AbilityWrapper*> Sigscript::MapTrainerTeamMemberWrapper::abilities()
+QList<AbilityWrapper*> MapTrainerTeamMemberWrapper::abilities()
 {
     QList<int> abilityIds = m_teamMember->ability();
     QList<AbilityWrapper*> abilities;
@@ -59,7 +62,7 @@ QList<Sigscript::AbilityWrapper*> Sigscript::MapTrainerTeamMemberWrapper::abilit
     return abilities;
 }
 
-QMap<Sigscript::ItemWrapper*, int> Sigscript::MapTrainerTeamMemberWrapper::items()
+QMap<ItemWrapper*, int> MapTrainerTeamMemberWrapper::items()
 {
     const QMap<int, int>& itemMap = m_teamMember->item();
     QList<int> itemIds = itemMap.keys();
@@ -69,7 +72,7 @@ QMap<Sigscript::ItemWrapper*, int> Sigscript::MapTrainerTeamMemberWrapper::items
     return items;
 }
 
-QList<Sigscript::MoveWrapper*> Sigscript::MapTrainerTeamMemberWrapper::moves()
+QList<MoveWrapper*> MapTrainerTeamMemberWrapper::moves()
 {
     QList<int> moveIds = m_teamMember->move();
     QList<MoveWrapper*> moves;
@@ -78,7 +81,7 @@ QList<Sigscript::MoveWrapper*> Sigscript::MapTrainerTeamMemberWrapper::moves()
     return moves;
 }
 
-QList<Sigscript::NatureWrapper*> Sigscript::MapTrainerTeamMemberWrapper::natures()
+QList<NatureWrapper*> MapTrainerTeamMemberWrapper::natures()
 {
     QList<int> natureIds = m_teamMember->nature();
     QList<NatureWrapper*> natures;