7 files changed, 9 insertions, 53 deletions

diff --git a/common/datastorequery.cpp b/common/datastorequery.cpp
index 9f20ba9..ff255f4 100644
--- a/common/datastorequery.cpp
+++ b/common/datastorequery.cpp
@@ -21,10 +21,6 @@
 #include "log.h"
 #include "applicationdomaintype.h"
 
-#include "folder.h"
-#include "mail.h"
-#include "event.h"
-
 using namespace Sink;
 using namespace Sink::Storage;
 
@@ -394,20 +390,6 @@ QVector<QByteArray> DataStoreQuery::indexLookup(const QByteArray &property, cons
 /*     } */
 /* } */
 
-/* template <typename ... Args> */
-/* QSharedPointer<DataStoreQuery> prepareQuery(const QByteArray &type, Args && ... args) */
-/* { */
-/*     if (type == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) { */
-/*         return ApplicationDomain::TypeImplementation<ApplicationDomain::Folder>::prepareQuery(std::forward<Args>(args)...); */
-/*     } else if (type == ApplicationDomain::getTypeName<ApplicationDomain::Mail>()) { */
-/*         return ApplicationDomain::TypeImplementation<ApplicationDomain::Mail>::prepareQuery(std::forward<Args>(args)...); */
-/*     } else if (type == ApplicationDomain::getTypeName<ApplicationDomain::Event>()) { */
-/*         return ApplicationDomain::TypeImplementation<ApplicationDomain::Event>::prepareQuery(std::forward<Args>(args)...); */
-/*     } */
-/*     Q_ASSERT(false); */
-/*     return QSharedPointer<DataStoreQuery>(); */
-/* } */
-
 QByteArrayList DataStoreQuery::executeSubquery(const Query &subquery)
 {
     Q_ASSERT(!subquery.type.isEmpty());
diff --git a/common/datastorequery.h b/common/datastorequery.h
index 25fee66..5f4149e 100644
--- a/common/datastorequery.h
+++ b/common/datastorequery.h
@@ -19,10 +19,7 @@
 #pragma once
 
 #include "query.h"
-#include "storage.h"
 #include "resultset.h"
-#include "query.h"
-#include "entitybuffer.h"
 #include "log.h"
 #include "storage/entitystore.h"
 
diff --git a/common/domain/mail.cpp b/common/domain/mail.cpp
index c1b0b34..ee58928 100644
--- a/common/domain/mail.cpp
+++ b/common/domain/mail.cpp
@@ -66,8 +66,6 @@ void TypeImplementation<Mail>::configure(IndexPropertyMapper &indexPropertyMappe
 
 void TypeImplementation<Mail>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
 {
-
-
     propertyMapper.addMapping<Mail::Uid, Buffer>(&Buffer::uid);
     propertyMapper.addMapping<Mail::Sender, Buffer>(&Buffer::sender);
     propertyMapper.addMapping<Mail::SenderName, Buffer>(&Buffer::senderName);
diff --git a/common/queryrunner.cpp b/common/queryrunner.cpp
index bc4b5fc..1eacb8e 100644
--- a/common/queryrunner.cpp
+++ b/common/queryrunner.cpp
@@ -23,12 +23,7 @@
 #include <QPointer>
 
 #include "commands.h"
-#include "log.h"
-#include "storage.h"
-#include "definitions.h"
-#include "domainadaptor.h"
 #include "asyncutils.h"
-#include "storage.h"
 #include "datastorequery.h"
 
 SINK_DEBUG_AREA("queryrunner")
diff --git a/common/queryrunner.h b/common/queryrunner.h
index 9bd4791..7e3d688 100644
--- a/common/queryrunner.h
+++ b/common/queryrunner.h
@@ -21,9 +21,7 @@
 
 #include <QObject>
 #include "resourcecontext.h"
-#include "resourceaccess.h"
 #include "resultprovider.h"
-#include "domaintypeadaptorfactoryinterface.h"
 #include "query.h"
 #include "log.h"
 
diff --git a/examples/imapresource/imapresource.cpp b/examples/imapresource/imapresource.cpp
index 421bedf..34a4376 100644
--- a/examples/imapresource/imapresource.cpp
+++ b/examples/imapresource/imapresource.cpp
@@ -18,21 +18,14 @@
  */
 
 #include "imapresource.h"
+
 #include "facade.h"
-#include "entitybuffer.h"
 #include "pipeline.h"
-#include "mail_generated.h"
-#include "createentity_generated.h"
-#include "modifyentity_generated.h"
-#include "deleteentity_generated.h"
-#include "domainadaptor.h"
 #include "resourceconfig.h"
 #include "commands.h"
 #include "index.h"
 #include "log.h"
-#include "domain/mail.h"
 #include "definitions.h"
-#include "facadefactory.h"
 #include "inspection.h"
 #include "synchronizer.h"
 #include "sourcewriteback.h"
@@ -41,15 +34,14 @@
 
 #include <QtGlobal>
 #include <QDate>
-#include <QUuid>
-#include <QDir>
-#include <QDirIterator>
 #include <QDateTime>
 #include <QtAlgorithms>
 
+#include "facadefactory.h"
+#include "adaptorfactoryregistry.h"
+
 #include "imapserverproxy.h"
 #include "mailpreprocessor.h"
-#include "adaptorfactoryregistry.h"
 #include "specialpurposepreprocessor.h"
 
 //This is the resources entity type, and not the domain type
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 29b35fd..23920d4 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -18,30 +18,24 @@
  */
 
 #include "maildirresource.h"
+
 #include "facade.h"
-#include "entitybuffer.h"
 #include "pipeline.h"
-#include "mail_generated.h"
-#include "createentity_generated.h"
-#include "modifyentity_generated.h"
-#include "deleteentity_generated.h"
-#include "domainadaptor.h"
 #include "resourceconfig.h"
-#include "commands.h"
 #include "index.h"
 #include "log.h"
-#include "domain/mail.h"
 #include "definitions.h"
-#include "facadefactory.h"
 #include "libmaildir/maildir.h"
 #include "inspection.h"
 #include "synchronizer.h"
 #include "sourcewriteback.h"
+
+#include "facadefactory.h"
 #include "adaptorfactoryregistry.h"
+
 #include "mailpreprocessor.h"
 #include "specialpurposepreprocessor.h"
-#include <QDate>
-#include <QUuid>
+
 #include <QDir>
 #include <QDirIterator>
 #include <KMime/KMime/KMimeMessage>