Finished up converting classes to use CHECK macros

16 files changed, 121 insertions, 275 deletions

diff --git a/sigmod/Sprite.cpp b/sigmod/Sprite.cpp
index 562a9a30..b4a7983b 100644
--- a/sigmod/Sprite.cpp
+++ b/sigmod/Sprite.cpp
@@ -75,25 +75,14 @@ QDomElement Sigmod::Sprite::save() const
     return xml;
 }
 
-void Sigmod::Sprite::setName(const QString& name)
-{
-    CHECK(name);
-}
+SETTER(Sprite, QString&, Name, name)
+SETTER(Sprite, QByteArray&, Sprite, sprite)
 
-void Sigmod::Sprite::setSprite(const QByteArray& sprite)
-{
-    CHECK(sprite);
-}
+GETTER(Sprite, QString, name)
+GETTER(Sprite, QByteArray, sprite)
 
-QString Sigmod::Sprite::name() const
-{
-    return m_name;
-}
-
-QByteArray Sigmod::Sprite::sprite() const
-{
-    return m_sprite;
-}
+CHECK(Sprite, QString&, name)
+CHECK(Sprite, QByteArray&, sprite)
 
 Sigmod::Sprite& Sigmod::Sprite::operator=(const Sprite& rhs)
 {
diff --git a/sigmod/Sprite.h b/sigmod/Sprite.h
index 13b2fc19..ed3ba248 100644
--- a/sigmod/Sprite.h
+++ b/sigmod/Sprite.h
@@ -51,6 +51,9 @@ class SIGMOD_EXPORT Sprite : public Object
         QString name() const;
         QByteArray sprite() const;
         
+        bool nameCheck(const QString& name) const;
+        bool spriteCheck(const QByteArray& sprite) const;
+        
         Sprite& operator=(const Sprite& rhs);
     private:
         QString m_name;
diff --git a/sigmod/Status.cpp b/sigmod/Status.cpp
index cbe98ba0..fbb66c41 100644
--- a/sigmod/Status.cpp
+++ b/sigmod/Status.cpp
@@ -78,35 +78,17 @@ QDomElement Sigmod::Status::save() const
     return xml;
 }
 
-void Sigmod::Status::setName(const QString& name)
-{
-    CHECK(name);
-}
-
-void Sigmod::Status::setBattleScript(const Sigcore::Script& battleScript)
-{
-    CHECK(battleScript);
-}
+SETTER(Status, QString&, Name, name)
+SETTER(Status, Sigcore::Script&, BattleScript, battleScript)
+SETTER(Status, Sigcore::Script&, WorldScript, worldScript)
 
-void Sigmod::Status::setWorldScript(const Sigcore::Script& worldScript)
-{
-    CHECK(worldScript);
-}
+GETTER(Status, QString, name)
+GETTER(Status, Sigcore::Script, battleScript)
+GETTER(Status, Sigcore::Script, worldScript)
 
-QString Sigmod::Status::name() const
-{
-    return m_name;
-}
-
-Sigcore::Script Sigmod::Status::battleScript() const
-{
-    return m_battleScript;
-}
-
-Sigcore::Script Sigmod::Status::worldScript() const
-{
-    return m_worldScript;
-}
+CHECK(Status, QString&, name)
+CHECK(Status, Sigcore::Script&, battleScript)
+CHECK(Status, Sigcore::Script&, worldScript)
 
 Sigmod::Status& Sigmod::Status::operator=(const Status& rhs)
 {
diff --git a/sigmod/Status.h b/sigmod/Status.h
index fcfaf8f4..7f22ee74 100644
--- a/sigmod/Status.h
+++ b/sigmod/Status.h
@@ -53,6 +53,10 @@ class SIGMOD_EXPORT Status : public Object
         Sigcore::Script battleScript() const;
         Sigcore::Script worldScript() const;
         
+        bool nameCheck(const QString& name) const;
+        bool battleScriptCheck(const Sigcore::Script& battleScript) const;
+        bool worldScriptCheck(const Sigcore::Script& worldScript) const;
+        
         Status& operator=(const Status& rhs);
     private:
         QString m_name;
diff --git a/sigmod/Store.cpp b/sigmod/Store.cpp
index f5778dd4..3bd260cf 100644
--- a/sigmod/Store.cpp
+++ b/sigmod/Store.cpp
@@ -53,7 +53,7 @@ void Sigmod::Store::validate()
     if (m_name.isEmpty())
         emit(error("Name is empty"));
     if (m_item.size())
-        TEST_LIST(setItem, item);
+        TEST_LIST(item);
     else
         emit(error("No items in the store"));
     TEST_END();
@@ -72,41 +72,14 @@ QDomElement Sigmod::Store::save() const
     return xml;
 }
 
