From 41f8f9bc05c059cafa780ac8aec27a56cba2c278 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 12 May 2017 08:20:43 +0200 Subject: No more SINK_DEBUG_AREA --- common/configstore.cpp | 2 -- common/domain/applicationdomaintype.cpp | 2 -- common/domainadaptor.h | 1 - common/facade.h | 1 - common/genericresource.h | 2 -- common/listener.h | 2 -- common/mail/threadindexer.cpp | 2 -- common/mailpreprocessor.cpp | 2 -- common/messagequeue.cpp | 2 -- common/queryrunner.h | 2 -- common/resourceaccess.h | 2 -- common/resourcecontrol.cpp | 2 -- common/resourcefacade.cpp | 2 -- common/specialpurposepreprocessor.cpp | 2 -- common/storage_common.cpp | 2 -- common/store.cpp | 2 -- common/synchronizerstore.cpp | 2 -- common/test.cpp | 2 -- common/typeindex.cpp | 2 -- 19 files changed, 36 deletions(-) (limited to 'common') 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 #include -SINK_DEBUG_AREA("configstore") - static QSharedPointer getConfig(const QByteArray &identifier) { return QSharedPointer::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 -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 class SINK_EXPORT GenericFacade : public Sink::StoreFacade { 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 = QSharedPointer()); 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 #include -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 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 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 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 ConfigNotifier LocalStorageFacade::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 specialPurposeFolders() { QHash 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 -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>) Q_DECLARE_METATYPE(QSharedPointer); Q_DECLARE_METATYPE(std::shared_ptr); 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 -SINK_DEBUG_AREA("typeindex") - using namespace Sink; static QByteArray getByteArray(const QVariant &value) -- cgit v1.2.3