[FIX] PokeMod namespace removed

[ADD] MoveEffect editing form for PokéModr

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@38 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 24 insertions, 24 deletions

diff --git a/pokemod/MoveEffect.cpp b/pokemod/MoveEffect.cpp
index b7f7c61a..5fc53fc6 100644
--- a/pokemod/MoveEffect.cpp
+++ b/pokemod/MoveEffect.cpp
@@ -24,9 +24,9 @@
 #include "Pokemod.h"
 #include "MoveEffect.h"
 
-const QStringList PokeMod::MoveEffect::EffectStr = QStringList() << "Damage" << "Status" << "Confuse" << "Stat" << "StealHP" << "Counter" << "Selfdestruct" << "Need Status" << "Mirror" << "GetMoney" << "Never Miss" << "Steal Types" << "Clear Effects" << "Wait And Return" << "Self Confuse" << "Force Switch" << "Hit Multiple" << "Hit Multiple Turns" << "Flinch" << "One Hit K.O." << "Recoil" << "Recover" << "Rest" << "Sheild" << "Substitute" << "Recharge" << "Rage" << "Mimic" << "Random Move" << "Seed" << "Disable" << "Cut HM" << "Fly HM" << "Surf HM" << "Strength HM" << "Flash HM" << "Rock Smash HM" << "Rock Climb HM" << "Whirlpool HM" << "Waterfall HM" << "Share HP HM " << "Escape HM";
+const QStringList MoveEffect::EffectStr = QStringList() << "Damage" << "Status" << "Confuse" << "Stat" << "StealHP" << "Counter" << "Selfdestruct" << "Need Status" << "Mirror" << "GetMoney" << "Never Miss" << "Steal Types" << "Clear Effects" << "Wait And Return" << "Self Confuse" << "Force Switch" << "Hit Multiple" << "Hit Multiple Turns" << "Flinch" << "One Hit K.O." << "Recoil" << "Recover" << "Rest" << "Sheild" << "Substitute" << "Recharge" << "Rage" << "Mimic" << "Random Move" << "Seed" << "Disable" << "Cut HM" << "Fly HM" << "Surf HM" << "Strength HM" << "Flash HM" << "Rock Smash HM" << "Rock Climb HM" << "Whirlpool HM" << "Waterfall HM" << "Share HP HM " << "Escape HM";
 
-PokeMod::MoveEffect::MoveEffect(const Pokemod& par, const unsigned _id) :
+MoveEffect::MoveEffect(const Pokemod& par, const unsigned _id) :
         Object(par, _id),
         chance(1, 1),
         effect(UINT_MAX),
@@ -37,19 +37,19 @@ PokeMod::MoveEffect::MoveEffect(const Pokemod& par, const unsigned _id) :
 {
 }
 
-PokeMod::MoveEffect::MoveEffect(const Pokemod& par, const MoveEffect& e, const unsigned _id) :
+MoveEffect::MoveEffect(const Pokemod& par, const MoveEffect& e, const unsigned _id) :
         Object(par, _id)
 {
     *this = e;
 }
 
-PokeMod::MoveEffect::MoveEffect(const Pokemod& par, const QString& fname, const unsigned _id) :
+MoveEffect::MoveEffect(const Pokemod& par, const QString& fname, const unsigned _id) :
         Object(par, _id)
 {
     load(fname, _id);
 }
 
-bool PokeMod::MoveEffect::validate() const
+bool MoveEffect::validate() const
 {
     bool valid = true;
     pokemod.validationMsg(QString("------Effect with id %1---").arg(id), Pokemod::V_Msg);
@@ -57,7 +57,7 @@ bool PokeMod::MoveEffect::validate() const
     return valid;
 }
 
