Merged CHECK macro branch

1 files changed, 20 insertions, 59 deletions

diff --git a/sigmod/Ability.cpp b/sigmod/Ability.cpp
index 5b4108c0..6a0bbf55 100644
--- a/sigmod/Ability.cpp
+++ b/sigmod/Ability.cpp
@@ -87,65 +87,26 @@ QDomElement Sigmod::Ability::save() const
     return xml;
 }
 
-void Sigmod::Ability::setName(const QString& name)
-{
-    CHECK(name);
-}
-
-void Sigmod::Ability::setPriority(const int priority)
-{
-    CHECK(priority);
-}
-
-void Sigmod::Ability::setDescription(const QString& description)
-{
-    CHECK(description);
-}
-
-void Sigmod::Ability::setBattleScript(const Sigcore::Script& battleScript)
-{
-    CHECK(battleScript);
-}
-
-void Sigmod::Ability::setWorldScript(const Sigcore::Script& worldScript)
-{
-    CHECK(worldScript);
-}
-
-void Sigmod::Ability::setPriorityScript(const Sigcore::Script& priorityScript)
-{
-    CHECK(priorityScript);
-}
-
-QString Sigmod::Ability::name() const
-{
-    return m_name;
-}
-
-int Sigmod::Ability::priority() const
-{
-    return m_priority;
-}
-
-QString Sigmod::Ability::description() const
-{
-    return m_description;
-}
-
-Sigcore::Script Sigmod::Ability::battleScript() const
-{
-    return m_battleScript;
-}
-
-Sigcore::Script Sigmod::Ability::worldScript() const
-{
-    return m_worldScript;
-}
-
-Sigcore::Script Sigmod::Ability::priorityScript() const
-{
-    return m_priorityScript;
-}
+SETTER(Ability, QString&, Name, name)
+SETTER(Ability, int, Priority, priority)
+SETTER(Ability, QString&, Description, description)
+SETTER(Ability, Sigcore::Script&, BattleScript, battleScript)
+SETTER(Ability, Sigcore::Script&, WorldScript, worldScript)
+SETTER(Ability, Sigcore::Script&, PriorityScript, priorityScript)
+
+GETTER(Ability, QString, name)
+GETTER(Ability, int, priority)
+GETTER(Ability, QString, description)
+GETTER(Ability, Sigcore::Script, battleScript)
+GETTER(Ability, Sigcore::Script, worldScript)
+GETTER(Ability, Sigcore::Script, priorityScript)
+
+CHECK(Ability, QString&, name)
+CHECK(Ability, int, priority)
+CHECK(Ability, QString&, description)
+CHECK(Ability, Sigcore::Script&, battleScript)
+CHECK(Ability, Sigcore::Script&, worldScript)
+CHECK(Ability, Sigcore::Script&, priorityScript)
 
 Sigmod::Ability& Sigmod::Ability::operator=(const Ability& rhs)
 {