1 files changed, 25 insertions, 25 deletions

diff --git a/pokemod/MapWildList.cpp b/pokemod/MapWildList.cpp
index 79a51633..44f7f42b 100644
--- a/pokemod/MapWildList.cpp
+++ b/pokemod/MapWildList.cpp
@@ -22,9 +22,9 @@
 
 #include "MapWildList.h"
 
-const char* PokeGen::PokeMod::MapWildList::ControlStr[PokeGen::PokeMod::MapWildList::End] = {"Grass", "Surfing", "Fishing", "Dive", "Headbutt", "Rock Smash"};
+const char* PokeMod::MapWildList::ControlStr[PokeMod::MapWildList::End] = {"Grass", "Surfing", "Fishing", "Dive", "Headbutt", "Rock Smash"};
 
-PokeGen::PokeMod::MapWildList::MapWildList(const Pokemod& par, const unsigned _id) :
+PokeMod::MapWildList::MapWildList(const Pokemod& par, const unsigned _id) :
         Object(par, _id),
         control(UINT_MAX),
         value(INT_MAX),
@@ -32,19 +32,19 @@ PokeGen::PokeMod::MapWildList::MapWildList(const Pokemod& par, const unsigned _i
 {
 }
 
-PokeGen::PokeMod::MapWildList::MapWildList(const Pokemod& par, const MapWildList& w, const unsigned _id) :
+PokeMod::MapWildList::MapWildList(const Pokemod& par, const MapWildList& w, const unsigned _id) :
         Object(par, _id)
 {
     *this = w;
 }
 
-PokeGen::PokeMod::MapWildList::MapWildList(const Pokemod& par, const QString& fname, const unsigned _id) :
+PokeMod::MapWildList::MapWildList(const Pokemod& par, const QString& fname, const unsigned _id) :
         Object(par, _id)
 {
     load(fname, _id);
 }
 
-bool PokeGen::PokeMod::MapWildList::validate() const
+bool PokeMod::MapWildList::validate() const
 {
     bool valid = true;
     pokemod.validationMsg(QString("------Wild List with id %1---").arg(id), Pokemod::V_Msg);
@@ -108,7 +108,7 @@ bool PokeGen::PokeMod::MapWildList::validate() const
     return valid;
 }
 
-unsigned PokeGen::PokeMod::MapWildList::getNewId() const
+unsigned PokeMod::MapWildList::getNewId() const
 {
     unsigned i = 0;
     for (; (i < getPokemonCount()) && (getPokemonByID(i) != UINT_MAX); ++i)
@@ -116,7 +116,7 @@ unsigned PokeGen::PokeMod::MapWildList::getNewId() const
     return i;
 }
 
-void PokeGen::PokeMod::MapWildList::load(const QString& fname, const unsigned _id) throw(Exception)
+void PokeMod::MapWildList::load(const QString& fname, const unsigned _id) throw(Exception)
 {
     Ini ini(fname);
     if (_id == UINT_MAX)
@@ -147,7 +147,7 @@ void PokeGen::PokeMod::MapWildList::load(const QString& fname, const unsigned _i
     }
 }
 
-void PokeGen::PokeMod::MapWildList::save(const QString& map) const throw(Exception)
+void PokeMod::MapWildList::save(const QString& map) const throw(Exception)
 {
     Ini ini;
     ini.addField("id", id);
@@ -162,19 +162,19 @@ void PokeGen::PokeMod::MapWildList::save(const QString& map) const throw(Excepti
         i.next().save(map, id);
 }
 
-void PokeGen::PokeMod::MapWildList::setControl(const unsigned c) throw(BoundsException)
+void PokeMod::MapWildList::setControl(const unsigned c) throw(BoundsException)
 {
     if (End <= c)
         throw(BoundsException("MapWildList", "control"));
     control = c;
 }
 
-void PokeGen::PokeMod::MapWildList::setValue(const unsigned v)
+void PokeMod::MapWildList::setValue(const unsigned v)
 {
     value = v;
 }
 
-void PokeGen::PokeMod::MapWildList::setTime(const unsigned ts, const bool t) throw(Exception)
+void PokeMod::MapWildList::setTime(const unsigned ts, const bool t) throw(Exception)
 {
     for (QMutableListIterator<unsigned> i(times); i.hasNext(); )
     {
@@ -191,22 +191,22 @@ void PokeGen::PokeMod::MapWildList::setTime(const unsigned ts, const bool t) thr
     times.append(ts);
 }
 
-void PokeGen::PokeMod::MapWildList::setScope(const unsigned s)
+void PokeMod::MapWildList::setScope(const unsigned s)
 {
     scope = s;
 }
 
-unsigned PokeGen::PokeMod::MapWildList::getControl() const
+unsigned PokeMod::MapWildList::getControl() const
 {
     return control;
 }
 
-int PokeGen::PokeMod::MapWildList::getValue() const
+int PokeMod::MapWildList::getValue() const
 {
     return value;
 }
 
-bool PokeGen::PokeMod::MapWildList::getTime(const unsigned ts) const
+bool PokeMod::MapWildList::getTime(const unsigned ts) const
 {
     for (QListIterator<unsigned> i(times); i.hasNext(); )
     {
@@ -216,26 +216,26 @@ bool PokeGen::PokeMod::MapWildList::getTime(const unsigned ts) const
     return false;
 }
 
-int PokeGen::PokeMod::MapWildList::getScope() const
+int PokeMod::MapWildList::getScope() const
 {
     return scope;
 }
 
-const PokeGen::PokeMod::MapWildListPokemon& PokeGen::PokeMod::MapWildList::getPokemon(const unsigned i) const throw(IndexException)
+const PokeMod::MapWildListPokemon& PokeMod::MapWildList::getPokemon(const unsigned i) const throw(IndexException)
 {
     if (getPokemonCount() <= i)
         throw(IndexException("MapWildList"));
     return pokemon.at(i);
 }
 
-PokeGen::PokeMod::MapWildListPokemon& PokeGen::PokeMod::MapWildList::getPokemon(const unsigned i) throw(IndexException)
+PokeMod::MapWildListPokemon& PokeMod::MapWildList::getPokemon(const unsigned i) throw(IndexException)
 {
     if (getPokemonCount() <= i)
         throw(IndexException("MapWildList"));
     return pokemon[i];
 }
 
-unsigned PokeGen::PokeMod::MapWildList::getPokemonByID(const unsigned _id) const
+unsigned PokeMod::MapWildList::getPokemonByID(const unsigned _id) const
 {
     for (unsigned i = 0; i < getPokemonCount(); ++i)
     {
@@ -245,37 +245,37 @@ unsigned PokeGen::PokeMod::MapWildList::getPokemonByID(const unsigned _id) const
     return UINT_MAX;
 }
 
-unsigned PokeGen::PokeMod::MapWildList::getPokemonCount() const
+unsigned PokeMod::MapWildList::getPokemonCount() const
 {
     return pokemon.size();
 }
 
-PokeGen::PokeMod::MapWildListPokemon& PokeGen::PokeMod::MapWildList::newPokemon()
+PokeMod::MapWildListPokemon& PokeMod::MapWildList::newPokemon()
 {
     pokemon.append(MapWildListPokemon(pokemod, getNewId()));
     return pokemon[getPokemonCount() - 1];
 }
 
-PokeGen::PokeMod::MapWildListPokemon& PokeGen::PokeMod::MapWildList::newPokemon(const QString& fname)
+PokeMod::MapWildListPokemon& PokeMod::MapWildList::newPokemon(const QString& fname)
 {
     pokemon.append(MapWildListPokemon(pokemod, fname, getNewId()));
     return pokemon[getPokemonCount() - 1];
 }
 
-PokeGen::PokeMod::MapWildListPokemon& PokeGen::PokeMod::MapWildList::newPokemon(const MapWildListPokemon& p)
+PokeMod::MapWildListPokemon& PokeMod::MapWildList::newPokemon(const MapWildListPokemon& p)
 {
     pokemon.append(MapWildListPokemon(pokemod, p, getNewId()));
     return pokemon[getPokemonCount() - 1];
 }
 
-void PokeGen::PokeMod::MapWildList::deletePokemon(const unsigned i) throw(IndexException)
+void PokeMod::MapWildList::deletePokemon(const unsigned i) throw(IndexException)
 {
     if (getPokemonCount() <= i)
         throw(IndexException("MapWildList"));
     pokemon.removeAt(i);
 }
 
-PokeGen::PokeMod::MapWildList& PokeGen::PokeMod::MapWildList::operator=(const MapWildList& rhs)
+PokeMod::MapWildList& PokeMod::MapWildList::operator=(const MapWildList& rhs)
 {
     if (this == &rhs)
         return *this;