Merge branch 'feature/notifications' into develop

1 files changed, 9 insertions, 7 deletions

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 44eeb13..ce113c2 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -24,6 +24,8 @@
 #include "storage.h" //for generateUid()
 #include <QFile>
 
+SINK_DEBUG_AREA("applicationdomaintype");
+
 namespace Sink {
 namespace ApplicationDomain {
 
@@ -82,7 +84,7 @@ QVariant ApplicationDomainType::getProperty(const QByteArray &key) const
 {
     Q_ASSERT(mAdaptor);
     if (!mAdaptor->availableProperties().contains(key)) {
-        Warning() << "No such property available " << key;
+        SinkWarning() << "No such property available " << key;
     }
     return mAdaptor->getProperty(key);
 }
@@ -105,7 +107,7 @@ QByteArray ApplicationDomainType::getBlobProperty(const QByteArray &key) const
     const auto path = getProperty(key).toByteArray();
     QFile file(path);
     if (!file.open(QIODevice::ReadOnly)) {
-        ErrorMsg() << "Failed to open the file: " << file.errorString() << path;
+        SinkError() << "Failed to open the file: " << file.errorString() << path;
         return QByteArray();
     }
     return file.readAll();
@@ -116,7 +118,7 @@ void ApplicationDomainType::setBlobProperty(const QByteArray &key, const QByteAr
     const auto path = Sink::temporaryFileLocation() + "/" + QUuid::createUuid().toString();
     QFile file(path);
     if (!file.open(QIODevice::WriteOnly)) {
-        ErrorMsg() << "Failed to open the file: " << file.errorString() << path;
+        SinkError() << "Failed to open the file: " << file.errorString() << path;
         return;
     }
     file.write(value);
@@ -251,7 +253,7 @@ namespace DummyResource {
     SinkResource create(const QByteArray &account)
     {
         auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.dummy");
+        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));
@@ -263,7 +265,7 @@ namespace MaildirResource {
     SinkResource create(const QByteArray &account)
     {
         auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.maildir");
+        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;
@@ -274,7 +276,7 @@ namespace MailtransportResource {
     SinkResource create(const QByteArray &account)
     {
         auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.mailtransport");
+        resource.setProperty("type", "sink.mailtransport");
         resource.setProperty("account", account);
         resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::transport));
         return resource;
@@ -285,7 +287,7 @@ namespace ImapResource {
     SinkResource create(const QByteArray &account)
     {
         auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.imap");
+        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;