1 files changed, 15 insertions, 13 deletions
diff --git a/sigmod/MapTrainerTeamMember.cpp b/sigmod/MapTrainerTeamMember.cpp
index bb09ad76..eefc0c62 100644
--- a/sigmod/MapTrainerTeamMember.cpp
+++ b/sigmod/MapTrainerTeamMember.cpp
@@ -34,33 +34,35 @@
 // Qt includes
 #include <QtCore/QSet>
 
-Sigmod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember) :
+using namespace Sigmod;
+
+MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember) :
         Object(teamMember.parent(), teamMember.id())
 {
     *this = teamMember;
 }
 
-Sigmod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainer* parent, const int id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainer* parent, const int id) :
         Object(parent, id),
         m_species(INT_MAX),
         m_level(INT_MAX)
 {
 }
 
-Sigmod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember, const MapTrainer* parent, const int id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember, const MapTrainer* parent, const int id) :
         Object(parent, id)
 {
     *this = teamMember;
 }
 
-Sigmod::MapTrainerTeamMember::MapTrainerTeamMember(const QDomElement& xml, const MapTrainer* parent, const int id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const QDomElement& xml, const MapTrainer* parent, const int id) :
         Object(parent, id)
 {
     LOAD_ID();
     load(xml);
 }
 
-void Sigmod::MapTrainerTeamMember::validate()
+void MapTrainerTeamMember::validate()
 {
     TEST_BEGIN();
     TEST(species);
@@ -83,7 +85,7 @@ void Sigmod::MapTrainerTeamMember::validate()
     TEST_END();
 }
 
-void Sigmod::MapTrainerTeamMember::load(const QDomElement& xml)
+void MapTrainerTeamMember::load(const QDomElement& xml)
 {
     LOAD_BEGIN();
     LOAD(species);
@@ -94,7 +96,7 @@ void Sigmod::MapTrainerTeamMember::load(const QDomElement& xml)
     LOAD_LIST(nature);
 }
 
-QDomElement Sigmod::MapTrainerTeamMember::save() const
+QDomElement MapTrainerTeamMember::save() const
 {
     SAVE_CREATE();
     SAVE(species);
@@ -110,7 +112,7 @@ SETTER(MapTrainerTeamMember, int, Species, species)
 SETTER(MapTrainerTeamMember, int, Level, level)
 SETTER_LIST_LIMIT(MapTrainerTeamMember, Ability, ability, sigmod()->rules()->maxAbilities(), "Cannot have anymore abilities")
 
-void Sigmod::MapTrainerTeamMember::setItem(const int item, const int count)
+void MapTrainerTeamMember::setItem(const int item, const int count)
 {
     if (count && itemCheck(item, count) && (!m_item.contains(item) || (count != m_item[item])))
     {
@@ -169,7 +171,7 @@ CHECK_BEGIN(MapTrainerTeamMember, int, move)
 CHECK_END()
 CHECK_INDEX(MapTrainerTeamMember, int, nature, sigmod(), nature)
 
-Sigmod::MapTrainerTeamMember& Sigmod::MapTrainerTeamMember::operator=(const MapTrainerTeamMember& rhs)
+MapTrainerTeamMember& MapTrainerTeamMember::operator=(const MapTrainerTeamMember& rhs)
 {
     if (this == &rhs)
         return *this;
@@ -183,7 +185,7 @@ Sigmod::MapTrainerTeamMember& Sigmod::MapTrainerTeamMember::operator=(const MapT
     return *this;
 }
 
-int Sigmod::MapTrainerTeamMember::heldWeight(const QMap<int, int>& items) const
+int MapTrainerTeamMember::heldWeight(const QMap<int, int>& items) const
 {
     int totalWeight = 0;
     QMap<int, int> itemsToCheck = (items.empty() ? m_item : items);
@@ -197,7 +199,7 @@ int Sigmod::MapTrainerTeamMember::heldWeight(const QMap<int, int>& items) const
     return totalWeight;
 }
 
-bool Sigmod::MapTrainerTeamMember::checkWeight(const int item, const int count) const
+bool MapTrainerTeamMember::checkWeight(const int item, const int count) const
 {
     const Species* species = sigmod()->speciesById(m_species);
     if (!species)
@@ -207,7 +209,7 @@ bool Sigmod::MapTrainerTeamMember::checkWeight(const int item, const int count)
     return (heldWeight(temp) <= species->maxHoldWeight());
 }
 
-bool Sigmod::MapTrainerTeamMember::canLearn(const int move) const
+bool MapTrainerTeamMember::canLearn(const int move) const
 {
     const Species* species = sigmod()->speciesById(m_species);
     if (species)
@@ -221,7 +223,7 @@ bool Sigmod::MapTrainerTeamMember::canLearn(const int move) const
     return !species;
 }
 
-void Sigmod::MapTrainerTeamMember::clear()
+void MapTrainerTeamMember::clear()
 {
     m_ability.clear();
     m_item.clear();