summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2016-10-21 14:50:54 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2016-10-21 14:50:54 +0200
commitb4ba2aed63e979670ef9931546a7118daadd48b5 (patch)
treec962ea0473383da37e8c74891d59ff1d4467da80 /common
parent40bc3c0607757159e274a72c4dca6f2445196ef0 (diff)
downloadsink-b4ba2aed63e979670ef9931546a7118daadd48b5.tar.gz
sink-b4ba2aed63e979670ef9931546a7118daadd48b5.zip
Cleanup
Diffstat (limited to 'common')
-rw-r--r--common/datastorequery.cpp18
-rw-r--r--common/datastorequery.h3
-rw-r--r--common/domain/mail.cpp2
-rw-r--r--common/queryrunner.cpp5
-rw-r--r--common/queryrunner.h2
5 files changed, 0 insertions, 30 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 @@
21#include "log.h" 21#include "log.h"
22#include "applicationdomaintype.h" 22#include "applicationdomaintype.h"
23 23
24#include "folder.h"
25#include "mail.h"
26#include "event.h"
27
28using namespace Sink; 24using namespace Sink;
29using namespace Sink::Storage; 25using namespace Sink::Storage;
30 26
@@ -394,20 +390,6 @@ QVector<QByteArray> DataStoreQuery::indexLookup(const QByteArray &property, cons
394/* } */ 390/* } */
395/* } */ 391/* } */
396 392
397/* template <typename ... Args> */
398/* QSharedPointer<DataStoreQuery> prepareQuery(const QByteArray &type, Args && ... args) */
399/* { */
400/* if (type == ApplicationDomain::getTypeName<ApplicationDomain::Folder>()) { */
401/* return ApplicationDomain::TypeImplementation<ApplicationDomain::Folder>::prepareQuery(std::forward<Args>(args)...); */
402/* } else if (type == ApplicationDomain::getTypeName<ApplicationDomain::Mail>()) { */
403/* return ApplicationDomain::TypeImplementation<ApplicationDomain::Mail>::prepareQuery(std::forward<Args>(args)...); */
404/* } else if (type == ApplicationDomain::getTypeName<ApplicationDomain::Event>()) { */
405/* return ApplicationDomain::TypeImplementation<ApplicationDomain::Event>::prepareQuery(std::forward<Args>(args)...); */
406/* } */
407/* Q_ASSERT(false); */
408/* return QSharedPointer<DataStoreQuery>(); */
409/* } */
410
411QByteArrayList DataStoreQuery::executeSubquery(const Query &subquery) 393QByteArrayList DataStoreQuery::executeSubquery(const Query &subquery)
412{ 394{
413 Q_ASSERT(!subquery.type.isEmpty()); 395 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 @@
19#pragma once 19#pragma once
20 20
21#include "query.h" 21#include "query.h"
22#include "storage.h"
23#include "resultset.h" 22#include "resultset.h"
24#include "query.h"
25#include "entitybuffer.h"
26#include "log.h" 23#include "log.h"
27#include "storage/entitystore.h" 24#include "storage/entitystore.h"
28 25
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
66 66
67void TypeImplementation<Mail>::configure(ReadPropertyMapper<Buffer> &propertyMapper) 67void TypeImplementation<Mail>::configure(ReadPropertyMapper<Buffer> &propertyMapper)
68{ 68{
69
70
71 propertyMapper.addMapping<Mail::Uid, Buffer>(&Buffer::uid); 69 propertyMapper.addMapping<Mail::Uid, Buffer>(&Buffer::uid);
72 propertyMapper.addMapping<Mail::Sender, Buffer>(&Buffer::sender); 70 propertyMapper.addMapping<Mail::Sender, Buffer>(&Buffer::sender);
73 propertyMapper.addMapping<Mail::SenderName, Buffer>(&Buffer::senderName); 71 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 @@
23#include <QPointer> 23#include <QPointer>
24 24
25#include "commands.h" 25#include "commands.h"
26#include "log.h"
27#include "storage.h"
28#include "definitions.h"
29#include "domainadaptor.h"
30#include "asyncutils.h" 26#include "asyncutils.h"
31#include "storage.h"
32#include "datastorequery.h" 27#include "datastorequery.h"
33 28
34SINK_DEBUG_AREA("queryrunner") 29SINK_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 @@
21 21
22#include <QObject> 22#include <QObject>
23#include "resourcecontext.h" 23#include "resourcecontext.h"
24#include "resourceaccess.h"
25#include "resultprovider.h" 24#include "resultprovider.h"
26#include "domaintypeadaptorfactoryinterface.h"
27#include "query.h" 25#include "query.h"
28#include "log.h" 26#include "log.h"
29 27