1 files changed, 21 insertions, 21 deletions

diff --git a/pokemod/SpeciesEvolution.cpp b/pokemod/SpeciesEvolution.cpp
index b431b96d..b41f82fc 100644
--- a/pokemod/SpeciesEvolution.cpp
+++ b/pokemod/SpeciesEvolution.cpp
@@ -22,10 +22,10 @@
 
 #include "SpeciesEvolution.h"
 
-const char* PokeGen::PokeMod::SpeciesEvolution::StyleStr[PokeGen::PokeMod::SpeciesEvolution::S_End] = {"Level", "Happiness", "Stat", "Item", "Trade", "TradeItem", "Personality", "Spare Slot"};
-const char* PokeGen::PokeMod::SpeciesEvolution::GiveHoldStr[PokeGen::PokeMod::SpeciesEvolution::G_End] = {"Give", "Hold"};
+const char* PokeMod::SpeciesEvolution::StyleStr[PokeMod::SpeciesEvolution::S_End] = {"Level", "Happiness", "Stat", "Item", "Trade", "TradeItem", "Personality", "Spare Slot"};
+const char* PokeMod::SpeciesEvolution::GiveHoldStr[PokeMod::SpeciesEvolution::G_End] = {"Give", "Hold"};
 
-PokeGen::PokeMod::SpeciesEvolution::SpeciesEvolution(const Pokemod& par, const unsigned _id) :
+PokeMod::SpeciesEvolution::SpeciesEvolution(const Pokemod& par, const unsigned _id) :
         Object(par, _id),
         species(UINT_MAX),
         style(UINT_MAX),
