1 files changed, 35 insertions, 35 deletions

diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp
index d6b5f1e0..d1fead4e 100644
--- a/pokemod/MapTrainer.cpp
+++ b/pokemod/MapTrainer.cpp
@@ -27,13 +27,13 @@
 // Qt includes
 #include <QSet>
 
-MapTrainer::MapTrainer(const MapTrainer& trainer) :
+Pokemod::MapTrainer::MapTrainer(const MapTrainer& trainer) :
         Object("MapTrainer", trainer.parent(), trainer.id())
 {
     *this = trainer;
 }
 
-MapTrainer::MapTrainer(const Map* parent, const int id) :
+Pokemod::MapTrainer::MapTrainer(const Map* parent, const int id) :
         Object("MapTrainer", parent, id),
         m_name(""),
         m_trainerClass(INT_MAX),
@@ -44,24 +44,24 @@ MapTrainer::MapTrainer(const Map* parent, const int id) :
 {
 }
 
-MapTrainer::MapTrainer(const MapTrainer& trainer, const Map* parent, const int id) :
+Pokemod::MapTrainer::MapTrainer(const MapTrainer& trainer, const Map* parent, const int id) :
         Object("MapTrainer", parent, id)
 {
     *this = trainer;
 }
 
-MapTrainer::MapTrainer(const QDomElement& xml, const Map* parent, const int id) :
+Pokemod::MapTrainer::MapTrainer(const QDomElement& xml, const Map* parent, const int id) :
         Object("MapTrainer", parent, id)
 {
     load(xml, id);
 }
 
-MapTrainer::~MapTrainer()
+Pokemod::MapTrainer::~MapTrainer()
 {
     clear();
 }
 
-void MapTrainer::validate()
+void Pokemod::MapTrainer::validate()
 {
     if (m_name.isEmpty())
         emit(error("Name is empty"));
@@ -81,7 +81,7 @@ void MapTrainer::validate()
     }
 }
 
-void MapTrainer::load(const QDomElement& xml, int id)
+void Pokemod::MapTrainer::load(const QDomElement& xml, int id)
 {
     LOAD_ID();
     LOAD(QString, name);
@@ -93,7 +93,7 @@ void MapTrainer::load(const QDomElement& xml, int id)
     LOAD(int, leadTeamMember);
 }
 
-QDomElement MapTrainer::save() const
+QDomElement Pokemod::MapTrainer::save() const
 {
     SAVE_CREATE();
     SAVE(QString, name);
@@ -105,12 +105,12 @@ QDomElement MapTrainer::save() const
     return xml;
 }
 
-void MapTrainer::setName(const QString& name)
+void Pokemod::MapTrainer::setName(const QString& name)
 {
     CHECK(name);
 }
 
