33 files changed, 0 insertions, 64 deletions

diff --git a/common/configstore.cpp b/common/configstore.cpp
index 1ae9da8..6751907 100644
--- a/common/configstore.cpp
+++ b/common/configstore.cpp
@@ -24,8 +24,6 @@
 #include <log.h>
 #include <definitions.h>
 
-SINK_DEBUG_AREA("configstore")
-
 static QSharedPointer<QSettings> getConfig(const QByteArray &identifier)
 {
     return QSharedPointer<QSettings>::create(Sink::configLocation() + "/" + identifier + ".ini", QSettings::IniFormat);
diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 67d463f..7ce80ee 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -25,8 +25,6 @@
 #include "storage.h" //for generateUid()
 #include <QFile>
 
-SINK_DEBUG_AREA("applicationdomaintype");
-
 QDebug Sink::ApplicationDomain::operator<< (QDebug d, const Sink::ApplicationDomain::Mail::Contact &c)
 {
     d << "Contact(" << c.name << ", " << c.emailAddress << ")";
diff --git a/common/domainadaptor.h b/common/domainadaptor.h
index c38b713..f981a1f 100644
--- a/common/domainadaptor.h
+++ b/common/domainadaptor.h
@@ -120,7 +120,6 @@ private:
  */
 class DatastoreBufferAdaptor : public Sink::ApplicationDomain::BufferAdaptor
 {
-    SINK_DEBUG_AREA("bufferadaptor")
 public:
     DatastoreBufferAdaptor() : BufferAdaptor()
     {
diff --git a/common/facade.h b/common/facade.h
index 45c718b..0ec2e59 100644
--- a/common/facade.h
+++ b/common/facade.h
@@ -48,7 +48,6 @@ template <typename DomainType>
 class SINK_EXPORT GenericFacade : public Sink::StoreFacade<DomainType>
 {
 protected:
-    SINK_DEBUG_AREA("facade")
     SINK_DEBUG_COMPONENT(mResourceContext.resourceInstanceIdentifier)
 public:
     /**
diff --git a/common/genericresource.h b/common/genericresource.h
index 558145c..bffc697 100644
--- a/common/genericresource.h
+++ b/common/genericresource.h
@@ -35,8 +35,6 @@ class CommandProcessor;
  */
 class SINK_EXPORT GenericResource : public Resource
 {
-protected:
-    SINK_DEBUG_AREA("resource")
 public:
     GenericResource(const Sink::ResourceContext &context, const QSharedPointer<Pipeline> &pipeline = QSharedPointer<Pipeline>());
     virtual ~GenericResource();
diff --git a/common/listener.h b/common/listener.h
index 8d8b529..f29130d 100644
--- a/common/listener.h
+++ b/common/listener.h
@@ -55,8 +55,6 @@ public:
 class SINK_EXPORT Listener : public QObject
 {
     Q_OBJECT
-    SINK_DEBUG_AREA("communication")
-
 public:
     Listener(const QByteArray &resourceName, const QByteArray &resourceType, QObject *parent = 0);
     ~Listener();
diff --git a/common/mail/threadindexer.cpp b/common/mail/threadindexer.cpp
index af96b94..473f28e 100644
--- a/common/mail/threadindexer.cpp
+++ b/common/mail/threadindexer.cpp
@@ -21,8 +21,6 @@
 #include "typeindex.h"
 #include "log.h"
 
-SINK_DEBUG_AREA("threadindex")
-
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
 
diff --git a/common/mailpreprocessor.cpp b/common/mailpreprocessor.cpp
index dff3b3d..5c54fbc 100644
--- a/common/mailpreprocessor.cpp
+++ b/common/mailpreprocessor.cpp
@@ -29,8 +29,6 @@
 
 using namespace Sink;
 
-SINK_DEBUG_AREA("mailpreprocessor")
-
 QString MailPropertyExtractor::getFilePathFromMimeMessagePath(const QString &s) const
 {
     return s;
diff --git a/common/messagequeue.cpp b/common/messagequeue.cpp
index 6e79d89..362ddfd 100644
--- a/common/messagequeue.cpp
+++ b/common/messagequeue.cpp
@@ -3,8 +3,6 @@
 #include <QDebug>
 #include <log.h>
 
-SINK_DEBUG_AREA("messagequeue")
-
 MessageQueue::MessageQueue(const QString &storageRoot, const QString &name) : mStorage(storageRoot, name, Sink::Storage::DataStore::ReadWrite)
 {
 }
diff --git a/common/queryrunner.h b/common/queryrunner.h
index 5308eac..11a302f 100644
--- a/common/queryrunner.h
+++ b/common/queryrunner.h
@@ -32,8 +32,6 @@
 class QueryRunnerBase : public QObject
 {
     Q_OBJECT
-protected:
-    SINK_DEBUG_AREA("queryrunner")
 public:
     typedef std::function<void(Sink::ApplicationDomain::ApplicationDomainType &domainObject)> ResultTransformation;
 
diff --git a/common/resourceaccess.h b/common/resourceaccess.h
index c32566b..b6a0b34 100644
--- a/common/resourceaccess.h
+++ b/common/resourceaccess.h
@@ -101,7 +101,6 @@ protected:
 class SINK_EXPORT ResourceAccess : public ResourceAccessInterface
 {
     Q_OBJECT
-    SINK_DEBUG_AREA("communication")
 public:
     typedef QSharedPointer<ResourceAccess> Ptr;
 
@@ -158,7 +157,6 @@ private:
  */
 class SINK_EXPORT ResourceAccessFactory
 {
-    SINK_DEBUG_AREA("ResourceAccessFactory")
 public:
     static ResourceAccessFactory &instance();
     Sink::ResourceAccess::Ptr getAccess(const QByteArray &instanceIdentifier, const QByteArray resourceType);
diff --git a/common/resourcecontrol.cpp b/common/resourcecontrol.cpp
index 70a3f7d..b6a4c0b 100644
--- a/common/resourcecontrol.cpp
+++ b/common/resourcecontrol.cpp
@@ -30,8 +30,6 @@
 #include "log.h"
 #include "notifier.h"
 
-SINK_DEBUG_AREA("resourcecontrol")
-
 namespace Sink {
 
 KAsync::Job<void> ResourceControl::shutdown(const QByteArray &identifier)
diff --git a/common/resourcefacade.cpp b/common/resourcefacade.cpp
index 0cf9df2..e6f98a9 100644
--- a/common/resourcefacade.cpp
+++ b/common/resourcefacade.cpp
@@ -27,8 +27,6 @@
 
 using namespace Sink;
 
-SINK_DEBUG_AREA("ResourceFacade")
-
 template<typename DomainType>
 ConfigNotifier LocalStorageFacade<DomainType>::sConfigNotifier;
 
diff --git a/common/specialpurposepreprocessor.cpp b/common/specialpurposepreprocessor.cpp
index 25a6d1a..54f7f46 100644
--- a/common/specialpurposepreprocessor.cpp
+++ b/common/specialpurposepreprocessor.cpp
@@ -5,8 +5,6 @@
 
 using namespace Sink;
 
-SINK_DEBUG_AREA("SpecialPurposeProcessor")
-
 static QHash<QByteArray, QString> specialPurposeFolders()
 {
     QHash<QByteArray, QString> hash;
diff --git a/common/storage_common.cpp b/common/storage_common.cpp
index dfcfc2a..1426cd5 100644
--- a/common/storage_common.cpp
+++ b/common/storage_common.cpp
@@ -24,8 +24,6 @@
 #include "log.h"
 #include <QUuid>
 
-SINK_DEBUG_AREA("storage")
-
 QDebug& operator<<(QDebug &dbg, const Sink::Storage::DataStore::Error &error)
 {
     dbg << error.message << "Code: " << error.code << "Db: " << error.store;
diff --git a/common/store.cpp b/common/store.cpp
index 0eefe69..4735113 100644
--- a/common/store.cpp
+++ b/common/store.cpp
@@ -36,8 +36,6 @@
 #include "storage.h"
 #include "log.h"
 
-SINK_DEBUG_AREA("store")
-
 Q_DECLARE_METATYPE(QSharedPointer<Sink::ResultEmitter<Sink::ApplicationDomain::SinkResource::Ptr>>)
 Q_DECLARE_METATYPE(QSharedPointer<Sink::ResourceAccessInterface>);
 Q_DECLARE_METATYPE(std::shared_ptr<void>);
diff --git a/common/synchronizerstore.cpp b/common/synchronizerstore.cpp
index 5364094..79cd920 100644
--- a/common/synchronizerstore.cpp
+++ b/common/synchronizerstore.cpp
@@ -25,8 +25,6 @@
 
 using namespace Sink;
 
-SINK_DEBUG_AREA("synchronizerstore")
-
 SynchronizerStore::SynchronizerStore(Sink::Storage::DataStore::Transaction &transaction)
     : mTransaction(transaction)
 {
diff --git a/common/test.cpp b/common/test.cpp
index 90586ba..f9bfa23 100644
--- a/common/test.cpp
+++ b/common/test.cpp
@@ -29,8 +29,6 @@
 #include "resourceconfig.h"
 #include "definitions.h"
 
-SINK_DEBUG_AREA("test")
-
 using namespace Sink;
 
 void Sink::Test::initTest()
diff --git a/common/typeindex.cpp b/common/typeindex.cpp
index 153aa43..3e66ffe 100644
--- a/common/typeindex.cpp
+++ b/common/typeindex.cpp
@@ -22,8 +22,6 @@
 #include "index.h"
 #include <QDateTime>
 
-SINK_DEBUG_AREA("typeindex")
-
 using namespace Sink;
 
 static QByteArray getByteArray(const QVariant &value)
diff --git a/examples/davresource/davresource.cpp b/examples/davresource/davresource.cpp
index 50471ed..6631148 100644
--- a/examples/davresource/davresource.cpp
+++ b/examples/davresource/davresource.cpp
@@ -42,8 +42,6 @@
 #define ENTITY_TYPE_CONTACT "contact"
 #define ENTITY_TYPE_ADDRESSBOOK "addressbook"
 
-SINK_DEBUG_AREA("davresource")
-
 using namespace Sink;
 
 static KAsync::Job<void> runJob(KJob *job)
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index c1f536e..dffdfc9 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -42,8 +42,6 @@
 #define ENTITY_TYPE_MAIL "mail"
 #define ENTITY_TYPE_FOLDER "folder"
 
-SINK_DEBUG_AREA("dummyresource")
-
 using namespace Sink;
 
 class DummySynchronizer : public Sink::Synchronizer {
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 90383e0..94ca27a 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -46,8 +46,6 @@
 #define ENTITY_TYPE_MAIL "mail"
 #define ENTITY_TYPE_FOLDER "folder"
 
-SINK_DEBUG_AREA("imapresource")
-
 Q_DECLARE_METATYPE(QSharedPointer<Imap::ImapServerProxy>)
 
 using namespace Imap;
diff --git a/examples/imapresource/imapserverproxy.cpp b/examples/imapresource/imapserverproxy.cpp
index 7fa0b5a..a52c5eb 100644
--- a/examples/imapresource/imapserverproxy.cpp
+++ b/examples/imapresource/imapserverproxy.cpp
@@ -37,8 +37,6 @@
 #include "log.h"
 #include "test.h"
 
-SINK_DEBUG_AREA("imapserverproxy")
-
 using namespace Imap;
 
 const char* Imap::Flags::Seen = "\\Seen";
diff --git a/examples/imapresource/tests/imapmailsyncbenchmark.cpp b/examples/imapresource/tests/imapmailsyncbenchmark.cpp
index a53c148..814e325 100644
--- a/examples/imapresource/tests/imapmailsyncbenchmark.cpp
+++ b/examples/imapresource/tests/imapmailsyncbenchmark.cpp
@@ -31,8 +31,6 @@
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
 
-SINK_DEBUG_AREA("ImapMailSyncBenchmark")
-
 /**
  * Test of complete system using the imap resource.
  *
diff --git a/examples/imapresource/tests/imapserverproxytest.cpp b/examples/imapresource/tests/imapserverproxytest.cpp
index 476066d..271b3d9 100644
--- a/examples/imapresource/tests/imapserverproxytest.cpp
+++ b/examples/imapresource/tests/imapserverproxytest.cpp
@@ -12,8 +12,6 @@
 
 using namespace Imap;
 
-// SINK_DEBUG_AREA("imapserverproxytest")
-
 /**
  */
 class ImapServerProxyTest : public QObject
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 24681b5..b406f63 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -43,8 +43,6 @@
 #define ENTITY_TYPE_MAIL "mail"
 #define ENTITY_TYPE_FOLDER "folder"
 
-SINK_DEBUG_AREA("maildirresource")
-
 using namespace Sink;
 
 static QString getFilePathFromMimeMessagePath(const QString &mimeMessagePath)
diff --git a/examples/mailtransportresource/mailtransport.cpp b/examples/mailtransportresource/mailtransport.cpp
index 84c1556..afe0257 100644
--- a/examples/mailtransportresource/mailtransport.cpp
+++ b/examples/mailtransportresource/mailtransport.cpp
@@ -23,8 +23,6 @@
 #include <QDebug>
 #include <common/log.h>
 
-SINK_DEBUG_AREA("mailtransport")
-
 extern "C" {
 
 #include <stdio.h>
diff --git a/examples/mailtransportresource/mailtransportresource.cpp b/examples/mailtransportresource/mailtransportresource.cpp
index c73219f..3d6f8e4 100644
--- a/examples/mailtransportresource/mailtransportresource.cpp
+++ b/examples/mailtransportresource/mailtransportresource.cpp
@@ -39,8 +39,6 @@
 
 #define ENTITY_TYPE_MAIL "mail"
 
-SINK_DEBUG_AREA("mailtransportresource")
-
 using namespace Sink;
 
 class MailtransportPreprocessor : public Sink::Preprocessor
diff --git a/sinksh/state.cpp b/sinksh/state.cpp
index 8f4a675..7e04d28 100644
--- a/sinksh/state.cpp
+++ b/sinksh/state.cpp
@@ -26,8 +26,6 @@
 
 #include "common/log.h"
 
-SINK_DEBUG_AREA("state")
-
 static bool s_hasEventLoop = false;
 
 class State::Private
diff --git a/synchronizer/main.cpp b/synchronizer/main.cpp
index c66a2fb..3c41c67 100644
--- a/synchronizer/main.cpp
+++ b/synchronizer/main.cpp
@@ -39,8 +39,6 @@
 #include "test.h"
 #include "definitions.h"
 
-SINK_DEBUG_AREA("main")
-
 static Listener *listener = nullptr;
 
 //Print a demangled stacktrace
diff --git a/tests/mailsynctest.cpp b/tests/mailsynctest.cpp
index c8ba9f1..5d51fbc 100644
--- a/tests/mailsynctest.cpp
+++ b/tests/mailsynctest.cpp
@@ -33,8 +33,6 @@
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
 
-SINK_DEBUG_AREA("mailsynctest")
-
 void MailSyncTest::initTestCase()
 {
     Test::initTest();
diff --git a/tests/mailtest.cpp b/tests/mailtest.cpp
index c51fc56..e1361e4 100644
--- a/tests/mailtest.cpp
+++ b/tests/mailtest.cpp
@@ -31,8 +31,6 @@
 using namespace Sink;
 using namespace Sink::ApplicationDomain;
 
-SINK_DEBUG_AREA("mailtest")
-
 void MailTest::initTestCase()
 {
     Test::initTest();
diff --git a/tests/messagequeuetest.cpp b/tests/messagequeuetest.cpp
index 83fa23f..2e3bd75 100644
--- a/tests/messagequeuetest.cpp
+++ b/tests/messagequeuetest.cpp
@@ -9,8 +9,6 @@
 #include "log.h"
 #include "test.h"
 
-SINK_DEBUG_AREA("messagequeuetest")
-
 /**
  * Test of the messagequeue implementation.
  */