Merged CHECK macro branch

1 files changed, 6 insertions, 17 deletions

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