Merged CHECK macro branch

1 files changed, 6 insertions, 17 deletions

diff --git a/sigmod/GlobalScript.cpp b/sigmod/GlobalScript.cpp
index fc5e7d62..a7d9efcf 100644
--- a/sigmod/GlobalScript.cpp
+++ b/sigmod/GlobalScript.cpp
@@ -75,25 +75,14 @@ QDomElement Sigmod::GlobalScript::save() const
     return xml;
 }
 
-void Sigmod::GlobalScript::setName(const QString& name)
-{
-    CHECK(name);
-}
+SETTER(GlobalScript, QString&, Name, name)
+SETTER(GlobalScript, Sigcore::Script&, Script, script)
 
-void Sigmod::GlobalScript::setScript(const Sigcore::Script& script)
-{
-    CHECK(script);
-}
+GETTER(GlobalScript, QString, name)
+GETTER(GlobalScript, Sigcore::Script, script)
 
-QString Sigmod::GlobalScript::name() const
-{
-    return m_name;
-}
-
-Sigcore::Script Sigmod::GlobalScript::script() const
-{
-    return m_script;
-}
+CHECK(GlobalScript, QString&, name)
+CHECK(GlobalScript, Sigcore::Script&, script)
 
 Sigmod::GlobalScript& Sigmod::GlobalScript::operator=(const GlobalScript& rhs)
 {