1 files changed, 48 insertions, 48 deletions

diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp
index c1effd1d..6ce711eb 100644
--- a/pokemod/MapTrainer.cpp
+++ b/pokemod/MapTrainer.cpp
@@ -22,7 +22,7 @@
 
 #include "MapTrainer.h"
 
-PokeGen::PokeMod::MapTrainer::MapTrainer(const Pokemod& par, const unsigned _id) :
+PokeMod::MapTrainer::MapTrainer(const Pokemod& par, const unsigned _id) :
         Object(par, _id),
         name(""),
         coordinate(0, 0),
@@ -39,19 +39,19 @@ PokeGen::PokeMod::MapTrainer::MapTrainer(const Pokemod& par, const unsigned _id)
 {
 }
 
-PokeGen::PokeMod::MapTrainer::MapTrainer(const Pokemod& par, const MapTrainer& t, const unsigned _id) :
+PokeMod::MapTrainer::MapTrainer(const Pokemod& par, const MapTrainer& t, const unsigned _id) :
         Object(par, _id)
 {
     *this = t;
 }
 
-PokeGen::PokeMod::MapTrainer::MapTrainer(const Pokemod& par, const QString& fname, const unsigned _id) :
+PokeMod::MapTrainer::MapTrainer(const Pokemod& par, const QString& fname, const unsigned _id) :
         Object(par, _id)
 {
     load(fname, _id);
 }
 
