From 529db49c496f4f668cec3f7c59d2d0ec78c50c9a Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Tue, 27 Sep 2016 16:13:47 +0200
Subject: Don't hardcode the type property.

---
 common/domain/applicationdomaintype.cpp | 24 ++++++++++++------------
 common/domain/applicationdomaintype.h   |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'common/domain')

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 2f7c32b..5474708 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -254,9 +254,9 @@ Identity::~Identity()
 SinkResource DummyResource::create(const QByteArray &account)
 {
     auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-    resource.setProperty("type", "sink.dummy");
-    resource.setProperty("account", account);
-    resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << "-folder.rename"));
+    resource.setResourceType("sink.dummy");
+    resource.setAccount(account);
+    resource.setCapabilities(QByteArrayList() << ResourceCapabilities::Mail::storage << "-folder.rename");
     // resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << ResourceCapabilities::Mail::drafts << "-folder.rename" << ResourceCapabilities::Mail::trash));
     return resource;
 }
@@ -264,27 +264,27 @@ SinkResource DummyResource::create(const QByteArray &account)
 SinkResource MaildirResource::create(const QByteArray &account)
 {
     auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-    resource.setProperty("type", "sink.maildir");
-    resource.setProperty("account", account);
-    resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << ResourceCapabilities::Mail::drafts << "-folder.rename" << ResourceCapabilities::Mail::trash));
+    resource.setResourceType("sink.maildir");
+    resource.setAccount(account);
+    resource.setCapabilities(QByteArrayList() << ResourceCapabilities::Mail::storage << ResourceCapabilities::Mail::drafts << "-folder.rename" << ResourceCapabilities::Mail::trash);
     return resource;
 }
 
 SinkResource MailtransportResource::create(const QByteArray &account)
 {
     auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-    resource.setProperty("type", "sink.mailtransport");
-    resource.setProperty("account", account);
-    resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::transport));
+    resource.setResourceType("sink.mailtransport");
+    resource.setAccount(account);
+    resource.setCapabilities(QByteArrayList() << ResourceCapabilities::Mail::transport);
     return resource;
 }
 
 SinkResource ImapResource::create(const QByteArray &account)
 {
     auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-    resource.setProperty("type", "sink.imap");
-    resource.setProperty("account", account);
-    resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << ResourceCapabilities::Mail::drafts << ResourceCapabilities::Mail::folderhierarchy << ResourceCapabilities::Mail::trash));
+    resource.setResourceType("sink.imap");
+    resource.setAccount(account);
+    resource.setCapabilities(QByteArrayList() << ResourceCapabilities::Mail::storage << ResourceCapabilities::Mail::drafts << ResourceCapabilities::Mail::folderhierarchy << ResourceCapabilities::Mail::trash);
     return resource;
 }
 
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index c824251..8b96758 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -295,7 +295,7 @@ struct SINK_EXPORT SinkResource : public ApplicationDomainType {
     virtual ~SinkResource();
 
     SINK_REFERENCE_PROPERTY(SinkAccount, Account, account);
-    SINK_PROPERTY(QString, ResourceType, resourceType);
+    SINK_PROPERTY(QByteArray, ResourceType, resourceType);
     SINK_PROPERTY(QByteArrayList, Capabilities, capabilities);
     SINK_STATUS_PROPERTY(int, Status, status);
     SINK_STATUS_PROPERTY(ApplicationDomain::Error, Error, error);
-- 
cgit v1.2.3