Merged CHECK macro branch

1 files changed, 9 insertions, 27 deletions

diff --git a/sigmod/Sound.cpp b/sigmod/Sound.cpp
index ff1f0706..8e6060bf 100644
--- a/sigmod/Sound.cpp
+++ b/sigmod/Sound.cpp
@@ -78,35 +78,17 @@ QDomElement Sigmod::Sound::save() const
     return xml;
 }
 
-void Sigmod::Sound::setName(const QString& name)
-{
-    CHECK(name);
-}
-
-void Sigmod::Sound::setType(const Type type)
-{
-    CHECK(type);
-}
+SETTER(Sound, QString&, Name, name)
+SETTER(Sound, Type, Type, type)
+SETTER(Sound, QByteArray&, Data, data)
 
-void Sigmod::Sound::setData(const QByteArray& data)
-{
-    CHECK(data);
-}
+GETTER(Sound, QString, name)
+GETTER(Sound, Sigmod::Sound::Type, type)
+GETTER(Sound, QByteArray, data)
 
-QString Sigmod::Sound::name() const
-{
-    return m_name;
-}
-
-Sigmod::Sound::Type Sigmod::Sound::type() const
-{
-    return m_type;
-}
-
-QByteArray Sigmod::Sound::data() const
-{
-    return m_data;
-}
+CHECK(Sound, QString&, name)
+CHECK(Sound, Type, type)
+CHECK(Sound, QByteArray&, data)
 
 Sigmod::Sound& Sigmod::Sound::operator=(const Sound& rhs)
 {