1 files changed, 14 insertions, 14 deletions

diff --git a/pokemod/MapTrainerTeamMember.cpp b/pokemod/MapTrainerTeamMember.cpp
index 89097ef6..8097766f 100644
--- a/pokemod/MapTrainerTeamMember.cpp
+++ b/pokemod/MapTrainerTeamMember.cpp
@@ -27,7 +27,7 @@
 #include "Species.h"
 #include "MapTrainerTeamMember.h"
 
-PokeMod::MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const unsigned _id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const unsigned _id) :
         Object(par, _id),
         species(UINT_MAX),
         level(UINT_MAX),
@@ -35,13 +35,13 @@ PokeMod::MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const un
 {
 }
 
-PokeMod::MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const QString& fname, const unsigned _id) :
+MapTrainerTeamMember::MapTrainerTeamMember(const Pokemod& par, const QString& fname, const unsigned _id) :
         Object(par, _id)
 {
     load(fname, _id);
 }
 
-bool PokeMod::MapTrainerTeamMember::validate() const
+bool MapTrainerTeamMember::validate() const
 {
     bool valid = true;
     pokemod.validationMsg(QString("---------Team Member with id %1---").arg(id), Pokemod::V_Msg);
@@ -92,7 +92,7 @@ bool PokeMod::MapTrainerTeamMember::validate() const
     return valid;
 }
 
-void PokeMod::MapTrainerTeamMember::load(const QString& fname, const unsigned _id) throw(Exception)
+void MapTrainerTeamMember::load(const QString& fname, const unsigned _id) throw(Exception)
 {
     Ini ini(fname);
     if (_id == UINT_MAX)
@@ -114,7 +114,7 @@ void PokeMod::MapTrainerTeamMember::load(const QString& fname, const unsigned _i
     }
 }
 
-void PokeMod::MapTrainerTeamMember::save(const QString& map, const QString& trainer) const throw(Exception)
+void MapTrainerTeamMember::save(const QString& map, const QString& trainer) const throw(Exception)
 {
     Ini ini;
     ini.addField("id", id);
@@ -127,21 +127,21 @@ void PokeMod::MapTrainerTeamMember::save(const QString& map, const QString& trai
     ini.save(QString("%1/map/%2/trainer/%3/team/%4.pini").arg(pokemod.getPath()).arg(map).arg(trainer).arg(id));
 }
 
-void PokeMod::MapTrainerTeamMember::setSpecies(const unsigned s) throw(BoundsException)
+void MapTrainerTeamMember::setSpecies(const unsigned s) throw(BoundsException)
 {
     if (pokemod.getSpeciesIndex(s) == UINT_MAX)
         throw(BoundsException("MapTrainerTeamMember", "species"));
     species = s;
 }
 
-void PokeMod::MapTrainerTeamMember::setLevel(const unsigned l) throw(BoundsException)
+void MapTrainerTeamMember::setLevel(const unsigned l) throw(BoundsException)
 {
     if (pokemod.getRules().getMaxLevel() < l)
         throw(BoundsException("MapTrainerTeamMember", "level"));
     level = l;
 }
 
-void PokeMod::MapTrainerTeamMember::setItem(const unsigned itm, const bool it) throw(Exception)
+void MapTrainerTeamMember::setItem(const unsigned itm, const bool it) throw(Exception)
 {
     if (pokemod.getItemIndex(itm) == UINT_MAX)
         throw(BoundsException("MpTrainerPokemon", "item"));
@@ -162,29 +162,29 @@ void PokeMod::MapTrainerTeamMember::setItem(const unsigned itm, const bool it) t
     items.append(itm);
 }
 
-void PokeMod::MapTrainerTeamMember::setNature(const unsigned n) throw(BoundsException)
+void MapTrainerTeamMember::setNature(const unsigned n) throw(BoundsException)
 {
     if (!pokemod.getRules().getNatureAllowed() || (pokemod.getNatureIndex(n) == UINT_MAX))
         throw(BoundsException("MapTrainerTeamMember", "nature"));
     nature = n;
 }
 
-unsigned PokeMod::MapTrainerTeamMember::getSpecies() const
+unsigned MapTrainerTeamMember::getSpecies() const
 {
     return species;
 }
 
-unsigned PokeMod::MapTrainerTeamMember::getLevel() const
+unsigned MapTrainerTeamMember::getLevel() const
 {
     return level;
 }
 
-unsigned PokeMod::MapTrainerTeamMember::getNature() const
+unsigned MapTrainerTeamMember::getNature() const
 {
     return nature;
 }
 
-bool PokeMod::MapTrainerTeamMember::getItem(const unsigned itm) const
+bool MapTrainerTeamMember::getItem(const unsigned itm) const
 {
     for (QListIterator<unsigned> i(items); i.hasNext(); )
     {
@@ -194,7 +194,7 @@ bool PokeMod::MapTrainerTeamMember::getItem(const unsigned itm) const
     return false;
 }
 
-PokeMod::MapTrainerTeamMember& PokeMod::MapTrainerTeamMember::operator=(const MapTrainerTeamMember& rhs)
+MapTrainerTeamMember& MapTrainerTeamMember::operator=(const MapTrainerTeamMember& rhs)
 {
     if (this == &rhs)
         return *this;