-void Sigmod::Store::setName(const QString& name)
-{
-    CHECK(name);
-}
-
-void Sigmod::Store::setItem(const int item, const bool state)
-{
-    if (!sigmod()->itemById(item))
-        emit(error(bounds("item", item)));
-    else if (state && !m_item.contains(item))
-    {
-        m_item.append(item);
-        emit(changed());
-    }
-    else if (m_item.contains(item))
-    {
-        m_item.removeAll(item);
-        emit(changed());
-    }
-}
-
-QString Sigmod::Store::name() const
-{
-    return m_name;
-}
+SETTER(Store, QString&, Name, name)
+SETTER_LIST(Store, Item, item)
 
-bool Sigmod::Store::item(const int item) const
-{
-    return m_item.contains(item);
-}
+GETTER(Store, QString, name)
+GETTER_LIST(Store, item)
 
-QList<int> Sigmod::Store::items() const
-{
-    return m_item;
-}
+CHECK(Store, QString&, name)
+CHECK_INDEX(Store, int, item, sigmod(), item)
 
 Sigmod::Store& Sigmod::Store::operator=(const Store& rhs)
 {
diff --git a/sigmod/Store.h b/sigmod/Store.h
index 5b399fcb..1ea8640a 100644
--- a/sigmod/Store.h
+++ b/sigmod/Store.h
@@ -49,7 +49,10 @@ class SIGMOD_EXPORT Store : public Object
         
         QString name() const;
         bool item(const int item) const;
-        QList<int> items() const;
+        QList<int> item() const;
+        
+        bool nameCheck(const QString& name) const;
+        bool itemCheck(const int item) const;
         
         Store& operator=(const Store& rhs);
     private:
diff --git a/sigmod/Tile.cpp b/sigmod/Tile.cpp
index d4468056..3af65653 100644
--- a/sigmod/Tile.cpp
+++ b/sigmod/Tile.cpp
@@ -74,35 +74,17 @@ QDomElement Sigmod::Tile::save() const
     return xml;
 }
 
-void Sigmod::Tile::setName(const QString& name)
-{
-    CHECK(name);
-}
-
-void Sigmod::Tile::setWalkable(const bool walkable)
-{
-    CHECK(walkable);
-}
+SETTER(Tile, QString&, Name, name)
+SETTER(Tile, bool, Walkable, walkable)
+SETTER(Tile, Sigcore::Script&, Script, script)
 
-void Sigmod::Tile::setScript(const Sigcore::Script& script)
-{
-    CHECK(script);
-}
+GETTER(Tile, QString, name)
+GETTER(Tile, bool, walkable)
+GETTER(Tile, Sigcore::Script, script)
 
-QString Sigmod::Tile::name() const
-{
-    return m_name;
-}
-
-bool Sigmod::Tile::walkable() const
-{
-    return m_walkable;
-}
-
-Sigcore::Script Sigmod::Tile::script() const
-{
-    return m_script;
-}
+CHECK(Tile, QString&, name)
+CHECK(Tile, bool, walkable)
+CHECK(Tile, Sigcore::Script&, script)
 
 Sigmod::Tile& Sigmod::Tile::operator=(const Tile& rhs)
 {
diff --git a/sigmod/Tile.h b/sigmod/Tile.h
index 7904948b..c2cde094 100644
--- a/sigmod/Tile.h
+++ b/sigmod/Tile.h
@@ -52,6 +52,10 @@ class SIGMOD_EXPORT Tile : public Object
         bool walkable() const;
         Sigcore::Script script() const;
         
+        bool nameCheck(const QString& name) const;
+        bool walkableCheck(const bool walkable) const;
+        bool scriptCheck(const Sigcore::Script& script) const;
+        
         Tile& operator=(const Tile& rhs);
     private:
         QString m_name;
diff --git a/sigmod/Time.cpp b/sigmod/Time.cpp
index b4172405..f0f34486 100644
--- a/sigmod/Time.cpp
+++ b/sigmod/Time.cpp
@@ -54,8 +54,8 @@ void Sigmod::Time::validate()
     TEST_BEGIN();
     if (m_name.isEmpty())
         emit(error("Name is empty"));
-    TEST(setHour, hour);
-    TEST(setMinute, minute);
+    TEST(hour);
+    TEST(minute);
     TEST_END();
 }
 
