[FIX] Grammer in Changelog

[FIX] Made pokemod classes contain their names for later ease
[ADD] PokéModr main window form
[FIX] Ini and Exception includes fixed
[FIX] BugCatcher bugs fixed
[FIX] .pro files fixed
[ADD] PokéModr main GUI almost complete

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

1 files changed, 30 insertions, 30 deletions

diff --git a/pokemod/AbilityEffect.cpp b/pokemod/AbilityEffect.cpp
index dd47c900..3bb638e3 100644
--- a/pokemod/AbilityEffect.cpp
+++ b/pokemod/AbilityEffect.cpp
@@ -37,7 +37,7 @@ const QStringList AbilityEffect::SideStr = QStringList() << "Above" << "Below";
 
 
 AbilityEffect::AbilityEffect(const Pokemod& par, const unsigned _id) :
-        Object(par, _id),
+        Object("AbilityEffect", par, _id),
         chance(1, 1),
         effect(UINT_MAX),
         val1(UINT_MAX),
@@ -50,13 +50,13 @@ AbilityEffect::AbilityEffect(const Pokemod& par, const unsigned _id) :
 }
 
 AbilityEffect::AbilityEffect(const Pokemod& par, const AbilityEffect& e, const unsigned _id) :
-        Object(par, _id)
+        Object("AbilityEffect", par, _id)
 {
     *this = e;
 }
 
 AbilityEffect::AbilityEffect(const Pokemod& par, const QString& fname, const unsigned _id) :
-        Object(par, _id)
+        Object("AbilityEffect", par, _id)
 {
     load(fname, _id);
 }
@@ -259,7 +259,7 @@ void AbilityEffect::setChanceDenom(const unsigned d) throw(Exception)
 void AbilityEffect::setEffect(const unsigned e) throw(BoundsException)
 {
     if (E_End <= e)
-        throw(BoundsException("AbilityEffect", "effect"));
+        throw(BoundsException(className, "effect"));
     effect = e;
     val1 = UINT_MAX;
     val2 = UINT_MAX;
@@ -272,34 +272,34 @@ void AbilityEffect::setVal1(const unsigned v1) throw(Exception)
     {
         case E_Stats:
             if ((ST_HP == val1) || (ST_End_Battle <= val1) || ((val1 == ST_SpecialDefense) && !pokemod.getRules().getSpecialSplit()))
-                throw(BoundsException("AbilityEffect", "val1"));
+                throw(BoundsException(className, "val1"));
             break;
         case E_Status:
             if (STS_End <= v1)
-                throw(BoundsException("AbilityEffect", "val1"));
+                throw(BoundsException(className, "val1"));
             break;
         case E_Ability:
             if (pokemod.getAbilityIndex(v1) == UINT_MAX)
-                throw(BoundsException("AbilityEffect", "val1"));
+                throw(BoundsException(className, "val1"));
             break;
         case E_AccuracyPowerTrade:
             if (PA_End <= v1)
-                throw(BoundsException("AbilityEffect", "val1"));
+                throw(BoundsException(className, "val1"));
             break;
         case E_ItemEffect:
             if (IT_End <= v1)
-                throw(BoundsException("AbilityEffect", "val1"));
+                throw(BoundsException(className, "val1"));
             break;
         case E_Type:
             if (pokemod.getTypeIndex(v1) == UINT_MAX)
-                throw(BoundsException("AbilityEffect", "val1"));
+                throw(BoundsException(className, "val1"));
             break;
         case E_Weather:
             if (W_End_All <= v1)
-                throw(BoundsException("AbilityEffect", "val1"));
+                throw(BoundsException(className, "val1"));
             break;
         default:
-            throw(UnusedException("AbilityEffect", "val1"));
+            throw(UnusedException(className, "val1"));
             break;
     }
     val1 = v1;
@@ -311,23 +311,23 @@ void AbilityEffect::setVal2(const unsigned v2) throw(Exception)
     {
         case E_Stats:
             if (BM_End <= v2)
-                throw(BoundsException("AbilityEffect", "val2"));
+                throw(BoundsException(className, "val2"));
             break;
         case E_Status:
         case E_Weather:
             if (C_End <= v2)
-                throw(BoundsException("AbilityEffect", "val2"));
+                throw(BoundsException(className, "val2"));
             break;
         case E_Ability:
             if (I_End <= v2)
-                throw(BoundsException("AbilityEffect", "val2"));
+                throw(BoundsException(className, "val2"));
             break;
         case E_Type:
             if (B_End <= v2)
-                throw(BoundsException("AbilityEffect", "val2"));
+                throw(BoundsException(className, "val2"));
             break;
         default:
-            throw(UnusedException("AbilityEffect", "val2"));
+            throw(UnusedException(className, "val2"));
             break;
     }
     val2 = v2;
@@ -346,14 +346,14 @@ void AbilityEffect::setVal3(const int v3) throw(Exception)
         case E_Type:
         case E_FastHatch:
             if ((v3 < 0) || (100 < v3))
-                throw(BoundsException("AbilityEffect", "val3"));
+                throw(BoundsException(className, "val3"));
             break;
         case E_Stats:
             if ((v3 < -12) || (12 < v3))
-                throw(BoundsException("AbilityEffect", "val3"));
+                throw(BoundsException(className, "val3"));
             break;
         default:
-            throw(UnusedException("AbilityEffect", "val3"));
+            throw(UnusedException(className, "val3"));
             break;
     }
     val3 = v3;
