From b63b3a1ce9a9b3c2abbf21633c8b6fcf1fa54640 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 17 Mar 2016 20:53:58 +0100
Subject: Better constructors for resources and accounts

---
 common/domain/applicationdomaintype.cpp | 34 +++++++++++++++++++++++++++++++++
 common/domain/applicationdomaintype.h   |  8 ++++++--
 common/resourcefacade.cpp               |  2 +-
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 462585e..0842fbe 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -136,11 +136,45 @@ Folder::~Folder()
 
 }
 
+SinkResource::SinkResource(const QByteArray &identifier)
+    : ApplicationDomainType("", identifier, 0, QSharedPointer<BufferAdaptor>(new MemoryBufferAdaptor()))
+{
+
+}
+
+SinkResource::SinkResource(const QByteArray &, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor)
+    : ApplicationDomainType("", identifier, 0, adaptor)
+{
+}
+
+SinkResource::SinkResource()
+    : ApplicationDomainType()
+{
+
+}
+
 SinkResource::~SinkResource()
 {
 
 }
 
+SinkAccount::SinkAccount(const QByteArray &identifier)
+    : ApplicationDomainType("", identifier, 0, QSharedPointer<BufferAdaptor>(new MemoryBufferAdaptor()))
+{
+
+}
+
+SinkAccount::SinkAccount(const QByteArray &, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor)
+    : ApplicationDomainType("", identifier, 0, adaptor)
+{
+}
+
+SinkAccount::SinkAccount()
+    : ApplicationDomainType()
+{
+
+}
+
 SinkAccount::~SinkAccount()
 {
 
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index d17ad75..7588252 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -141,13 +141,17 @@ struct SINK_EXPORT Folder : public Entity {
  */
 struct SINK_EXPORT SinkResource : public ApplicationDomainType {
     typedef QSharedPointer<SinkResource> Ptr;
-    using ApplicationDomainType::ApplicationDomainType;
+    SinkResource(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor);
+    SinkResource(const QByteArray &identifier);
+    SinkResource();
     virtual ~SinkResource();
 };
 
 struct SINK_EXPORT SinkAccount : public ApplicationDomainType {
     typedef QSharedPointer<SinkAccount> Ptr;
-    using ApplicationDomainType::ApplicationDomainType;
+    SinkAccount(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier, qint64 revision, const QSharedPointer<BufferAdaptor> &adaptor);
+    SinkAccount(const QByteArray &identifier);
+    SinkAccount();
     virtual ~SinkAccount();
 };
 
diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp
index 0cda82c..aa2f84a 100644
--- a/common/resourcefacade.cpp
+++ b/common/resourcefacade.cpp
@@ -110,7 +110,7 @@ QPair<KAsync::Job<void>, typename Sink::ResultEmitter<Sink::ApplicationDomain::S
                 continue;
             }
 
-            auto resource = Sink::ApplicationDomain::SinkResource::Ptr::create("", res, 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
+            auto resource = Sink::ApplicationDomain::SinkResource::Ptr::create(res);
             resource->setProperty("type", type);
 
             const auto configurationValues = ResourceConfig::getConfiguration(res);
-- 
cgit v1.2.3