@@ -76,41 +76,17 @@ QDomElement Sigmod::Time::save() const
     return xml;
 }
 
-void Sigmod::Time::setName(const QString& name)
-{
-    CHECK(name);
-}
-
-void Sigmod::Time::setHour(const int hour)
-{
-    if ((hour < 0) || (24 <= hour))
-        emit(error(bounds("hour", 0, 23, hour)));
-    else
-        CHECK(hour);
-}
+SETTER(Time, QString&, Name, name)
+SETTER(Time, int, Hour, hour)
+SETTER(Time, int, Minute, minute)
 
-void Sigmod::Time::setMinute(const int minute)
-{
-    if ((minute < 0) || (60 <= minute))
-        emit(error(bounds("minute", 0, 59, minute)));
-    else
-        CHECK(minute);
-}
+GETTER(Time, QString, name)
+GETTER(Time, int, hour)
+GETTER(Time, int, minute)
 
-QString Sigmod::Time::name() const
-{
-    return m_name;
-}
-
-int Sigmod::Time::hour() const
-{
-    return m_hour;
-}
-
-int Sigmod::Time::minute() const
-{
-    return m_minute;
-}
+CHECK(Time, QString&, name)
+CHECK_BOUNDS(Time, int, hour, 0, 23)
+CHECK_BOUNDS(Time, int, minute, 0, 59)
 
 Sigmod::Time& Sigmod::Time::operator=(const Time& rhs)
 {
diff --git a/sigmod/Time.h b/sigmod/Time.h
index db361397..6027f128 100644
--- a/sigmod/Time.h
+++ b/sigmod/Time.h
@@ -49,6 +49,10 @@ class SIGMOD_EXPORT Time : public Object
         int hour() const;
         int minute() const;
         
+        bool nameCheck(const QString& name) const;
+        bool hourCheck(const int hour) const;
+        bool minuteCheck(const int minutes) const;
+        
         Time& operator=(const Time& rhs);
     private:
         QString m_name;
diff --git a/sigmod/Trainer.cpp b/sigmod/Trainer.cpp
index 702c6f5e..d7a08618 100644
--- a/sigmod/Trainer.cpp
+++ b/sigmod/Trainer.cpp
@@ -62,8 +62,9 @@ void Sigmod::Trainer::validate()
     TEST_BEGIN();
     if (m_name.isEmpty())
         emit(error("Name is empty"));
-    TEST(setMoneyFactor, moneyFactor);
-    TEST(setSkin, skin);
+    TEST(moneyFactor);
+    TEST(skin);
+    TEST(depth);
     TEST_END();
 }
 
@@ -96,101 +97,35 @@ QDomElement Sigmod::Trainer::save() const
     return xml;
 }
 
