Merged CHECK macro branch

1 files changed, 9 insertions, 27 deletions

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)
 {