@@ -36,19 +36,19 @@ PokeGen::PokeMod::SpeciesEvolution::SpeciesEvolution(const Pokemod& par, const u
 {
 }
 
-PokeGen::PokeMod::SpeciesEvolution::SpeciesEvolution(const Pokemod& par, const SpeciesEvolution& e, const unsigned _id) :
+PokeMod::SpeciesEvolution::SpeciesEvolution(const Pokemod& par, const SpeciesEvolution& e, const unsigned _id) :
         Object(par, _id)
 {
     *this = e;
 }
 
-PokeGen::PokeMod::SpeciesEvolution::SpeciesEvolution(const Pokemod& par, const QString& fname, const unsigned _id) :
+PokeMod::SpeciesEvolution::SpeciesEvolution(const Pokemod& par, const QString& fname, const unsigned _id) :
         Object(par, _id)
 {
     load(fname, _id);
 }
 
-bool PokeGen::PokeMod::SpeciesEvolution::validate() const
+bool PokeMod::SpeciesEvolution::validate() const
 {
     bool valid = true;
     pokemod.validationMsg(QString("------Evolution with id %1---").arg(id), Pokemod::V_Msg);
@@ -126,7 +126,7 @@ bool PokeGen::PokeMod::SpeciesEvolution::validate() const
     return valid;
 }
 
-void PokeGen::PokeMod::SpeciesEvolution::load(const QString& fname, const unsigned _id) throw(Exception)
+void PokeMod::SpeciesEvolution::load(const QString& fname, const unsigned _id) throw(Exception)
 {
     Ini ini(fname);
     if (_id == UINT_MAX)
@@ -141,7 +141,7 @@ void PokeGen::PokeMod::SpeciesEvolution::load(const QString& fname, const unsign
     ini.getValue("level", level, 0);
 }
 
-void PokeGen::PokeMod::SpeciesEvolution::save(const QString& species) const throw(Exception)
+void PokeMod::SpeciesEvolution::save(const QString& species) const throw(Exception)
 {
     Ini ini;
     ini.addField("id", id);
@@ -154,21 +154,21 @@ void PokeGen::PokeMod::SpeciesEvolution::save(const QString& species) const thro
     ini.save(QString("%1/species/%2/evolution/%3.pini").arg(pokemod.getPath()).arg(species).arg(id));
 }
 
-void PokeGen::PokeMod::SpeciesEvolution::setSpecies(const unsigned s) throw(BoundsException)
+void PokeMod::SpeciesEvolution::setSpecies(const unsigned s) throw(BoundsException)
 {
     if (pokemod.getSpeciesByID(s) == UINT_MAX)
         throw(BoundsException("SpeciesEvolution", "species"));
     species = s;
 }
 
-void PokeGen::PokeMod::SpeciesEvolution::setStyle(const unsigned s) throw(BoundsException)
+void PokeMod::SpeciesEvolution::setStyle(const unsigned s) throw(BoundsException)
 {
     if (S_End <= s)
         throw(BoundsException("SpeciesEvolution", "style"));
     style = s;
 }
 
-void PokeGen::PokeMod::SpeciesEvolution::setVal1(const unsigned v1) throw(Exception)
+void PokeMod::SpeciesEvolution::setVal1(const unsigned v1) throw(Exception)
 {
     bool ok = false;
     switch (style)
@@ -199,7 +199,7 @@ void PokeGen::PokeMod::SpeciesEvolution::setVal1(const unsigned v1) throw(Except
     val1 = v1;
 }
 
-void PokeGen::PokeMod::SpeciesEvolution::setVal2(const unsigned v2) throw(Exception)
+void PokeMod::SpeciesEvolution::setVal2(const unsigned v2) throw(Exception)
 {
     switch (style)
     {
@@ -217,7 +217,7 @@ void PokeGen::PokeMod::SpeciesEvolution::setVal2(const unsigned v2) throw(Except
     val2 = v2;
 }
 
-void PokeGen::PokeMod::SpeciesEvolution::setVal3(const unsigned v3) throw(Exception)
+void PokeMod::SpeciesEvolution::setVal3(const unsigned v3) throw(Exception)
 {
     switch (style)
     {
@@ -232,44 +232,44 @@ void PokeGen::PokeMod::SpeciesEvolution::setVal3(const unsigned v3) throw(Except
     val3 = v3;
 }
 
-void PokeGen::PokeMod::SpeciesEvolution::setLevel(const unsigned l) throw(BoundsException)
+void PokeMod::SpeciesEvolution::setLevel(const unsigned l) throw(BoundsException)
 {
     if (pokemod.getRules().getMaxLevel() < l)
         throw(BoundsException("SpeciesEvolution", "level"));
     level = l;
 }
 
-unsigned PokeGen::PokeMod::SpeciesEvolution::getSpecies() const
+unsigned PokeMod::SpeciesEvolution::getSpecies() const
 {
     return species;
 }
 
-unsigned PokeGen::PokeMod::SpeciesEvolution::getStyle() const
+unsigned PokeMod::SpeciesEvolution::getStyle() const
 {
     return style;
 }
 
-unsigned PokeGen::PokeMod::SpeciesEvolution::getVal1() const
+unsigned PokeMod::SpeciesEvolution::getVal1() const
 {
     return val1;
 }
 
-unsigned PokeGen::PokeMod::SpeciesEvolution::getVal2() const
+unsigned PokeMod::SpeciesEvolution::getVal2() const
 {
     return val2;
 }
 
-unsigned PokeGen::PokeMod::SpeciesEvolution::getVal3() const
+unsigned PokeMod::SpeciesEvolution::getVal3() const
 {
     return val3;
 }
 
-unsigned PokeGen::PokeMod::SpeciesEvolution::getLevel() const
+unsigned PokeMod::SpeciesEvolution::getLevel() const
 {
     return level;
 }
 
-PokeGen::PokeMod::SpeciesEvolution& PokeGen::PokeMod::SpeciesEvolution::operator=(const SpeciesEvolution& rhs)
+PokeMod::SpeciesEvolution& PokeMod::SpeciesEvolution::operator=(const SpeciesEvolution& rhs)
 {
     if (this == &rhs)
         return *this;