-void Sigmod::Trainer::setName(const QString& name)
-{
-    CHECK(name);
-}
-
-void Sigmod::Trainer::setMoneyFactor(const int moneyFactor)
-{
-    if (moneyFactor < 0)
-        emit(error(bounds("moneyFactor", 0, INT_MAX, moneyFactor)));
-    else
-        CHECK(moneyFactor);
-}
-
-void Sigmod::Trainer::setSkin(const int skin)
-{
-    if (!sigmod()->skinById(skin))
-        emit(error(bounds("skin", skin)));
-    else
-        CHECK(skin);
-}
-
-void Sigmod::Trainer::setDepth(const int depth)
-{
-    CHECK(depth);
-}
-
-void Sigmod::Trainer::setTeamIntel(const Intelligence teamIntel)
-{
-    CHECK(teamIntel);
-}
-
-void Sigmod::Trainer::setMoveIntel(const Intelligence moveIntel)
-{
-    CHECK(moveIntel);
-}
-
-void Sigmod::Trainer::setItemIntel(const Intelligence itemIntel)
-{
-    CHECK(itemIntel);
-}
-
-void Sigmod::Trainer::setAbilityIntel(const Intelligence abilityIntel)
-{
-    CHECK(abilityIntel);
-}
-
-void Sigmod::Trainer::setStatIntel(const Intelligence statIntel)
-{
-    CHECK(statIntel);
-}
-
-QString Sigmod::Trainer::name() const
-{
-    return m_name;
-}
-
-int Sigmod::Trainer::moneyFactor() const
-{
-    return m_moneyFactor;
-}
-
-int Sigmod::Trainer::skin() const
-{
-    return m_skin;
-}
-
-int Sigmod::Trainer::depth() const
-{
-    return m_depth;
-}
-
-Sigmod::Trainer::Intelligence Sigmod::Trainer::teamIntel() const
-{
-    return m_teamIntel;
-}
-
-Sigmod::Trainer::Intelligence Sigmod::Trainer::moveIntel() const
-{
-    return m_moveIntel;
-}
-
-Sigmod::Trainer::Intelligence Sigmod::Trainer::itemIntel() const
-{
-    return m_itemIntel;
-}
-
-Sigmod::Trainer::Intelligence Sigmod::Trainer::abilityIntel() const
-{
-    return m_abilityIntel;
-}
-
-Sigmod::Trainer::Intelligence Sigmod::Trainer::statIntel() const
-{
-    return m_statIntel;
-}
+SETTER(Trainer, QString&, Name, name)
+SETTER(Trainer, int, MoneyFactor, moneyFactor)
+SETTER(Trainer, int, Skin, skin)
+SETTER(Trainer, int, Depth, depth)
+SETTER(Trainer, Intelligence, TeamIntel, teamIntel)
+SETTER(Trainer, Intelligence, MoveIntel, moveIntel)
+SETTER(Trainer, Intelligence, ItemIntel, itemIntel)
+SETTER(Trainer, Intelligence, AbilityIntel, abilityIntel)
+SETTER(Trainer, Intelligence, StatIntel, statIntel)
+
+GETTER(Trainer, QString, name)
+GETTER(Trainer, int, moneyFactor)
+GETTER(Trainer, int, skin)
+GETTER(Trainer, int, depth)
+GETTER(Trainer, Sigmod::Trainer::Intelligence, teamIntel)
+GETTER(Trainer, Sigmod::Trainer::Intelligence, moveIntel)
+GETTER(Trainer, Sigmod::Trainer::Intelligence, itemIntel)
+GETTER(Trainer, Sigmod::Trainer::Intelligence, abilityIntel)
+GETTER(Trainer, Sigmod::Trainer::Intelligence, statIntel)
+
+CHECK(Trainer, QString&, name)
+CHECK_BOUNDS(Trainer, int, moneyFactor, 0, INT_MAX)
+CHECK_INDEX(Trainer, int, skin, sigmod(), skin)
+CHECK_BOUNDS(Trainer, int, depth, 0, INT_MAX)
+CHECK(Trainer, Intelligence, teamIntel)
+CHECK(Trainer, Intelligence, moveIntel)
+CHECK(Trainer, Intelligence, itemIntel)
+CHECK(Trainer, Intelligence, abilityIntel)
+CHECK(Trainer, Intelligence, statIntel)
 
 Sigmod::Trainer& Sigmod::Trainer::operator=(const Trainer& rhs)
 {
diff --git a/sigmod/Trainer.h b/sigmod/Trainer.h
index ab2c8a96..17c4d29a 100644
--- a/sigmod/Trainer.h
+++ b/sigmod/Trainer.h
@@ -74,6 +74,16 @@ class SIGMOD_EXPORT Trainer : public Object
         Intelligence abilityIntel() const;
         Intelligence statIntel() const;
         
+        bool nameCheck(const QString& name) const;
+        bool moneyFactorCheck(const int moneyFactor) const;
+        bool skinCheck(const int skin) const;
+        bool depthCheck(const int depth) const;
+        bool teamIntelCheck(const Intelligence teamIntel) const;
+        bool moveIntelCheck(const Intelligence moveIntel) const;
+        bool itemIntelCheck(const Intelligence itemIntel) const;
+        bool abilityIntelCheck(const Intelligence abilityIntel) const;
+        bool statIntelCheck(const Intelligence statIntel) const;
+        
         Trainer& operator=(const Trainer& rhs);
     private:
         QString m_name;
diff --git a/sigmod/Type.cpp b/sigmod/Type.cpp
index 6205b965..180d4585 100644
--- a/sigmod/Type.cpp
+++ b/sigmod/Type.cpp
@@ -71,28 +71,14 @@ QDomElement Sigmod::Type::save() const
     return xml;
 }
 
