Merged CHECK macro branch

1 files changed, 11 insertions, 35 deletions

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