-void PokeMod::MoveEffect::load(const QString& fname, const unsigned _id) throw(Exception)
+void MoveEffect::load(const QString& fname, const unsigned _id) throw(Exception)
 {
     Ini ini(fname);
     if (_id == UINT_MAX)
@@ -80,7 +80,7 @@ void PokeMod::MoveEffect::load(const QString& fname, const unsigned _id) throw(E
     val4.set(i, j, k);
 }
 
-void PokeMod::MoveEffect::save(const QString& move) const throw(Exception)
+void MoveEffect::save(const QString& move) const throw(Exception)
 {
     Ini ini;
     ini.addField("id", id);
@@ -96,22 +96,22 @@ void PokeMod::MoveEffect::save(const QString& move) const throw(Exception)
     ini.save(QString("%1/move/%2/effect/%3.pini").arg(pokemod.getPath()).arg(move).arg(id));
 }
 
-void PokeMod::MoveEffect::setChance(const unsigned n, const unsigned d) throw(Exception)
+void MoveEffect::setChance(const unsigned n, const unsigned d) throw(Exception)
 {
     chance.set(n, d);
 }
 
-void PokeMod::MoveEffect::setChanceNum(const unsigned n) throw(Exception)
+void MoveEffect::setChanceNum(const unsigned n) throw(Exception)
 {
     chance.setNum(n);
 }
 
-void PokeMod::MoveEffect::setChanceDenom(const unsigned d) throw(Exception)
+void MoveEffect::setChanceDenom(const unsigned d) throw(Exception)
 {
     chance.setDenom(d);
 }
 
-void PokeMod::MoveEffect::setEffect(const unsigned e) throw(BoundsException)
+void MoveEffect::setEffect(const unsigned e) throw(BoundsException)
 {
     if (E_End <= e)
         throw(BoundsException("MoveEffect", "effect"));
@@ -122,7 +122,7 @@ void PokeMod::MoveEffect::setEffect(const unsigned e) throw(BoundsException)
     val4.set(1, 1, ((e == E_StealHP) || (e == E_Counter) || (e == E_Selfdestruct) || (e == E_Mirror) || (e == E_GetMoney) || (e == E_WaitAndReturn) || (e == E_Recoil)) ? Frac::Improper : Frac::Proper);
 }
 
-void PokeMod::MoveEffect::setVal1(const unsigned v1) throw(Exception)
+void MoveEffect::setVal1(const unsigned v1) throw(Exception)
 {
     switch (effect)
     {
@@ -155,7 +155,7 @@ void PokeMod::MoveEffect::setVal1(const unsigned v1) throw(Exception)
     val1 = v1;
 }
 
-void PokeMod::MoveEffect::setVal2(const unsigned v2) throw(Exception)
+void MoveEffect::setVal2(const unsigned v2) throw(Exception)
 {
     switch (effect)
     {
@@ -170,7 +170,7 @@ void PokeMod::MoveEffect::setVal2(const unsigned v2) throw(Exception)
     val2 = v2;
 }
 
-void PokeMod::MoveEffect::setVal3(const int v3)
+void MoveEffect::setVal3(const int v3)
 {
     switch (effect)
     {
@@ -181,52 +181,52 @@ void PokeMod::MoveEffect::setVal3(const int v3)
     val3 = v3;
 }
 
-void PokeMod::MoveEffect::setVal4(const unsigned n, const unsigned d) throw(Exception)
+void MoveEffect::setVal4(const unsigned n, const unsigned d) throw(Exception)
 {
     val4.set(n, d);
 }
 
-void PokeMod::MoveEffect::setVal4Num(const unsigned n) throw(Exception)
+void MoveEffect::setVal4Num(const unsigned n) throw(Exception)
 {
     val4.setNum(n);
 }
 
-void PokeMod::MoveEffect::setVal4Denom(const unsigned d) throw(Exception)
+void MoveEffect::setVal4Denom(const unsigned d) throw(Exception)
 {
     val4.setDenom(d);
 }
 
-Frac PokeMod::MoveEffect::getChance() const
+Frac MoveEffect::getChance() const
 {
     return chance;
 }
 
-unsigned PokeMod::MoveEffect::getEffect() const
+unsigned MoveEffect::getEffect() const
 {
     return effect;
 }
 
-unsigned PokeMod::MoveEffect::getVal1() const
+unsigned MoveEffect::getVal1() const
 {
     return val1;
 }
 
-unsigned PokeMod::MoveEffect::getVal2() const
+unsigned MoveEffect::getVal2() const
 {
     return val2;
 }
 
-int PokeMod::MoveEffect::getVal3() const
+int MoveEffect::getVal3() const
 {
     return val3;
 }
 
-Frac PokeMod::MoveEffect::getVal4() const
+Frac MoveEffect::getVal4() const
 {
     return val4;
 }
 
-PokeMod::MoveEffect& PokeMod::MoveEffect::operator=(const MoveEffect& rhs)
+MoveEffect& MoveEffect::operator=(const MoveEffect& rhs)
 {
     if (this == &rhs)
         return *this;