-void Sigmod::Type::setName(const QString& name)
-{
-    CHECK(name);
-}
+SETTER(Type, QString&, Name, name)
+SETTER(Type, Sigcore::Fraction&, Stab, stab)
 
-void Sigmod::Type::setStab(const Sigcore::Fraction& stab)
-{
-    if (stab < 1)
-        emit(error(bounds("stab", 1, INT_MAX, stab)));
-    else
-        CHECK(stab);
-}
+GETTER(Type, QString, name)
+GETTER(Type, Sigcore::Fraction, stab)
 
-QString Sigmod::Type::name() const
-{
-    return m_name;
-}
-
-Sigcore::Fraction Sigmod::Type::stab() const
-{
-    return m_stab;
-}
+CHECK(Type, QString&, name)
+CHECK_BOUNDS(Type, Sigcore::Fraction&, stab, 0, 1)
 
 Sigmod::Type& Sigmod::Type::operator=(const Type& rhs)
 {
diff --git a/sigmod/Type.h b/sigmod/Type.h
index b0b1f13f..50cc4fbc 100644
--- a/sigmod/Type.h
+++ b/sigmod/Type.h
@@ -50,6 +50,9 @@ class SIGMOD_EXPORT Type : public Object
         QString name() const;
         Sigcore::Fraction stab() const;
         
+        bool nameCheck(const QString& name) const;
+        bool stabCheck(const Sigcore::Fraction& stab) const;
+        
         Type& operator=(const Type& rhs);
     private:
         QString m_name;
diff --git a/sigmod/Weather.cpp b/sigmod/Weather.cpp
index 532643a4..2458d836 100644
--- a/sigmod/Weather.cpp
+++ b/sigmod/Weather.cpp
@@ -78,25 +78,14 @@ QDomElement Sigmod::Weather::save() const
     return xml;
 }
 
-void Sigmod::Weather::setName(const QString& name)
-{
-    CHECK(name);
-}
+SETTER(Weather, QString&, Name, name)
+SETTER(Weather, Sigcore::Script&, Script, script)
 
-void Sigmod::Weather::setScript(const Sigcore::Script& script)
-{
-    CHECK(script);
-}
+GETTER(Weather, QString, name)
+GETTER(Weather, Sigcore::Script, script)
 
-QString Sigmod::Weather::name() const
-{
-    return m_name;
-}
-
-Sigcore::Script Sigmod::Weather::script() const
-{
-    return m_script;
-}
+CHECK(Weather, QString&, name)
+CHECK(Weather, Sigcore::Script&, script)
 
 Sigmod::Weather& Sigmod::Weather::operator=(const Weather& rhs)
 {
diff --git a/sigmod/Weather.h b/sigmod/Weather.h
index 897d772b..ff038740 100644
--- a/sigmod/Weather.h
+++ b/sigmod/Weather.h
@@ -51,6 +51,9 @@ class SIGMOD_EXPORT Weather : public Object
         QString name() const;
         Sigcore::Script script() const;
         
+        bool nameCheck(const QString& name) const;
+        bool scriptCheck(const Sigcore::Script& script) const;
+        
         Weather& operator=(const Weather& rhs);
     private:
         QString m_name;