Merge branch 'feature/notifications' into develop

3 files changed, 12 insertions, 11 deletions

diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index 1e93bdf..a729d4d 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -44,6 +44,8 @@
 
 #define ENTITY_TYPE_MAIL "mail"
 
+SINK_DEBUG_AREA("mailtransportresource")
+
 using namespace Sink;
 
 //TODO fold into synchronizer
@@ -58,7 +60,7 @@ public:
     KAsync::Job<QByteArray> replay(const ApplicationDomain::Mail &mail, Sink::Operation operation, const QByteArray &oldRemoteId, const QList<QByteArray> &changedProperties) Q_DECL_OVERRIDE
     {
         if (operation == Sink::Operation_Creation) {
-            Trace() << "Dispatching message.";
+            SinkTrace() << "Dispatching message.";
             // return send(mail, mSettings);
         } else if (operation == Sink::Operation_Removal) {
         } else if (operation == Sink::Operation_Modification) {
@@ -86,9 +88,9 @@ public:
         msg->setHead(KMime::CRLFtoLF(data));
         msg->parse();
         if (settings.testMode) {
-            Log() << "I would totally send that mail, but I'm in test mode." << mail.identifier();
+            SinkLog() << "I would totally send that mail, but I'm in test mode." << mail.identifier();
             auto path = resourceStorageLocation(mResourceInstanceIdentifier) + "/test/";
-            Trace() << path;
+            SinkTrace() << path;
             QDir dir;
             dir.mkpath(path);
             QFile f(path+ mail.identifier());
@@ -97,9 +99,9 @@ public:
             f.close();
         } else {
             if (MailTransport::sendMessage(msg, settings.server.toUtf8(), settings.username.toUtf8(), settings.password.toUtf8(), settings.cacert.toUtf8())) {
-                Log() << "Sent message successfully";
+                SinkLog() << "Sent message successfully";
             } else {
-                Log() << "Failed to send message";
+                SinkLog() << "Failed to send message";
                 return KAsync::error<void>(1, "Failed to send the message.");
             }
         }
@@ -108,13 +110,13 @@ public:
 
     KAsync::Job<void> synchronizeWithSource() Q_DECL_OVERRIDE
     {
-        Log() << " Synchronizing";
+        SinkLog() << " Synchronizing";
         return KAsync::start<void>([this](KAsync::Future<void> future) {
             Sink::Query query;
             QList<ApplicationDomain::Mail> toSend;
-            Log() << " Looking for mail";
+            SinkLog() << " Looking for mail";
             store().reader<ApplicationDomain::Mail>().query(query, [&](const ApplicationDomain::Mail &mail) -> bool {
-                Trace() << "Found mail: " << mail.identifier();
+                SinkTrace() << "Found mail: " << mail.identifier();
                 if (!mail.getSent()) {
                     toSend << mail;
                 }
diff --git a/examples/mailtransportresource/mailtransportresource.h b/examples/mailtransportresource/mailtransportresource.h
index 6622ea6..cf6abf2 100644
--- a/examples/mailtransportresource/mailtransportresource.h
+++ b/examples/mailtransportresource/mailtransportresource.h
@@ -23,7 +23,7 @@
 #include "common/genericresource.h"
 
 //TODO: a little ugly to have this in two places, once here and once in Q_PLUGIN_METADATA
-#define PLUGIN_NAME "org.kde.mailtransport"
+#define PLUGIN_NAME "sink.mailtransport"
 
 class MailtransportResource : public Sink::GenericResource
 {
@@ -46,7 +46,7 @@ private:
 class MailtransportResourceFactory : public Sink::ResourceFactory
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.kde.mailtransport")
+    Q_PLUGIN_METADATA(IID "sink.mailtransport")
     Q_INTERFACES(Sink::ResourceFactory)
 
 public:
diff --git a/examples/mailtransportresource/tests/mailtransporttest.cpp b/examples/mailtransportresource/tests/mailtransporttest.cpp
index 3ce5f82..fdd591b 100644
--- a/examples/mailtransportresource/tests/mailtransporttest.cpp
+++ b/examples/mailtransportresource/tests/mailtransporttest.cpp
@@ -33,7 +33,6 @@ private slots:
     void initTestCase()
     {
         Test::initTest();
-        Log::setDebugOutputLevel(Sink::Log::Trace);
         auto resource = createResource();
         QVERIFY(!resource.identifier().isEmpty());
         VERIFYEXEC(Store::create(resource));