From 64bba04624b08ace6028d8f3408335a9c2bae10e Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 18 Jul 2016 10:37:31 +0200
Subject: Namespaces can't be used in templates.

---
 common/domain/applicationdomaintype.cpp | 66 +++++++++++++++------------------
 common/domain/applicationdomaintype.h   | 19 ++++++----
 2 files changed, 40 insertions(+), 45 deletions(-)

(limited to 'common')

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 4d63cc8..e6117aa 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -249,49 +249,41 @@ Identity::~Identity()
 
 }
 
-namespace DummyResource {
-    SinkResource 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.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << ResourceCapabilities::Mail::drafts << "-folder.rename" << ResourceCapabilities::Mail::trash));
-        return resource;
-    }
+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.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << ResourceCapabilities::Mail::drafts << "-folder.rename" << ResourceCapabilities::Mail::trash));
+    return resource;
 }
 
-namespace MaildirResource {
-    SinkResource 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));
-        return resource;
-    }
+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));
+    return resource;
 }
 
-namespace MailtransportResource {
-    SinkResource 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));
-        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));
+    return resource;
 }
 
-namespace ImapResource {
-    SinkResource 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));
-        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));
+    return resource;
 }
 
 template<>
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index 0742cfc..67f33c8 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -301,17 +301,20 @@ struct SINK_EXPORT Identity : public ApplicationDomainType {
     virtual ~Identity();
 };
 
-namespace DummyResource {
-    SinkResource SINK_EXPORT create(const QByteArray &account);
+struct SINK_EXPORT DummyResource {
+    static SinkResource create(const QByteArray &account);
 };
-namespace MaildirResource {
-    SinkResource SINK_EXPORT create(const QByteArray &account);
+
+struct SINK_EXPORT MaildirResource {
+    static SinkResource create(const QByteArray &account);
 };
-namespace MailtransportResource {
-    SinkResource SINK_EXPORT create(const QByteArray &account);
+
+struct SINK_EXPORT MailtransportResource {
+    static SinkResource create(const QByteArray &account);
 };
-namespace ImapResource {
-    SinkResource SINK_EXPORT create(const QByteArray &account);
+
+struct SINK_EXPORT ImapResource {
+    static SinkResource create(const QByteArray &account);
 };
 
 namespace ResourceCapabilities {
-- 
cgit v1.2.3