-bool PokeGen::PokeMod::MapTrainer::validate() const
+bool PokeMod::MapTrainer::validate() const
 {
     bool valid = true;
     pokemod.validationMsg(QString("------Trainer \"%1\" with id %2---").arg(name).arg(id), Pokemod::V_Msg);
@@ -126,7 +126,7 @@ bool PokeGen::PokeMod::MapTrainer::validate() const
     return valid;
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getNewId() const
+unsigned PokeMod::MapTrainer::getNewId() const
 {
     unsigned i = 0;
     for (; i < getPokemonCount(); ++i)
@@ -137,7 +137,7 @@ unsigned PokeGen::PokeMod::MapTrainer::getNewId() const
     return UINT_MAX;
 }
 
-void PokeGen::PokeMod::MapTrainer::load(const QString& fname, const unsigned _id) throw(Exception)
+void PokeMod::MapTrainer::load(const QString& fname, const unsigned _id) throw(Exception)
 {
     Ini ini(fname);
     if (_id == UINT_MAX)
@@ -173,7 +173,7 @@ void PokeGen::PokeMod::MapTrainer::load(const QString& fname, const unsigned _id
     }
 }
 
-void PokeGen::PokeMod::MapTrainer::save(const QString& map) const throw(Exception)
+void PokeMod::MapTrainer::save(const QString& map) const throw(Exception)
 {
     Ini ini;
     ini.addField("id", id);
@@ -197,197 +197,197 @@ void PokeGen::PokeMod::MapTrainer::save(const QString& map) const throw(Exceptio
         i.next().save(map, name);
 }
 
-void PokeGen::PokeMod::MapTrainer::setName(const QString& n)
+void PokeMod::MapTrainer::setName(const QString& n)
 {
     name = n;
 }
 
-void PokeGen::PokeMod::MapTrainer::setCoordinate(const unsigned x, const unsigned y)
+void PokeMod::MapTrainer::setCoordinate(const unsigned x, const unsigned y)
 {
     coordinate.set(x, y);
 }
 
-void PokeGen::PokeMod::MapTrainer::setCoordinateX(const unsigned x)
+void PokeMod::MapTrainer::setCoordinateX(const unsigned x)
 {
     coordinate.setX(x);
 }
 
-void PokeGen::PokeMod::MapTrainer::setCoordinateY(const unsigned y)
+void PokeMod::MapTrainer::setCoordinateY(const unsigned y)
 {
     coordinate.setY(y);
 }
 
-void PokeGen::PokeMod::MapTrainer::setSkin(const QString& s) throw(OpenException)
+void PokeMod::MapTrainer::setSkin(const QString& s) throw(OpenException)
 {
     if (!QFile::exists(QString("%1/image/skin/%2.png").arg(pokemod.getPath()).arg(s)))
         throw(OpenException("MapTrainer", QString("%1/image/skin/%2.png").arg(pokemod.getPath()).arg(s)));
     skin = s;
 }
 
-void PokeGen::PokeMod::MapTrainer::setSight(const unsigned s)
+void PokeMod::MapTrainer::setSight(const unsigned s)
 {
     sight = s;
 }
 
-void PokeGen::PokeMod::MapTrainer::setDirection(const unsigned d) throw(BoundsException)
+void PokeMod::MapTrainer::setDirection(const unsigned d) throw(BoundsException)
 {
     if (D_End_None <= d)
         throw(BoundsException("MapTrainer", "direction"));
     direction = d;
 }
 
-void PokeGen::PokeMod::MapTrainer::setNumFight(const unsigned n) throw(BoundsException)
+void PokeMod::MapTrainer::setNumFight(const unsigned n) throw(BoundsException)
 {
     if (!n || (pokemod.getRules().getMaxFight() < n))
         throw(BoundsException("MapTrainer", "numFight"));
     numFight = n;
 }
 
-void PokeGen::PokeMod::MapTrainer::setAI(const QString& a) throw(OpenException)
+void PokeMod::MapTrainer::setAI(const QString& a) throw(OpenException)
 {
     if (!QFile::exists(QString("%1/ai/%2.pai").arg(pokemod.getPath()).arg(a)))
         throw(OpenException("MapTrainer", QString("%1/ai/%2.pai").arg(pokemod.getPath()).arg(a)));
     ai = a;
 }
 
-void PokeGen::PokeMod::MapTrainer::setAppearFlag(const unsigned f, const unsigned s)
+void PokeMod::MapTrainer::setAppearFlag(const unsigned f, const unsigned s)
 {
     appearFlag.set(f, s);
 }
 
-void PokeGen::PokeMod::MapTrainer::setAppearFlagFlag(const unsigned f)
+void PokeMod::MapTrainer::setAppearFlagFlag(const unsigned f)
 {
     appearFlag.setFlag(f);
 }
 
-void PokeGen::PokeMod::MapTrainer::setAppearFlagStatus(const unsigned s)
+void PokeMod::MapTrainer::setAppearFlagStatus(const unsigned s)
 {
     appearFlag.setStatus(s);
 }
 
-void PokeGen::PokeMod::MapTrainer::setOverworldDialog(const unsigned o) throw(BoundsException)
+void PokeMod::MapTrainer::setOverworldDialog(const unsigned o) throw(BoundsException)
 {
     if (pokemod.getDialogByID(o) == UINT_MAX)
         throw(BoundsException("MapTrainer", "overworldDialog"));
     overworldDialog = o;
 }
 
-void PokeGen::PokeMod::MapTrainer::setWinDialog(const unsigned w) throw(BoundsException)
+void PokeMod::MapTrainer::setWinDialog(const unsigned w) throw(BoundsException)
 {
     if (pokemod.getDialogByID(w) == UINT_MAX)
         throw(BoundsException("MapTrainer", "winDialog"));
     winDialog = w;
 }
 
-void PokeGen::PokeMod::MapTrainer::setLoseDialog(const unsigned l) throw(BoundsException)
+void PokeMod::MapTrainer::setLoseDialog(const unsigned l) throw(BoundsException)
 {
     if (pokemod.getDialogByID(l) == UINT_MAX)
         throw(BoundsException("MapTrainer", "loseDialog"));
     loseDialog = l;
 }
 
-void PokeGen::PokeMod::MapTrainer::setLeadPokemon(const unsigned l) throw(BoundsException)
+void PokeMod::MapTrainer::setLeadPokemon(const unsigned l) throw(BoundsException)
 {
     if (getPokemonCount() <= l)
         throw(BoundsException("MapTrainer", "leadPokemon"));
     leadPokemon = l;
 }
 
-QString PokeGen::PokeMod::MapTrainer::getName() const
+QString PokeMod::MapTrainer::getName() const
 {
     return name;
 }
 
-PokeGen::Point PokeGen::PokeMod::MapTrainer::getCoordinate() const
+Point PokeMod::MapTrainer::getCoordinate() const
 {
     return coordinate;
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getCoordinateX() const
+unsigned PokeMod::MapTrainer::getCoordinateX() const
 {
     return coordinate.getX();
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getCoordinateY() const
+unsigned PokeMod::MapTrainer::getCoordinateY() const
 {
     return coordinate.getY();
 }
 
-QString PokeGen::PokeMod::MapTrainer::getSkin() const
+QString PokeMod::MapTrainer::getSkin() const
 {
     return skin;
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getSight() const
+unsigned PokeMod::MapTrainer::getSight() const
 {
     return sight;
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getDirection() const
+unsigned PokeMod::MapTrainer::getDirection() const
 {
     return direction;
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getNumFight() const
+unsigned PokeMod::MapTrainer::getNumFight() const
 {
     return numFight;
 }
 
-QString PokeGen::PokeMod::MapTrainer::getAI() const
+QString PokeMod::MapTrainer::getAI() const
 {
     return ai;
 }
 
-PokeGen::Flag PokeGen::PokeMod::MapTrainer::getAppearFlag() const
+Flag PokeMod::MapTrainer::getAppearFlag() const
 {
     return appearFlag;
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getAppearFlagFlag() const
+unsigned PokeMod::MapTrainer::getAppearFlagFlag() const
 {
     return appearFlag.getFlag();
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getAppearFlagStatus() const
+unsigned PokeMod::MapTrainer::getAppearFlagStatus() const
 {
     return appearFlag.getStatus();
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getOverworldDialog() const
+unsigned PokeMod::MapTrainer::getOverworldDialog() const
 {
     return overworldDialog;
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getWinDialog() const
+unsigned PokeMod::MapTrainer::getWinDialog() const
 {
     return winDialog;
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getLoseDialog() const
+unsigned PokeMod::MapTrainer::getLoseDialog() const
 {
     return loseDialog;
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getLeadPokemon() const
+unsigned PokeMod::MapTrainer::getLeadPokemon() const
 {
     return leadPokemon;
 }
 
-const PokeGen::PokeMod::MapTrainerPokemon& PokeGen::PokeMod::MapTrainer::getPokemon(const unsigned i) const throw(IndexException)
+const PokeMod::MapTrainerPokemon& PokeMod::MapTrainer::getPokemon(const unsigned i) const throw(IndexException)
 {
     if (getPokemonCount() <= i)
         throw(IndexException("MapTrainer"));
     return team.at(i);
 }
 
-PokeGen::PokeMod::MapTrainerPokemon& PokeGen::PokeMod::MapTrainer::getPokemon(const unsigned i) throw(IndexException)
+PokeMod::MapTrainerPokemon& PokeMod::MapTrainer::getPokemon(const unsigned i) throw(IndexException)
 {
     if (getPokemonCount() <= i)
         throw(IndexException("MapTrainer"));
     return team[i];
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getPokemonByID(const unsigned _id) const
+unsigned PokeMod::MapTrainer::getPokemonByID(const unsigned _id) const
 {
     for (unsigned i = 0; i < getPokemonCount(); ++i)
     {
@@ -397,37 +397,37 @@ unsigned PokeGen::PokeMod::MapTrainer::getPokemonByID(const unsigned _id) const
     return UINT_MAX;
 }
 
-unsigned PokeGen::PokeMod::MapTrainer::getPokemonCount() const
+unsigned PokeMod::MapTrainer::getPokemonCount() const
 {
     return team.size();
 }
 
-PokeGen::PokeMod::MapTrainerPokemon& PokeGen::PokeMod::MapTrainer::newPokemon()
+PokeMod::MapTrainerPokemon& PokeMod::MapTrainer::newPokemon()
 {
     team.append(MapTrainerPokemon(pokemod, getNewId()));
     return team[getPokemonCount() - 1];
 }
 
-PokeGen::PokeMod::MapTrainerPokemon& PokeGen::PokeMod::MapTrainer::newPokemon(const QString& fname)
+PokeMod::MapTrainerPokemon& PokeMod::MapTrainer::newPokemon(const QString& fname)
 {
     team.append(MapTrainerPokemon(pokemod, fname, getNewId()));
     return team[getPokemonCount() - 1];
 }
 
-PokeGen::PokeMod::MapTrainerPokemon& PokeGen::PokeMod::MapTrainer::newPokemon(const MapTrainerPokemon& p)
+PokeMod::MapTrainerPokemon& PokeMod::MapTrainer::newPokemon(const MapTrainerPokemon& p)
 {
     team.append(MapTrainerPokemon(pokemod, p, getNewId()));
     return team[getPokemonCount() - 1];
 }
 
-void PokeGen::PokeMod::MapTrainer::deletePokemon(const unsigned i) throw(IndexException)
+void PokeMod::MapTrainer::deletePokemon(const unsigned i) throw(IndexException)
 {
     if (getPokemonCount() <= i)
         throw(IndexException("MapTrainer"));
     team.removeAt(i);
 }
 
-PokeGen::PokeMod::MapTrainer& PokeGen::PokeMod::MapTrainer::operator=(const MapTrainer& rhs)
+PokeMod::MapTrainer& PokeMod::MapTrainer::operator=(const MapTrainer& rhs)
 {
     if (this == &rhs)
         return *this;