-void MapTrainer::setTrainerClass(const int trainerClass)
+void Pokemod::MapTrainer::setTrainerClass(const int trainerClass)
 {
     if (static_cast<const Pokemod*>(pokemod())->trainerIndex(trainerClass) == INT_MAX)
     {
@@ -120,7 +120,7 @@ void MapTrainer::setTrainerClass(const int trainerClass)
     CHECK(trainerClass);
 }
 
-void MapTrainer::setCoordinate(const Point& coordinate)
+void Pokemod::MapTrainer::setCoordinate(const Point& coordinate)
 {
     if ((static_cast<const Map*>(parent())->width() <= coordinate.x()) || (static_cast<const Map*>(parent())->height() <= coordinate.y()))
     {
@@ -130,7 +130,7 @@ void MapTrainer::setCoordinate(const Point& coordinate)
     CHECK(coordinate);
 }
 
-void MapTrainer::setNumberFight(const int numberFight)
+void Pokemod::MapTrainer::setNumberFight(const int numberFight)
 {
     if (!numberFight || (static_cast<const Pokemod*>(pokemod())->rules()->maxFight() < numberFight))
     {
@@ -140,12 +140,12 @@ void MapTrainer::setNumberFight(const int numberFight)
     CHECK(numberFight);
 }
 
-void MapTrainer::setScript(const Script& script)
+void Pokemod::MapTrainer::setScript(const Script& script)
 {
     CHECK(script);
 }
 
-void MapTrainer::setLeadTeamMember(const int leadTeamMember)
+void Pokemod::MapTrainer::setLeadTeamMember(const int leadTeamMember)
 {
     if (teamMemberCount() <= leadTeamMember)
     {
@@ -155,59 +155,59 @@ void MapTrainer::setLeadTeamMember(const int leadTeamMember)
     CHECK(leadTeamMember);
 }
 
-QString MapTrainer::name() const
+QString Pokemod::MapTrainer::name() const
 {
     return m_name;
 }
 
-int MapTrainer::trainerClass() const
+int Pokemod::MapTrainer::trainerClass() const
 {
     return m_trainerClass;
 }
 
-Point MapTrainer::coordinate() const
+Pokemod::Point Pokemod::MapTrainer::coordinate() const
 {
     return m_coordinate;
 }
 
-int MapTrainer::numberFight() const
+int Pokemod::MapTrainer::numberFight() const
 {
     return m_numberFight;
 }
 
-Script MapTrainer::script() const
+Pokemod::Script Pokemod::MapTrainer::script() const
 {
     return m_script;
 }
 
-int MapTrainer::leadTeamMember() const
+int Pokemod::MapTrainer::leadTeamMember() const
 {
     return m_leadTeamMember;
 }
 
-const MapTrainerTeamMember* MapTrainer::teamMember(const int index) const
+const Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMember(const int index) const
 {
     Q_ASSERT(index < teamMemberCount());
     return m_teamMember.at(index);
 }
 
-MapTrainerTeamMember* MapTrainer::teamMember(const int index)
+Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMember(const int index)
 {
     Q_ASSERT(index < teamMemberCount());
     return m_teamMember[index];
 }
 
-const MapTrainerTeamMember* MapTrainer::teamMemberById(const int id) const
+const Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMemberById(const int id) const
 {
     return teamMember(teamMemberIndex(id));
 }
 
-MapTrainerTeamMember* MapTrainer::teamMemberById(const int id)
+Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMemberById(const int id)
 {
     return teamMember(teamMemberIndex(id));
 }
 
-int MapTrainer::teamMemberIndex(const int id) const
+int Pokemod::MapTrainer::teamMemberIndex(const int id) const
 {
     for (int i = 0; i < teamMemberCount(); ++i)
     {
@@ -217,45 +217,45 @@ int MapTrainer::teamMemberIndex(const int id) const
     return INT_MAX;
 }
 
-int MapTrainer::teamMemberCount() const
+int Pokemod::MapTrainer::teamMemberCount() const
 {
     return m_teamMember.size();
 }
 
-MapTrainerTeamMember* MapTrainer::newTeamMember()
+Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember()
 {
     return newTeamMember(new MapTrainerTeamMember(this, newTeamMemberId()));
 }
 
-MapTrainerTeamMember* MapTrainer::newTeamMember(const QDomElement& xml)
+Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember(const QDomElement& xml)
 {
     return newTeamMember(new MapTrainerTeamMember(xml, this, newTeamMemberId()));
 }
 
-MapTrainerTeamMember* MapTrainer::newTeamMember(const MapTrainerTeamMember& teamMember)
+Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember(const MapTrainerTeamMember& teamMember)
 {
     return newTeamMember(new MapTrainerTeamMember(teamMember, this, newTeamMemberId()));
 }
 
-MapTrainerTeamMember* MapTrainer::newTeamMember(MapTrainerTeamMember* teamMember)
+Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember(MapTrainerTeamMember* teamMember)
 {
     m_teamMember.append(teamMember);
     return teamMember;
 }
 
-void MapTrainer::deleteTeamMember(const int index)
+void Pokemod::MapTrainer::deleteTeamMember(const int index)
 {
     Q_ASSERT(index < teamMemberCount());
     delete m_teamMember[index];
     m_teamMember.removeAt(index);
 }
 
-void MapTrainer::deleteTeamMemberById(const int id)
+void Pokemod::MapTrainer::deleteTeamMemberById(const int id)
 {
     deleteTeamMember(teamMemberIndex(id));
 }
 
-int MapTrainer::newTeamMemberId() const
+int Pokemod::MapTrainer::newTeamMemberId() const
 {
     int i = 0;
     while ((i < teamMemberCount()) && (teamMemberIndex(i) != INT_MAX))
@@ -263,7 +263,7 @@ int MapTrainer::newTeamMemberId() const
     return i;
 }
 
-MapTrainer& MapTrainer::operator=(const MapTrainer& rhs)
+Pokemod::MapTrainer& Pokemod::MapTrainer::operator=(const MapTrainer& rhs)
 {
     if (this == &rhs)
         return *this;
@@ -278,7 +278,7 @@ MapTrainer& MapTrainer::operator=(const MapTrainer& rhs)
     return *this;
 }
 
-void MapTrainer::clear()
+void Pokemod::MapTrainer::clear()
 {
     while (teamMemberCount())
         deleteTeamMember(0);