3 files changed, 61 insertions, 46 deletions

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 3cc075b..78a667e 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -18,10 +18,56 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "applicationdomaintype.h"
+#include "../bufferadaptor.h"
 
 namespace Akonadi2 {
 namespace ApplicationDomain {
 
+ApplicationDomainType::ApplicationDomainType()
+    :mAdaptor(new MemoryBufferAdaptor())
+{
+
+}
+
+ApplicationDomainType::ApplicationDomainType(const QByteArray &resourceInstanceIdentifier)
+    :mAdaptor(new MemoryBufferAdaptor()),
+    mResourceInstanceIdentifier(resourceInstanceIdentifier)
+{
+
+}
+
+ApplicationDomainType::ApplicationDomainType(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor)
+    : mAdaptor(adaptor),
+    mResourceInstanceIdentifier(resourceInstanceIdentifier),
+    mIdentifier(identifier),
+    mRevision(revision)
+{
+}
+
+ApplicationDomainType::ApplicationDomainType(const ApplicationDomainType &other)
+{
+    *this = other;
+}
+
+ApplicationDomainType& ApplicationDomainType::operator=(const ApplicationDomainType &other)
+{
+    mAdaptor = other.mAdaptor;
+    mChangeSet = other.mChangeSet;
+    mResourceInstanceIdentifier = other.mResourceInstanceIdentifier;
+    mIdentifier = other.mIdentifier;
+    mRevision = other.mRevision;
+    return *this;
+}
+
+ApplicationDomainType::~ApplicationDomainType() {}
+
+QVariant ApplicationDomainType::getProperty(const QByteArray &key) const { return mAdaptor->getProperty(key); }
+void ApplicationDomainType::setProperty(const QByteArray &key, const QVariant &value){ mChangeSet.insert(key, value); mAdaptor->setProperty(key, value); }
+QByteArrayList ApplicationDomainType::changedProperties() const { return mChangeSet.keys(); }
+qint64 ApplicationDomainType::revision() const { return mRevision; }
+QByteArray ApplicationDomainType::resourceInstanceIdentifier() const { return mResourceInstanceIdentifier; }
+QByteArray ApplicationDomainType::identifier() const { return mIdentifier; }
+
 template<>
 QByteArray getTypeName<Event>()
 {
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index bd7ff65..137eb65 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -22,7 +22,7 @@
 #include <QSharedPointer>
 #include <QVariant>
 #include <QByteArray>
-#include "../bufferadaptor.h"
+#include "bufferadaptor.h"
 
 namespace Akonadi2 {
 
@@ -39,41 +39,11 @@ class ApplicationDomainType {
 public:
     typedef QSharedPointer<ApplicationDomainType> Ptr;
 
-    ApplicationDomainType()
-        :mAdaptor(new MemoryBufferAdaptor())
-    {
-
-    }
-
-    ApplicationDomainType(const QByteArray &resourceInstanceIdentifier)
-        :mAdaptor(new MemoryBufferAdaptor()),
-        mResourceInstanceIdentifier(resourceInstanceIdentifier)
-    {
-
-    }
-
-    ApplicationDomainType(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor)
-        : mAdaptor(adaptor),
-        mResourceInstanceIdentifier(resourceInstanceIdentifier),
-        mIdentifier(identifier),
-        mRevision(revision)
-    {
-    }
-
-    ApplicationDomainType(const ApplicationDomainType &other)
-    {
-        *this = other;
-    }
-
-    ApplicationDomainType& operator=(const ApplicationDomainType &other)
-    {
-        mAdaptor = other.mAdaptor;
-        mChangeSet = other.mChangeSet;
-        mResourceInstanceIdentifier = other.mResourceInstanceIdentifier;
-        mIdentifier = other.mIdentifier;
-        mRevision = other.mRevision;
-        return *this;
-    }
+    ApplicationDomainType();
+    ApplicationDomainType(const QByteArray &resourceInstanceIdentifier);
+    ApplicationDomainType(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor);
+    ApplicationDomainType(const ApplicationDomainType &other);
+    ApplicationDomainType& operator=(const ApplicationDomainType &other);
 
     template <typename DomainType>
     static typename DomainType::Ptr getInMemoryRepresentation(const ApplicationDomainType &domainType)
@@ -84,14 +54,14 @@ public:
         return QSharedPointer<DomainType>::create(domainType.mResourceInstanceIdentifier, QByteArray(domainType.mIdentifier.constData(), domainType.mIdentifier.size()), domainType.mRevision, memoryAdaptor);
     }
 
-    virtual ~ApplicationDomainType() {}
+    virtual ~ApplicationDomainType();
 
-    virtual QVariant getProperty(const QByteArray &key) const { return mAdaptor->getProperty(key); }
-    virtual void setProperty(const QByteArray &key, const QVariant &value){ mChangeSet.insert(key, value); mAdaptor->setProperty(key, value); }
-    virtual QByteArrayList changedProperties() const { return mChangeSet.keys(); }
-    qint64 revision() const { return mRevision; }
-    QByteArray resourceInstanceIdentifier() const { return mResourceInstanceIdentifier; }
-    QByteArray identifier() const { return mIdentifier; }
+    virtual QVariant getProperty(const QByteArray &key) const;
+    virtual void setProperty(const QByteArray &key, const QVariant &value);
+    virtual QByteArrayList changedProperties() const;
+    qint64 revision() const;
+    QByteArray resourceInstanceIdentifier() const;
+    QByteArray identifier() const;
 
 private:
     QSharedPointer<BufferAdaptor> mAdaptor;
@@ -186,3 +156,5 @@ class TypeImplementation;
 
 Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::ApplicationDomainType)
 Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr)
+Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Event)
+Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Event::Ptr)
diff --git a/common/domain/event.h b/common/domain/event.h
index 17a0ad4..f21cd34 100644
--- a/common/domain/event.h
+++ b/common/domain/event.h
@@ -63,6 +63,3 @@ public:
 
 }
 }
-
-Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Event)
-Q_DECLARE_METATYPE(Akonadi2::ApplicationDomain::Event::Ptr)