@@ -362,7 +362,7 @@ void AbilityEffect::setVal3(const int v3) throw(Exception)
 void AbilityEffect::setTrigger(const unsigned t) throw(BoundsException)
 {
     if (T_End <= t)
-        throw(BoundsException("AbilityEffect", "trigger"));
+        throw(BoundsException(className, "trigger"));
     trigger = t;
     tval1 = UINT_MAX;
     tval2.set(1, 1);
@@ -374,26 +374,26 @@ void AbilityEffect::setTval1(const unsigned tv1) throw(Exception)
     {
         case T_Weather:
             if (W_End_All <= tv1)
-                throw(BoundsException("AbilityEffect", "tval1"));
+                throw(BoundsException(className, "tval1"));
             break;
         case T_Type:
             if (pokemod.getTypeIndex(tv1) == UINT_MAX)
-                throw(BoundsException("AbilityEffect", "tval1"));
+                throw(BoundsException(className, "tval1"));
             break;
         case T_HPBoundary:
             if (S_End <= tv1)
-                throw(BoundsException("AbilityEffect", "tval1"));
+                throw(BoundsException(className, "tval1"));
             break;
         case T_StatChange:
             if ((ST_HP == tval1) || (ST_End_Battle <= tval1) || ((tval1 == ST_SpecialDefense) && !pokemod.getRules().getSpecialSplit()))
-                throw(BoundsException("AbilityEffect", "tval1"));
+                throw(BoundsException(className, "tval1"));
             break;
         case T_Status:
             if (STS_End <= tv1)
-                throw(BoundsException("AbilityEffect", "tval1"));
+                throw(BoundsException(className, "tval1"));
             break;
         default:
-            throw(UnusedException("AbilityEffect", "tval1"));
+            throw(UnusedException(className, "tval1"));
             break;
     }
     tval1 = tv1;
@@ -402,21 +402,21 @@ void AbilityEffect::setTval1(const unsigned tv1) throw(Exception)
 void AbilityEffect::setTval2(const unsigned n, const unsigned d) throw(Exception)
 {
     if (trigger != T_HPBoundary)
-        throw(UnusedException("AbilityEffect", "tval2"));
+        throw(UnusedException(className, "tval2"));
     tval2.set(n, d);
 }
 
 void AbilityEffect::setTval2Num(const unsigned n) throw(Exception)
 {
     if (trigger != T_HPBoundary)
-        throw(UnusedException("AbilityEffect", "tval2"));
+        throw(UnusedException(className, "tval2"));
     tval2.setNum(n);
 }
 
 void AbilityEffect::setTval2Denom(const unsigned d) throw(Exception)
 {
     if (trigger != T_HPBoundary)
-        throw(UnusedException("AbilityEffect", "tval2"));
+        throw(UnusedException(className, "tval2"));
     tval2.setDenom(d);
 }