summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/client/CMakeLists.txt4
-rw-r--r--examples/client/main.cpp66
-rw-r--r--examples/dummyresource/CMakeLists.txt6
-rw-r--r--examples/dummyresource/domainadaptor.h6
-rw-r--r--examples/dummyresource/facade.cpp6
-rw-r--r--examples/dummyresource/facade.h6
-rw-r--r--examples/dummyresource/resourcefactory.cpp56
-rw-r--r--examples/dummyresource/resourcefactory.h24
-rw-r--r--examples/maildirresource/CMakeLists.txt6
-rw-r--r--examples/maildirresource/domainadaptor.h4
-rw-r--r--examples/maildirresource/facade.cpp4
-rw-r--r--examples/maildirresource/facade.h4
-rw-r--r--examples/maildirresource/libmaildir/maildir.cpp16
-rw-r--r--examples/maildirresource/libmaildir/maildir.h2
-rw-r--r--examples/maildirresource/maildirresource.cpp90
-rw-r--r--examples/maildirresource/maildirresource.h20
16 files changed, 160 insertions, 160 deletions
diff --git a/examples/client/CMakeLists.txt b/examples/client/CMakeLists.txt
index 97b5ad2..85840c4 100644
--- a/examples/client/CMakeLists.txt
+++ b/examples/client/CMakeLists.txt
@@ -1,8 +1,8 @@
1project(akonadi2_client) 1project(sink_client)
2 2
3include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) 3include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
4 4
5add_executable(${PROJECT_NAME} main.cpp console.cpp) 5add_executable(${PROJECT_NAME} main.cpp console.cpp)
6target_link_libraries(${PROJECT_NAME} akonadi2common) 6target_link_libraries(${PROJECT_NAME} sinkcommon)
7qt5_use_modules(${PROJECT_NAME} Widgets Network) 7qt5_use_modules(${PROJECT_NAME} Widgets Network)
8install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) 8install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/examples/client/main.cpp b/examples/client/main.cpp
index 6660f86..f437c19 100644
--- a/examples/client/main.cpp
+++ b/examples/client/main.cpp
@@ -34,64 +34,64 @@
34#include <iostream> 34#include <iostream>
35 35
36/** 36/**
37 * A small abstraction layer to use the akonadi store with the type available as string. 37 * A small abstraction layer to use the sink store with the type available as string.
38 */ 38 */
39class StoreBase { 39class StoreBase {
40public: 40public:
41 virtual Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr getObject() = 0; 41 virtual Sink::ApplicationDomain::ApplicationDomainType::Ptr getObject() = 0;
42 virtual Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr getObject(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier = QByteArray()) = 0; 42 virtual Sink::ApplicationDomain::ApplicationDomainType::Ptr getObject(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier = QByteArray()) = 0;
43 virtual KAsync::Job<void> create(const Akonadi2::ApplicationDomain::ApplicationDomainType &type) = 0; 43 virtual KAsync::Job<void> create(const Sink::ApplicationDomain::ApplicationDomainType &type) = 0;
44 virtual KAsync::Job<void> modify(const Akonadi2::ApplicationDomain::ApplicationDomainType &type) = 0; 44 virtual KAsync::Job<void> modify(const Sink::ApplicationDomain::ApplicationDomainType &type) = 0;
45 virtual KAsync::Job<void> remove(const Akonadi2::ApplicationDomain::ApplicationDomainType &type) = 0; 45 virtual KAsync::Job<void> remove(const Sink::ApplicationDomain::ApplicationDomainType &type) = 0;
46 virtual QSharedPointer<QAbstractItemModel> loadModel(const Akonadi2::Query &query) = 0; 46 virtual QSharedPointer<QAbstractItemModel> loadModel(const Sink::Query &query) = 0;
47}; 47};
48 48
49template <typename T> 49template <typename T>
50class Store : public StoreBase { 50class Store : public StoreBase {
51public: 51public:
52 Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr getObject() Q_DECL_OVERRIDE { 52 Sink::ApplicationDomain::ApplicationDomainType::Ptr getObject() Q_DECL_OVERRIDE {
53 return T::Ptr::create(); 53 return T::Ptr::create();
54 } 54 }
55 55
56 Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr getObject(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier = QByteArray()) Q_DECL_OVERRIDE { 56 Sink::ApplicationDomain::ApplicationDomainType::Ptr getObject(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier = QByteArray()) Q_DECL_OVERRIDE {
57 return T::Ptr::create(resourceInstanceIdentifier, identifier, 0, QSharedPointer<Akonadi2::ApplicationDomain::MemoryBufferAdaptor>::create()); 57 return T::Ptr::create(resourceInstanceIdentifier, identifier, 0, QSharedPointer<Sink::ApplicationDomain::MemoryBufferAdaptor>::create());
58 } 58 }
59 59
60 KAsync::Job<void> create(const Akonadi2::ApplicationDomain::ApplicationDomainType &type) Q_DECL_OVERRIDE { 60 KAsync::Job<void> create(const Sink::ApplicationDomain::ApplicationDomainType &type) Q_DECL_OVERRIDE {
61 return Akonadi2::Store::create<T>(*static_cast<const T*>(&type)); 61 return Sink::Store::create<T>(*static_cast<const T*>(&type));
62 } 62 }
63 63
64 KAsync::Job<void> modify(const Akonadi2::ApplicationDomain::ApplicationDomainType &type) Q_DECL_OVERRIDE { 64 KAsync::Job<void> modify(const Sink::ApplicationDomain::ApplicationDomainType &type) Q_DECL_OVERRIDE {
65 return Akonadi2::Store::modify<T>(*static_cast<const T*>(&type)); 65 return Sink::Store::modify<T>(*static_cast<const T*>(&type));
66 } 66 }
67 67
68 KAsync::Job<void> remove(const Akonadi2::ApplicationDomain::ApplicationDomainType &type) Q_DECL_OVERRIDE { 68 KAsync::Job<void> remove(const Sink::ApplicationDomain::ApplicationDomainType &type) Q_DECL_OVERRIDE {
69 return Akonadi2::Store::remove<T>(*static_cast<const T*>(&type)); 69 return Sink::Store::remove<T>(*static_cast<const T*>(&type));
70 } 70 }
71 71
72 QSharedPointer<QAbstractItemModel> loadModel(const Akonadi2::Query &query) Q_DECL_OVERRIDE { 72 QSharedPointer<QAbstractItemModel> loadModel(const Sink::Query &query) Q_DECL_OVERRIDE {
73 return Akonadi2::Store::loadModel<T>(query); 73 return Sink::Store::loadModel<T>(query);
74 } 74 }
75}; 75};
76 76
77StoreBase& getStore(const QString &type) 77StoreBase& getStore(const QString &type)
78{ 78{
79 if (type == "folder") { 79 if (type == "folder") {
80 static Store<Akonadi2::ApplicationDomain::Folder> store; 80 static Store<Sink::ApplicationDomain::Folder> store;
81 return store; 81 return store;
82 } else if (type == "mail") { 82 } else if (type == "mail") {
83 static Store<Akonadi2::ApplicationDomain::Mail> store; 83 static Store<Sink::ApplicationDomain::Mail> store;
84 return store; 84 return store;
85 } else if (type == "event") { 85 } else if (type == "event") {
86 static Store<Akonadi2::ApplicationDomain::Event> store; 86 static Store<Sink::ApplicationDomain::Event> store;
87 return store; 87 return store;
88 } else if (type == "resource") { 88 } else if (type == "resource") {
89 static Store<Akonadi2::ApplicationDomain::AkonadiResource> store; 89 static Store<Sink::ApplicationDomain::SinkResource> store;
90 return store; 90 return store;
91 } 91 }
92 Q_ASSERT(false); 92 Q_ASSERT(false);
93 qWarning() << "Trying to get a store that doesn't exist, falling back to event"; 93 qWarning() << "Trying to get a store that doesn't exist, falling back to event";
94 static Store<Akonadi2::ApplicationDomain::Event> store; 94 static Store<Sink::ApplicationDomain::Event> store;
95 return store; 95 return store;
96} 96}
97 97
@@ -118,17 +118,17 @@ public:
118 auto syncButton = new QPushButton(this); 118 auto syncButton = new QPushButton(this);
119 syncButton->setText("Synchronize!"); 119 syncButton->setText("Synchronize!");
120 QObject::connect(syncButton, &QPushButton::pressed, []() { 120 QObject::connect(syncButton, &QPushButton::pressed, []() {
121 Akonadi2::Query query; 121 Sink::Query query;
122 query.resources << "org.kde.dummy.instance1"; 122 query.resources << "org.kde.dummy.instance1";
123 Akonadi2::Store::synchronize(query).exec(); 123 Sink::Store::synchronize(query).exec();
124 }); 124 });
125 125
126 auto removeButton = new QPushButton(this); 126 auto removeButton = new QPushButton(this);
127 removeButton->setText("Remove"); 127 removeButton->setText("Remove");
128 QObject::connect(removeButton, &QPushButton::pressed, [modelView]() { 128 QObject::connect(removeButton, &QPushButton::pressed, [modelView]() {
129 for (auto index : modelView->selectionModel()->selectedIndexes()) { 129 for (auto index : modelView->selectionModel()->selectedIndexes()) {
130 auto object = index.data(Akonadi2::Store::DomainObjectRole).value<typename T::Ptr>(); 130 auto object = index.data(Sink::Store::DomainObjectRole).value<typename T::Ptr>();
131 Akonadi2::Store::remove(*object).exec(); 131 Sink::Store::remove(*object).exec();
132 } 132 }
133 }); 133 });
134 134
@@ -142,7 +142,7 @@ public:
142 142
143}; 143};
144 144
145static QSharedPointer<QAbstractItemModel> loadModel(const QString &type, Akonadi2::Query query) 145static QSharedPointer<QAbstractItemModel> loadModel(const QString &type, Sink::Query query)
146{ 146{
147 QTime time; 147 QTime time;
148 time.start(); 148 time.start();
@@ -187,13 +187,13 @@ int main(int argc, char *argv[])
187 QStringList args = cliOptions.positionalArguments(); 187 QStringList args = cliOptions.positionalArguments();
188 188
189 if (cliOptions.isSet("debuglevel")) { 189 if (cliOptions.isSet("debuglevel")) {
190 Akonadi2::Log::setDebugOutputLevel(static_cast<Akonadi2::Log::DebugLevel>(cliOptions.value("debuglevel").toInt())); 190 Sink::Log::setDebugOutputLevel(static_cast<Sink::Log::DebugLevel>(cliOptions.value("debuglevel").toInt()));
191 } 191 }
192 192
193 auto type = !args.isEmpty() ? args.takeFirst() : QByteArray(); 193 auto type = !args.isEmpty() ? args.takeFirst() : QByteArray();
194 auto resources = args; 194 auto resources = args;
195 195
196 Akonadi2::Query query; 196 Sink::Query query;
197 for (const auto &res : resources) { 197 for (const auto &res : resources) {
198 query.resources << res.toLatin1(); 198 query.resources << res.toLatin1();
199 } 199 }
@@ -208,13 +208,13 @@ int main(int argc, char *argv[])
208 model->fetchMore(model->index(i, 0, index)); 208 model->fetchMore(model->index(i, 0, index));
209 } 209 }
210 }); 210 });
211 auto view = QSharedPointer<View<Akonadi2::ApplicationDomain::Folder> >::create(model.data()); 211 auto view = QSharedPointer<View<Sink::ApplicationDomain::Folder> >::create(model.data());
212 app.exec(); 212 app.exec();
213 } else if (type == "mail") { 213 } else if (type == "mail") {
214 auto view = QSharedPointer<View<Akonadi2::ApplicationDomain::Mail> >::create(model.data()); 214 auto view = QSharedPointer<View<Sink::ApplicationDomain::Mail> >::create(model.data());
215 app.exec(); 215 app.exec();
216 } else if (type == "event") { 216 } else if (type == "event") {
217 auto view = QSharedPointer<View<Akonadi2::ApplicationDomain::Event> >::create(model.data()); 217 auto view = QSharedPointer<View<Sink::ApplicationDomain::Event> >::create(model.data());
218 app.exec(); 218 app.exec();
219 } 219 }
220 return 0; 220 return 0;
diff --git a/examples/dummyresource/CMakeLists.txt b/examples/dummyresource/CMakeLists.txt
index 1e80f81..6ffac9a 100644
--- a/examples/dummyresource/CMakeLists.txt
+++ b/examples/dummyresource/CMakeLists.txt
@@ -1,4 +1,4 @@
1project(akonadi2_resource_dummy) 1project(sink_resource_dummy)
2 2
3add_definitions(-DQT_PLUGIN) 3add_definitions(-DQT_PLUGIN)
4include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) 4include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
@@ -7,6 +7,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
7add_library(${PROJECT_NAME} SHARED facade.cpp resourcefactory.cpp domainadaptor.cpp dummystore.cpp) 7add_library(${PROJECT_NAME} SHARED facade.cpp resourcefactory.cpp domainadaptor.cpp dummystore.cpp)
8generate_flatbuffers(${PROJECT_NAME} dummycalendar) 8generate_flatbuffers(${PROJECT_NAME} dummycalendar)
9qt5_use_modules(${PROJECT_NAME} Core Network) 9qt5_use_modules(${PROJECT_NAME} Core Network)
10target_link_libraries(${PROJECT_NAME} akonadi2common) 10target_link_libraries(${PROJECT_NAME} sinkcommon)
11 11
12install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${AKONADI2_RESOURCE_PLUGINS_PATH}) 12install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
diff --git a/examples/dummyresource/domainadaptor.h b/examples/dummyresource/domainadaptor.h
index e5856f8..e7098e9 100644
--- a/examples/dummyresource/domainadaptor.h
+++ b/examples/dummyresource/domainadaptor.h
@@ -26,21 +26,21 @@
26#include "dummycalendar_generated.h" 26#include "dummycalendar_generated.h"
27#include "entity_generated.h" 27#include "entity_generated.h"
28 28
29class DummyEventAdaptorFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Event, DummyCalendar::DummyEvent, DummyCalendar::DummyEventBuilder> 29class DummyEventAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Event, DummyCalendar::DummyEvent, DummyCalendar::DummyEventBuilder>
30{ 30{
31public: 31public:
32 DummyEventAdaptorFactory(); 32 DummyEventAdaptorFactory();
33 virtual ~DummyEventAdaptorFactory() {}; 33 virtual ~DummyEventAdaptorFactory() {};
34}; 34};
35 35
36class DummyMailAdaptorFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Mail, Akonadi2::ApplicationDomain::Buffer::Dummy, Akonadi2::ApplicationDomain::Buffer::DummyBuilder> 36class DummyMailAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Mail, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
37{ 37{
38public: 38public:
39 DummyMailAdaptorFactory(); 39 DummyMailAdaptorFactory();
40 virtual ~DummyMailAdaptorFactory() {}; 40 virtual ~DummyMailAdaptorFactory() {};
41}; 41};
42 42
43class DummyFolderAdaptorFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Folder, Akonadi2::ApplicationDomain::Buffer::Dummy, Akonadi2::ApplicationDomain::Buffer::DummyBuilder> 43class DummyFolderAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Folder, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
44{ 44{
45public: 45public:
46 DummyFolderAdaptorFactory(); 46 DummyFolderAdaptorFactory();
diff --git a/examples/dummyresource/facade.cpp b/examples/dummyresource/facade.cpp
index f337bdc..120498a 100644
--- a/examples/dummyresource/facade.cpp
+++ b/examples/dummyresource/facade.cpp
@@ -22,7 +22,7 @@
22#include "domainadaptor.h" 22#include "domainadaptor.h"
23 23
24DummyResourceFacade::DummyResourceFacade(const QByteArray &instanceIdentifier) 24DummyResourceFacade::DummyResourceFacade(const QByteArray &instanceIdentifier)
25 : Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Event>(instanceIdentifier, QSharedPointer<DummyEventAdaptorFactory>::create()) 25 : Sink::GenericFacade<Sink::ApplicationDomain::Event>(instanceIdentifier, QSharedPointer<DummyEventAdaptorFactory>::create())
26{ 26{
27} 27}
28 28
@@ -32,7 +32,7 @@ DummyResourceFacade::~DummyResourceFacade()
32 32
33 33
34DummyResourceMailFacade::DummyResourceMailFacade(const QByteArray &instanceIdentifier) 34DummyResourceMailFacade::DummyResourceMailFacade(const QByteArray &instanceIdentifier)
35 : Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Mail>(instanceIdentifier, QSharedPointer<DummyMailAdaptorFactory>::create()) 35 : Sink::GenericFacade<Sink::ApplicationDomain::Mail>(instanceIdentifier, QSharedPointer<DummyMailAdaptorFactory>::create())
36{ 36{
37} 37}
38 38
@@ -42,7 +42,7 @@ DummyResourceMailFacade::~DummyResourceMailFacade()
42 42
43 43
44DummyResourceFolderFacade::DummyResourceFolderFacade(const QByteArray &instanceIdentifier) 44DummyResourceFolderFacade::DummyResourceFolderFacade(const QByteArray &instanceIdentifier)
45 : Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Folder>(instanceIdentifier, QSharedPointer<DummyFolderAdaptorFactory>::create()) 45 : Sink::GenericFacade<Sink::ApplicationDomain::Folder>(instanceIdentifier, QSharedPointer<DummyFolderAdaptorFactory>::create())
46{ 46{
47} 47}
48 48
diff --git a/examples/dummyresource/facade.h b/examples/dummyresource/facade.h
index b00e1d7..5e0096d 100644
--- a/examples/dummyresource/facade.h
+++ b/examples/dummyresource/facade.h
@@ -22,21 +22,21 @@
22#include "common/facade.h" 22#include "common/facade.h"
23#include "common/domain/event.h" 23#include "common/domain/event.h"
24 24
25class DummyResourceFacade : public Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Event> 25class DummyResourceFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Event>
26{ 26{
27public: 27public:
28 DummyResourceFacade(const QByteArray &instanceIdentifier); 28 DummyResourceFacade(const QByteArray &instanceIdentifier);
29 virtual ~DummyResourceFacade(); 29 virtual ~DummyResourceFacade();
30}; 30};
31 31
32class DummyResourceMailFacade : public Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Mail> 32class DummyResourceMailFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Mail>
33{ 33{
34public: 34public:
35 DummyResourceMailFacade(const QByteArray &instanceIdentifier); 35 DummyResourceMailFacade(const QByteArray &instanceIdentifier);
36 virtual ~DummyResourceMailFacade(); 36 virtual ~DummyResourceMailFacade();
37}; 37};
38 38
39class DummyResourceFolderFacade : public Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Folder> 39class DummyResourceFolderFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Folder>
40{ 40{
41public: 41public:
42 DummyResourceFolderFacade(const QByteArray &instanceIdentifier); 42 DummyResourceFolderFacade(const QByteArray &instanceIdentifier);
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index c43b5e6..31633d7 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -43,24 +43,24 @@
43#define ENTITY_TYPE_MAIL "mail" 43#define ENTITY_TYPE_MAIL "mail"
44#define ENTITY_TYPE_FOLDER "folder" 44#define ENTITY_TYPE_FOLDER "folder"
45 45
46DummyResource::DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer<Akonadi2::Pipeline> &pipeline) 46DummyResource::DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer<Sink::Pipeline> &pipeline)
47 : Akonadi2::GenericResource(instanceIdentifier, pipeline), 47 : Sink::GenericResource(instanceIdentifier, pipeline),
48 mEventAdaptorFactory(QSharedPointer<DummyEventAdaptorFactory>::create()), 48 mEventAdaptorFactory(QSharedPointer<DummyEventAdaptorFactory>::create()),
49 mMailAdaptorFactory(QSharedPointer<DummyMailAdaptorFactory>::create()), 49 mMailAdaptorFactory(QSharedPointer<DummyMailAdaptorFactory>::create()),
50 mFolderAdaptorFactory(QSharedPointer<DummyFolderAdaptorFactory>::create()) 50 mFolderAdaptorFactory(QSharedPointer<DummyFolderAdaptorFactory>::create())
51{ 51{
52 addType(ENTITY_TYPE_MAIL, mMailAdaptorFactory, 52 addType(ENTITY_TYPE_MAIL, mMailAdaptorFactory,
53 QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Mail>); 53 QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Mail>);
54 addType(ENTITY_TYPE_FOLDER, mFolderAdaptorFactory, 54 addType(ENTITY_TYPE_FOLDER, mFolderAdaptorFactory,
55 QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Folder>); 55 QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Folder>);
56 addType(ENTITY_TYPE_EVENT, mEventAdaptorFactory, 56 addType(ENTITY_TYPE_EVENT, mEventAdaptorFactory,
57 QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Event>); 57 QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Event>);
58} 58}
59 59
60Akonadi2::ApplicationDomain::Event::Ptr DummyResource::createEvent(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Akonadi2::Storage::Transaction &transaction) 60Sink::ApplicationDomain::Event::Ptr DummyResource::createEvent(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &transaction)
61{ 61{
62 static uint8_t rawData[100]; 62 static uint8_t rawData[100];
63 auto event = Akonadi2::ApplicationDomain::Event::Ptr::create(); 63 auto event = Sink::ApplicationDomain::Event::Ptr::create();
64 event->setProperty("summary", data.value("summary").toString()); 64 event->setProperty("summary", data.value("summary").toString());
65 event->setProperty("remoteId", ridBuffer); 65 event->setProperty("remoteId", ridBuffer);
66 event->setProperty("description", data.value("description").toString()); 66 event->setProperty("description", data.value("description").toString());
@@ -68,9 +68,9 @@ Akonadi2::ApplicationDomain::Event::Ptr DummyResource::createEvent(const QByteAr
68 return event; 68 return event;
69} 69}
70 70
71Akonadi2::ApplicationDomain::Mail::Ptr DummyResource::createMail(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Akonadi2::Storage::Transaction &transaction) 71Sink::ApplicationDomain::Mail::Ptr DummyResource::createMail(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &transaction)
72{ 72{
73 auto mail = Akonadi2::ApplicationDomain::Mail::Ptr::create(); 73 auto mail = Sink::ApplicationDomain::Mail::Ptr::create();
74 mail->setProperty("subject", data.value("subject").toString()); 74 mail->setProperty("subject", data.value("subject").toString());
75 mail->setProperty("senderEmail", data.value("senderEmail").toString()); 75 mail->setProperty("senderEmail", data.value("senderEmail").toString());
76 mail->setProperty("senderName", data.value("senderName").toString()); 76 mail->setProperty("senderName", data.value("senderName").toString());
@@ -81,19 +81,19 @@ Akonadi2::ApplicationDomain::Mail::Ptr DummyResource::createMail(const QByteArra
81 return mail; 81 return mail;
82} 82}
83 83
84Akonadi2::ApplicationDomain::Folder::Ptr DummyResource::createFolder(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Akonadi2::Storage::Transaction &transaction) 84Sink::ApplicationDomain::Folder::Ptr DummyResource::createFolder(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &transaction)
85{ 85{
86 auto folder = Akonadi2::ApplicationDomain::Folder::Ptr::create(); 86 auto folder = Sink::ApplicationDomain::Folder::Ptr::create();
87 folder->setProperty("name", data.value("name").toString()); 87 folder->setProperty("name", data.value("name").toString());
88 folder->setProperty("icon", data.value("icon").toString()); 88 folder->setProperty("icon", data.value("icon").toString());
89 if (!data.value("parent").toString().isEmpty()) { 89 if (!data.value("parent").toString().isEmpty()) {
90 auto akonadiId = resolveRemoteId(ENTITY_TYPE_FOLDER, data.value("parent").toByteArray(), transaction); 90 auto sinkId = resolveRemoteId(ENTITY_TYPE_FOLDER, data.value("parent").toByteArray(), transaction);
91 folder->setProperty("parent", akonadiId); 91 folder->setProperty("parent", sinkId);
92 } 92 }
93 return folder; 93 return folder;
94} 94}
95 95
96void DummyResource::synchronize(const QByteArray &bufferType, const QMap<QString, QMap<QString, QVariant> > &data, Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, std::function<Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Akonadi2::Storage::Transaction &)> createEntity) 96void DummyResource::synchronize(const QByteArray &bufferType, const QMap<QString, QMap<QString, QVariant> > &data, Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, std::function<Sink::ApplicationDomain::ApplicationDomainType::Ptr(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &)> createEntity)
97{ 97{
98 //TODO find items to remove 98 //TODO find items to remove
99 for (auto it = data.constBegin(); it != data.constEnd(); it++) { 99 for (auto it = data.constBegin(); it != data.constEnd(); it++) {
@@ -103,26 +103,26 @@ void DummyResource::synchronize(const QByteArray &bufferType, const QMap<QString
103 } 103 }
104} 104}
105 105
106KAsync::Job<void> DummyResource::synchronizeWithSource(Akonadi2::Storage &mainStore, Akonadi2::Storage &synchronizationStore) 106KAsync::Job<void> DummyResource::synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore)
107{ 107{
108 Log() << " Synchronizing"; 108 Log() << " Synchronizing";
109 return KAsync::start<void>([this, &mainStore, &synchronizationStore]() { 109 return KAsync::start<void>([this, &mainStore, &synchronizationStore]() {
110 auto transaction = mainStore.createTransaction(Akonadi2::Storage::ReadOnly); 110 auto transaction = mainStore.createTransaction(Sink::Storage::ReadOnly);
111 auto synchronizationTransaction = synchronizationStore.createTransaction(Akonadi2::Storage::ReadWrite); 111 auto synchronizationTransaction = synchronizationStore.createTransaction(Sink::Storage::ReadWrite);
112 synchronize(ENTITY_TYPE_EVENT, DummyStore::instance().events(), transaction, synchronizationTransaction, *mEventAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Akonadi2::Storage::Transaction &synchronizationTransaction) { 112 synchronize(ENTITY_TYPE_EVENT, DummyStore::instance().events(), transaction, synchronizationTransaction, *mEventAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &synchronizationTransaction) {
113 return createEvent(ridBuffer, data, synchronizationTransaction); 113 return createEvent(ridBuffer, data, synchronizationTransaction);
114 }); 114 });
115 synchronize(ENTITY_TYPE_MAIL, DummyStore::instance().mails(), transaction, synchronizationTransaction, *mMailAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Akonadi2::Storage::Transaction &synchronizationTransaction) { 115 synchronize(ENTITY_TYPE_MAIL, DummyStore::instance().mails(), transaction, synchronizationTransaction, *mMailAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &synchronizationTransaction) {
116 return createMail(ridBuffer, data, synchronizationTransaction); 116 return createMail(ridBuffer, data, synchronizationTransaction);
117 }); 117 });
118 synchronize(ENTITY_TYPE_FOLDER, DummyStore::instance().folders(), transaction, synchronizationTransaction, *mFolderAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Akonadi2::Storage::Transaction &synchronizationTransaction) { 118 synchronize(ENTITY_TYPE_FOLDER, DummyStore::instance().folders(), transaction, synchronizationTransaction, *mFolderAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &synchronizationTransaction) {
119 return createFolder(ridBuffer, data, synchronizationTransaction); 119 return createFolder(ridBuffer, data, synchronizationTransaction);
120 }); 120 });
121 Log() << "Done Synchronizing"; 121 Log() << "Done Synchronizing";
122 }); 122 });
123} 123}
124 124
125KAsync::Job<void> DummyResource::replay(Akonadi2::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) 125KAsync::Job<void> DummyResource::replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value)
126{ 126{
127 Trace() << "Replaying " << key; 127 Trace() << "Replaying " << key;
128 return KAsync::null<void>(); 128 return KAsync::null<void>();
@@ -131,7 +131,7 @@ KAsync::Job<void> DummyResource::replay(Akonadi2::Storage &synchronizationStore,
131void DummyResource::removeFromDisk(const QByteArray &instanceIdentifier) 131void DummyResource::removeFromDisk(const QByteArray &instanceIdentifier)
132{ 132{
133 GenericResource::removeFromDisk(instanceIdentifier); 133 GenericResource::removeFromDisk(instanceIdentifier);
134 Akonadi2::Storage(Akonadi2::storageLocation(), instanceIdentifier + ".synchronization", Akonadi2::Storage::ReadWrite).removeFromDisk(); 134 Sink::Storage(Sink::storageLocation(), instanceIdentifier + ".synchronization", Sink::Storage::ReadWrite).removeFromDisk();
135} 135}
136 136
137KAsync::Job<void> DummyResource::inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) 137KAsync::Job<void> DummyResource::inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue)
@@ -151,20 +151,20 @@ KAsync::Job<void> DummyResource::inspect(int inspectionType, const QByteArray &i
151} 151}
152 152
153DummyResourceFactory::DummyResourceFactory(QObject *parent) 153DummyResourceFactory::DummyResourceFactory(QObject *parent)
154 : Akonadi2::ResourceFactory(parent) 154 : Sink::ResourceFactory(parent)
155{ 155{
156 156
157} 157}
158 158
159Akonadi2::Resource *DummyResourceFactory::createResource(const QByteArray &instanceIdentifier) 159Sink::Resource *DummyResourceFactory::createResource(const QByteArray &instanceIdentifier)
160{ 160{
161 return new DummyResource(instanceIdentifier); 161 return new DummyResource(instanceIdentifier);
162} 162}
163 163
164void DummyResourceFactory::registerFacades(Akonadi2::FacadeFactory &factory) 164void DummyResourceFactory::registerFacades(Sink::FacadeFactory &factory)
165{ 165{
166 factory.registerFacade<Akonadi2::ApplicationDomain::Event, DummyResourceFacade>(PLUGIN_NAME); 166 factory.registerFacade<Sink::ApplicationDomain::Event, DummyResourceFacade>(PLUGIN_NAME);
167 factory.registerFacade<Akonadi2::ApplicationDomain::Mail, DummyResourceMailFacade>(PLUGIN_NAME); 167 factory.registerFacade<Sink::ApplicationDomain::Mail, DummyResourceMailFacade>(PLUGIN_NAME);
168 factory.registerFacade<Akonadi2::ApplicationDomain::Folder, DummyResourceFolderFacade>(PLUGIN_NAME); 168 factory.registerFacade<Sink::ApplicationDomain::Folder, DummyResourceFolderFacade>(PLUGIN_NAME);
169} 169}
170 170
diff --git a/examples/dummyresource/resourcefactory.h b/examples/dummyresource/resourcefactory.h
index 634829e..240bb9f 100644
--- a/examples/dummyresource/resourcefactory.h
+++ b/examples/dummyresource/resourcefactory.h
@@ -33,36 +33,36 @@ class DummyEventAdaptorFactory;
33class DummyMailAdaptorFactory; 33class DummyMailAdaptorFactory;
34class DummyFolderAdaptorFactory; 34class DummyFolderAdaptorFactory;
35 35
36class DummyResource : public Akonadi2::GenericResource 36class DummyResource : public Sink::GenericResource
37{ 37{
38public: 38public:
39 DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer<Akonadi2::Pipeline> &pipeline = QSharedPointer<Akonadi2::Pipeline>()); 39 DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer<Sink::Pipeline> &pipeline = QSharedPointer<Sink::Pipeline>());
40 KAsync::Job<void> synchronizeWithSource(Akonadi2::Storage &mainStore, Akonadi2::Storage &synchronizationStore) Q_DECL_OVERRIDE; 40 KAsync::Job<void> synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore) Q_DECL_OVERRIDE;
41 using GenericResource::synchronizeWithSource; 41 using GenericResource::synchronizeWithSource;
42 static void removeFromDisk(const QByteArray &instanceIdentifier); 42 static void removeFromDisk(const QByteArray &instanceIdentifier);
43 KAsync::Job<void> inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) Q_DECL_OVERRIDE; 43 KAsync::Job<void> inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) Q_DECL_OVERRIDE;
44private: 44private:
45 KAsync::Job<void> replay(Akonadi2::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE; 45 KAsync::Job<void> replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE;
46 Akonadi2::ApplicationDomain::Event::Ptr createEvent(const QByteArray &rid, const QMap<QString, QVariant> &data, Akonadi2::Storage::Transaction &); 46 Sink::ApplicationDomain::Event::Ptr createEvent(const QByteArray &rid, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &);
47 Akonadi2::ApplicationDomain::Mail::Ptr createMail(const QByteArray &rid, const QMap<QString, QVariant> &data, Akonadi2::Storage::Transaction &); 47 Sink::ApplicationDomain::Mail::Ptr createMail(const QByteArray &rid, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &);
48 Akonadi2::ApplicationDomain::Folder::Ptr createFolder(const QByteArray &rid, const QMap<QString, QVariant> &data, Akonadi2::Storage::Transaction &); 48 Sink::ApplicationDomain::Folder::Ptr createFolder(const QByteArray &rid, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &);
49 void synchronize(const QByteArray &bufferType, const QMap<QString, QMap<QString, QVariant> > &data, Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, std::function<Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Akonadi2::Storage::Transaction &)> createEntity); 49 void synchronize(const QByteArray &bufferType, const QMap<QString, QMap<QString, QVariant> > &data, Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, std::function<Sink::ApplicationDomain::ApplicationDomainType::Ptr(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &)> createEntity);
50 50
51 QSharedPointer<DummyEventAdaptorFactory> mEventAdaptorFactory; 51 QSharedPointer<DummyEventAdaptorFactory> mEventAdaptorFactory;
52 QSharedPointer<DummyMailAdaptorFactory> mMailAdaptorFactory; 52 QSharedPointer<DummyMailAdaptorFactory> mMailAdaptorFactory;
53 QSharedPointer<DummyFolderAdaptorFactory> mFolderAdaptorFactory; 53 QSharedPointer<DummyFolderAdaptorFactory> mFolderAdaptorFactory;
54}; 54};
55 55
56class DummyResourceFactory : public Akonadi2::ResourceFactory 56class DummyResourceFactory : public Sink::ResourceFactory
57{ 57{
58 Q_OBJECT 58 Q_OBJECT
59 Q_PLUGIN_METADATA(IID "org.kde.dummy") 59 Q_PLUGIN_METADATA(IID "org.kde.dummy")
60 Q_INTERFACES(Akonadi2::ResourceFactory) 60 Q_INTERFACES(Sink::ResourceFactory)
61 61
62public: 62public:
63 DummyResourceFactory(QObject *parent = 0); 63 DummyResourceFactory(QObject *parent = 0);
64 64
65 Akonadi2::Resource *createResource(const QByteArray &instanceIdentifier) Q_DECL_OVERRIDE; 65 Sink::Resource *createResource(const QByteArray &instanceIdentifier) Q_DECL_OVERRIDE;
66 void registerFacades(Akonadi2::FacadeFactory &factory) Q_DECL_OVERRIDE; 66 void registerFacades(Sink::FacadeFactory &factory) Q_DECL_OVERRIDE;
67}; 67};
68 68
diff --git a/examples/maildirresource/CMakeLists.txt b/examples/maildirresource/CMakeLists.txt
index 2340cf6..baacd44 100644
--- a/examples/maildirresource/CMakeLists.txt
+++ b/examples/maildirresource/CMakeLists.txt
@@ -1,4 +1,4 @@
1project(akonadi2_resource_maildir) 1project(sink_resource_maildir)
2 2
3add_definitions(-DQT_PLUGIN) 3add_definitions(-DQT_PLUGIN)
4include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) 4include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
@@ -8,8 +8,8 @@ find_package(KF5 COMPONENTS REQUIRED Mime)
8add_library(${PROJECT_NAME} SHARED facade.cpp maildirresource.cpp domainadaptor.cpp) 8add_library(${PROJECT_NAME} SHARED facade.cpp maildirresource.cpp domainadaptor.cpp)
9# generate_flatbuffers(${PROJECT_NAME} dummycalendar) 9# generate_flatbuffers(${PROJECT_NAME} dummycalendar)
10qt5_use_modules(${PROJECT_NAME} Core Network) 10qt5_use_modules(${PROJECT_NAME} Core Network)
11target_link_libraries(${PROJECT_NAME} akonadi2common maildir KF5::Mime) 11target_link_libraries(${PROJECT_NAME} sinkcommon maildir KF5::Mime)
12 12
13install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${AKONADI2_RESOURCE_PLUGINS_PATH}) 13install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
14 14
15add_subdirectory(libmaildir) 15add_subdirectory(libmaildir)
diff --git a/examples/maildirresource/domainadaptor.h b/examples/maildirresource/domainadaptor.h
index 0fc7108..700d2e5 100644
--- a/examples/maildirresource/domainadaptor.h
+++ b/examples/maildirresource/domainadaptor.h
@@ -23,14 +23,14 @@
23#include "folder_generated.h" 23#include "folder_generated.h"
24#include "dummy_generated.h" 24#include "dummy_generated.h"
25 25
26class MaildirMailAdaptorFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Mail, Akonadi2::ApplicationDomain::Buffer::Dummy, Akonadi2::ApplicationDomain::Buffer::DummyBuilder> 26class MaildirMailAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Mail, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
27{ 27{
28public: 28public:
29 MaildirMailAdaptorFactory(); 29 MaildirMailAdaptorFactory();
30 virtual ~MaildirMailAdaptorFactory() {}; 30 virtual ~MaildirMailAdaptorFactory() {};
31}; 31};
32 32
33class MaildirFolderAdaptorFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Folder, Akonadi2::ApplicationDomain::Buffer::Dummy, Akonadi2::ApplicationDomain::Buffer::DummyBuilder> 33class MaildirFolderAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Folder, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
34{ 34{
35public: 35public:
36 MaildirFolderAdaptorFactory(); 36 MaildirFolderAdaptorFactory();
diff --git a/examples/maildirresource/facade.cpp b/examples/maildirresource/facade.cpp
index 3cf3fde..7178ab9 100644
--- a/examples/maildirresource/facade.cpp
+++ b/examples/maildirresource/facade.cpp
@@ -22,7 +22,7 @@
22#include "domainadaptor.h" 22#include "domainadaptor.h"
23 23
24MaildirResourceMailFacade::MaildirResourceMailFacade(const QByteArray &instanceIdentifier) 24MaildirResourceMailFacade::MaildirResourceMailFacade(const QByteArray &instanceIdentifier)
25 : Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Mail>(instanceIdentifier, QSharedPointer<MaildirMailAdaptorFactory>::create()) 25 : Sink::GenericFacade<Sink::ApplicationDomain::Mail>(instanceIdentifier, QSharedPointer<MaildirMailAdaptorFactory>::create())
26{ 26{
27} 27}
28 28
@@ -32,7 +32,7 @@ MaildirResourceMailFacade::~MaildirResourceMailFacade()
32 32
33 33
34MaildirResourceFolderFacade::MaildirResourceFolderFacade(const QByteArray &instanceIdentifier) 34MaildirResourceFolderFacade::MaildirResourceFolderFacade(const QByteArray &instanceIdentifier)
35 : Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Folder>(instanceIdentifier, QSharedPointer<MaildirFolderAdaptorFactory>::create()) 35 : Sink::GenericFacade<Sink::ApplicationDomain::Folder>(instanceIdentifier, QSharedPointer<MaildirFolderAdaptorFactory>::create())
36{ 36{
37} 37}
38 38
diff --git a/examples/maildirresource/facade.h b/examples/maildirresource/facade.h
index 80f0d06..a243b0d 100644
--- a/examples/maildirresource/facade.h
+++ b/examples/maildirresource/facade.h
@@ -21,14 +21,14 @@
21 21
22#include "common/facade.h" 22#include "common/facade.h"
23 23
24class MaildirResourceMailFacade : public Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Mail> 24class MaildirResourceMailFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Mail>
25{ 25{
26public: 26public:
27 MaildirResourceMailFacade(const QByteArray &instanceIdentifier); 27 MaildirResourceMailFacade(const QByteArray &instanceIdentifier);
28 virtual ~MaildirResourceMailFacade(); 28 virtual ~MaildirResourceMailFacade();
29}; 29};
30 30
31class MaildirResourceFolderFacade : public Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Folder> 31class MaildirResourceFolderFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Folder>
32{ 32{
33public: 33public:
34 MaildirResourceFolderFacade(const QByteArray &instanceIdentifier); 34 MaildirResourceFolderFacade(const QByteArray &instanceIdentifier);
diff --git a/examples/maildirresource/libmaildir/maildir.cpp b/examples/maildirresource/libmaildir/maildir.cpp
index 28cf46e..3d4630f 100644
--- a/examples/maildirresource/libmaildir/maildir.cpp
+++ b/examples/maildirresource/libmaildir/maildir.cpp
@@ -688,7 +688,7 @@ bool Maildir::removeEntry(const QString& key)
688 // return QFile::remove(realKey); 688 // return QFile::remove(realKey);
689} 689}
690 690
691// QString Maildir::changeEntryFlags(const QString& key, const Akonadi::Item::Flags& flags) 691// QString Maildir::changeEntryFlags(const QString& key, const Sink::Item::Flags& flags)
692// { 692// {
693// QString realKey(d->findRealKey(key)); 693// QString realKey(d->findRealKey(key));
694// if (realKey.isEmpty()) { 694// if (realKey.isEmpty()) {
@@ -701,16 +701,16 @@ bool Maildir::removeEntry(const QString& key)
701// QString finalKey = key.left(key.indexOf(rx)); 701// QString finalKey = key.left(key.indexOf(rx));
702// 702//
703// QStringList mailDirFlags; 703// QStringList mailDirFlags;
704// Q_FOREACH (const Akonadi::Item::Flag &flag, flags) { 704// Q_FOREACH (const Sink::Item::Flag &flag, flags) {
705// if (flag == Akonadi::MessageFlags::Forwarded) 705// if (flag == Sink::MessageFlags::Forwarded)
706// mailDirFlags << QLatin1String("P"); 706// mailDirFlags << QLatin1String("P");
707// if (flag == Akonadi::MessageFlags::Replied) 707// if (flag == Sink::MessageFlags::Replied)
708// mailDirFlags << QLatin1String("R"); 708// mailDirFlags << QLatin1String("R");
709// if (flag == Akonadi::MessageFlags::Seen) 709// if (flag == Sink::MessageFlags::Seen)
710// mailDirFlags << QLatin1String("S"); 710// mailDirFlags << QLatin1String("S");
711// if (flag == Akonadi::MessageFlags::Deleted) 711// if (flag == Sink::MessageFlags::Deleted)
712// mailDirFlags << QLatin1String("T"); 712// mailDirFlags << QLatin1String("T");
713// if (flag == Akonadi::MessageFlags::Flagged) 713// if (flag == Sink::MessageFlags::Flagged)
714// mailDirFlags << QLatin1String("F"); 714// mailDirFlags << QLatin1String("F");
715// } 715// }
716// mailDirFlags.sort(); 716// mailDirFlags.sort();
@@ -726,7 +726,7 @@ bool Maildir::removeEntry(const QString& key)
726// finalKey.prepend(d->path + QString::fromLatin1("/cur/")); 726// finalKey.prepend(d->path + QString::fromLatin1("/cur/"));
727// 727//
728// if (realKey == finalKey) { 728// if (realKey == finalKey) {
729// // Somehow it already is named this way (e.g. migration bug -> wrong status in akonadi) 729// // Somehow it already is named this way (e.g. migration bug -> wrong status in sink)
730// return newUniqueKey; 730// return newUniqueKey;
731// } 731// }
732// 732//
diff --git a/examples/maildirresource/libmaildir/maildir.h b/examples/maildirresource/libmaildir/maildir.h
index fefd5a7..a89a832 100644
--- a/examples/maildirresource/libmaildir/maildir.h
+++ b/examples/maildirresource/libmaildir/maildir.h
@@ -211,7 +211,7 @@ public:
211 * Change the flags for an entry specified by @p key. Returns the new key of the entry (the key might change because 211 * Change the flags for an entry specified by @p key. Returns the new key of the entry (the key might change because
212 * flags are stored in the unique filename). 212 * flags are stored in the unique filename).
213 */ 213 */
214 // QString changeEntryFlags( const QString& key, const Akonadi::Item::Flags& flags ); 214 // QString changeEntryFlags( const QString& key, const Sink::Item::Flags& flags );
215 215
216 /** 216 /**
217 * Moves this maildir into @p destination. 217 * Moves this maildir into @p destination.
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 9280bdc..33883a7 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -46,15 +46,15 @@
46#define ENTITY_TYPE_MAIL "mail" 46#define ENTITY_TYPE_MAIL "mail"
47#define ENTITY_TYPE_FOLDER "folder" 47#define ENTITY_TYPE_FOLDER "folder"
48 48
49MaildirResource::MaildirResource(const QByteArray &instanceIdentifier, const QSharedPointer<Akonadi2::Pipeline> &pipeline) 49MaildirResource::MaildirResource(const QByteArray &instanceIdentifier, const QSharedPointer<Sink::Pipeline> &pipeline)
50 : Akonadi2::GenericResource(instanceIdentifier, pipeline), 50 : Sink::GenericResource(instanceIdentifier, pipeline),
51 mMailAdaptorFactory(QSharedPointer<MaildirMailAdaptorFactory>::create()), 51 mMailAdaptorFactory(QSharedPointer<MaildirMailAdaptorFactory>::create()),
52 mFolderAdaptorFactory(QSharedPointer<MaildirFolderAdaptorFactory>::create()) 52 mFolderAdaptorFactory(QSharedPointer<MaildirFolderAdaptorFactory>::create())
53{ 53{
54 addType(ENTITY_TYPE_MAIL, mMailAdaptorFactory, 54 addType(ENTITY_TYPE_MAIL, mMailAdaptorFactory,
55 QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Mail>); 55 QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Mail>);
56 addType(ENTITY_TYPE_FOLDER, mFolderAdaptorFactory, 56 addType(ENTITY_TYPE_FOLDER, mFolderAdaptorFactory,
57 QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Folder>); 57 QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Folder>);
58 auto config = ResourceConfig::getConfiguration(instanceIdentifier); 58 auto config = ResourceConfig::getConfiguration(instanceIdentifier);
59 mMaildirPath = QDir::cleanPath(QDir::fromNativeSeparators(config.value("path").toString())); 59 mMaildirPath = QDir::cleanPath(QDir::fromNativeSeparators(config.value("path").toString()));
60 //Chop a trailing slash if necessary 60 //Chop a trailing slash if necessary
@@ -91,7 +91,7 @@ QStringList MaildirResource::listAvailableFolders()
91 return folderList; 91 return folderList;
92} 92}
93 93
94void MaildirResource::synchronizeFolders(Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction) 94void MaildirResource::synchronizeFolders(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction)
95{ 95{
96 const QByteArray bufferType = ENTITY_TYPE_FOLDER; 96 const QByteArray bufferType = ENTITY_TYPE_FOLDER;
97 QStringList folderList = listAvailableFolders(); 97 QStringList folderList = listAvailableFolders();
@@ -102,7 +102,7 @@ void MaildirResource::synchronizeFolders(Akonadi2::Storage::Transaction &transac
102 //TODO Instead of iterating over all entries in the database, which can also pick up the same item multiple times, 102 //TODO Instead of iterating over all entries in the database, which can also pick up the same item multiple times,
103 //we should rather iterate over an index that contains every uid exactly once. The remoteId index would be such an index, 103 //we should rather iterate over an index that contains every uid exactly once. The remoteId index would be such an index,
104 //but we currently fail to iterate over all entries in an index it seems. 104 //but we currently fail to iterate over all entries in an index it seems.
105 // auto remoteIds = synchronizationTransaction.openDatabase("rid.mapping." + bufferType, std::function<void(const Akonadi2::Storage::Error &)>(), true); 105 // auto remoteIds = synchronizationTransaction.openDatabase("rid.mapping." + bufferType, std::function<void(const Sink::Storage::Error &)>(), true);
106 auto mainDatabase = transaction.openDatabase(bufferType + ".main"); 106 auto mainDatabase = transaction.openDatabase(bufferType + ".main");
107 mainDatabase.scan("", [&](const QByteArray &key, const QByteArray &) { 107 mainDatabase.scan("", [&](const QByteArray &key, const QByteArray &) {
108 callback(key); 108 callback(key);
@@ -119,7 +119,7 @@ void MaildirResource::synchronizeFolders(Akonadi2::Storage::Transaction &transac
119 Trace() << "Processing folder " << remoteId; 119 Trace() << "Processing folder " << remoteId;
120 KPIM::Maildir md(folderPath, folderPath == mMaildirPath); 120 KPIM::Maildir md(folderPath, folderPath == mMaildirPath);
121 121
122 Akonadi2::ApplicationDomain::Folder folder; 122 Sink::ApplicationDomain::Folder folder;
123 folder.setProperty("name", md.name()); 123 folder.setProperty("name", md.name());
124 folder.setProperty("icon", "folder"); 124 folder.setProperty("icon", "folder");
125 if (!md.isRoot()) { 125 if (!md.isRoot()) {
@@ -129,7 +129,7 @@ void MaildirResource::synchronizeFolders(Akonadi2::Storage::Transaction &transac
129 } 129 }
130} 130}
131 131
132void MaildirResource::synchronizeMails(Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction, const QString &path) 132void MaildirResource::synchronizeMails(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, const QString &path)
133{ 133{
134 Trace() << "Synchronizing mails" << path; 134 Trace() << "Synchronizing mails" << path;
135 const QByteArray bufferType = ENTITY_TYPE_MAIL; 135 const QByteArray bufferType = ENTITY_TYPE_MAIL;
@@ -150,8 +150,8 @@ void MaildirResource::synchronizeMails(Akonadi2::Storage::Transaction &transacti
150 scanForRemovals(transaction, synchronizationTransaction, bufferType, 150 scanForRemovals(transaction, synchronizationTransaction, bufferType,
151 [&](const std::function<void(const QByteArray &)> &callback) { 151 [&](const std::function<void(const QByteArray &)> &callback) {
152 Index index(bufferType + ".index." + property, transaction); 152 Index index(bufferType + ".index." + property, transaction);
153 index.lookup(folderLocalId, [&](const QByteArray &akonadiId) { 153 index.lookup(folderLocalId, [&](const QByteArray &sinkId) {
154 callback(akonadiId); 154 callback(sinkId);
155 }, 155 },
156 [&](const Index::Error &error) { 156 [&](const Index::Error &error) {
157 Warning() << "Error in index: " << error.message << property; 157 Warning() << "Error in index: " << error.message << property;
@@ -175,7 +175,7 @@ void MaildirResource::synchronizeMails(Akonadi2::Storage::Transaction &transacti
175 175
176 Trace() << "Found a mail " << filePath << " : " << fileName << msg->subject(true)->asUnicodeString(); 176 Trace() << "Found a mail " << filePath << " : " << fileName << msg->subject(true)->asUnicodeString();
177 177
178 Akonadi2::ApplicationDomain::Mail mail; 178 Sink::ApplicationDomain::Mail mail;
179 mail.setProperty("subject", msg->subject(true)->asUnicodeString()); 179 mail.setProperty("subject", msg->subject(true)->asUnicodeString());
180 mail.setProperty("sender", msg->from(true)->asUnicodeString()); 180 mail.setProperty("sender", msg->from(true)->asUnicodeString());
181 mail.setProperty("senderName", msg->from(true)->asUnicodeString()); 181 mail.setProperty("senderName", msg->from(true)->asUnicodeString());
@@ -189,19 +189,19 @@ void MaildirResource::synchronizeMails(Akonadi2::Storage::Transaction &transacti
189 } 189 }
190} 190}
191 191
192KAsync::Job<void> MaildirResource::synchronizeWithSource(Akonadi2::Storage &mainStore, Akonadi2::Storage &synchronizationStore) 192KAsync::Job<void> MaildirResource::synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore)
193{ 193{
194 Log() << " Synchronizing"; 194 Log() << " Synchronizing";
195 return KAsync::start<void>([this, &mainStore, &synchronizationStore]() { 195 return KAsync::start<void>([this, &mainStore, &synchronizationStore]() {
196 auto transaction = mainStore.createTransaction(Akonadi2::Storage::ReadOnly); 196 auto transaction = mainStore.createTransaction(Sink::Storage::ReadOnly);
197 { 197 {
198 auto synchronizationTransaction = synchronizationStore.createTransaction(Akonadi2::Storage::ReadWrite); 198 auto synchronizationTransaction = synchronizationStore.createTransaction(Sink::Storage::ReadWrite);
199 synchronizeFolders(transaction, synchronizationTransaction); 199 synchronizeFolders(transaction, synchronizationTransaction);
200 //The next sync needs the folders available 200 //The next sync needs the folders available
201 synchronizationTransaction.commit(); 201 synchronizationTransaction.commit();
202 } 202 }
203 for (const auto &folder : listAvailableFolders()) { 203 for (const auto &folder : listAvailableFolders()) {
204 auto synchronizationTransaction = synchronizationStore.createTransaction(Akonadi2::Storage::ReadWrite); 204 auto synchronizationTransaction = synchronizationStore.createTransaction(Sink::Storage::ReadWrite);
205 synchronizeMails(transaction, synchronizationTransaction, folder); 205 synchronizeMails(transaction, synchronizationTransaction, folder);
206 //Don't let the transaction grow too much 206 //Don't let the transaction grow too much
207 synchronizationTransaction.commit(); 207 synchronizationTransaction.commit();
@@ -210,23 +210,23 @@ KAsync::Job<void> MaildirResource::synchronizeWithSource(Akonadi2::Storage &main
210 }); 210 });
211} 211}
212 212
213KAsync::Job<void> MaildirResource::replay(Akonadi2::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) 213KAsync::Job<void> MaildirResource::replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value)
214{ 214{
215 auto synchronizationTransaction = synchronizationStore.createTransaction(Akonadi2::Storage::ReadWrite); 215 auto synchronizationTransaction = synchronizationStore.createTransaction(Sink::Storage::ReadWrite);
216 216
217 Trace() << "Replaying " << key << type; 217 Trace() << "Replaying " << key << type;
218 if (type == ENTITY_TYPE_FOLDER) { 218 if (type == ENTITY_TYPE_FOLDER) {
219 Akonadi2::EntityBuffer buffer(value.data(), value.size()); 219 Sink::EntityBuffer buffer(value.data(), value.size());
220 const Akonadi2::Entity &entity = buffer.entity(); 220 const Sink::Entity &entity = buffer.entity();
221 const auto metadataBuffer = Akonadi2::EntityBuffer::readBuffer<Akonadi2::Metadata>(entity.metadata()); 221 const auto metadataBuffer = Sink::EntityBuffer::readBuffer<Sink::Metadata>(entity.metadata());
222 if (metadataBuffer && !metadataBuffer->replayToSource()) { 222 if (metadataBuffer && !metadataBuffer->replayToSource()) {
223 Trace() << "Change is coming from the source"; 223 Trace() << "Change is coming from the source";
224 return KAsync::null<void>(); 224 return KAsync::null<void>();
225 } 225 }
226 const qint64 revision = metadataBuffer ? metadataBuffer->revision() : -1; 226 const qint64 revision = metadataBuffer ? metadataBuffer->revision() : -1;
227 const auto operation = metadataBuffer ? metadataBuffer->operation() : Akonadi2::Operation_Creation; 227 const auto operation = metadataBuffer ? metadataBuffer->operation() : Sink::Operation_Creation;
228 if (operation == Akonadi2::Operation_Creation) { 228 if (operation == Sink::Operation_Creation) {
229 const Akonadi2::ApplicationDomain::Folder folder(mResourceInstanceIdentifier, Akonadi2::Storage::uidFromKey(key), revision, mFolderAdaptorFactory->createAdaptor(entity)); 229 const Sink::ApplicationDomain::Folder folder(mResourceInstanceIdentifier, Sink::Storage::uidFromKey(key), revision, mFolderAdaptorFactory->createAdaptor(entity));
230 auto folderName = folder.getProperty("name").toString(); 230 auto folderName = folder.getProperty("name").toString();
231 //TODO handle non toplevel folders 231 //TODO handle non toplevel folders
232 auto path = mMaildirPath + "/" + folderName; 232 auto path = mMaildirPath + "/" + folderName;
@@ -234,31 +234,31 @@ KAsync::Job<void> MaildirResource::replay(Akonadi2::Storage &synchronizationStor
234 KPIM::Maildir maildir(path, false); 234 KPIM::Maildir maildir(path, false);
235 maildir.create(); 235 maildir.create();
236 recordRemoteId(ENTITY_TYPE_FOLDER, folder.identifier(), path.toUtf8(), synchronizationTransaction); 236 recordRemoteId(ENTITY_TYPE_FOLDER, folder.identifier(), path.toUtf8(), synchronizationTransaction);
237 } else if (operation == Akonadi2::Operation_Removal) { 237 } else if (operation == Sink::Operation_Removal) {
238 const auto uid = Akonadi2::Storage::uidFromKey(key); 238 const auto uid = Sink::Storage::uidFromKey(key);
239 const auto remoteId = resolveLocalId(ENTITY_TYPE_FOLDER, uid, synchronizationTransaction); 239 const auto remoteId = resolveLocalId(ENTITY_TYPE_FOLDER, uid, synchronizationTransaction);
240 const auto path = remoteId; 240 const auto path = remoteId;
241 Trace() << "Removing a folder: " << path; 241 Trace() << "Removing a folder: " << path;
242 KPIM::Maildir maildir(path, false); 242 KPIM::Maildir maildir(path, false);
243 maildir.remove(); 243 maildir.remove();
244 removeRemoteId(ENTITY_TYPE_FOLDER, uid, remoteId, synchronizationTransaction); 244 removeRemoteId(ENTITY_TYPE_FOLDER, uid, remoteId, synchronizationTransaction);
245 } else if (operation == Akonadi2::Operation_Modification) { 245 } else if (operation == Sink::Operation_Modification) {
246 Warning() << "Folder modifications are not implemented"; 246 Warning() << "Folder modifications are not implemented";
247 } else { 247 } else {
248 Warning() << "Unkown operation" << operation; 248 Warning() << "Unkown operation" << operation;
249 } 249 }
250 } else if (type == ENTITY_TYPE_MAIL) { 250 } else if (type == ENTITY_TYPE_MAIL) {
251 Akonadi2::EntityBuffer buffer(value.data(), value.size()); 251 Sink::EntityBuffer buffer(value.data(), value.size());
252 const Akonadi2::Entity &entity = buffer.entity(); 252 const Sink::Entity &entity = buffer.entity();
253 const auto metadataBuffer = Akonadi2::EntityBuffer::readBuffer<Akonadi2::Metadata>(entity.metadata()); 253 const auto metadataBuffer = Sink::EntityBuffer::readBuffer<Sink::Metadata>(entity.metadata());
254 if (metadataBuffer && !metadataBuffer->replayToSource()) { 254 if (metadataBuffer && !metadataBuffer->replayToSource()) {
255 Trace() << "Change is coming from the source"; 255 Trace() << "Change is coming from the source";
256 return KAsync::null<void>(); 256 return KAsync::null<void>();
257 } 257 }
258 const qint64 revision = metadataBuffer ? metadataBuffer->revision() : -1; 258 const qint64 revision = metadataBuffer ? metadataBuffer->revision() : -1;
259 const auto operation = metadataBuffer ? metadataBuffer->operation() : Akonadi2::Operation_Creation; 259 const auto operation = metadataBuffer ? metadataBuffer->operation() : Sink::Operation_Creation;
260 if (operation == Akonadi2::Operation_Creation) { 260 if (operation == Sink::Operation_Creation) {
261 const Akonadi2::ApplicationDomain::Mail mail(mResourceInstanceIdentifier, Akonadi2::Storage::uidFromKey(key), revision, mMailAdaptorFactory->createAdaptor(entity)); 261 const Sink::ApplicationDomain::Mail mail(mResourceInstanceIdentifier, Sink::Storage::uidFromKey(key), revision, mMailAdaptorFactory->createAdaptor(entity));
262 auto parentFolder = mail.getProperty("folder").toByteArray(); 262 auto parentFolder = mail.getProperty("folder").toByteArray();
263 QByteArray parentFolderRemoteId; 263 QByteArray parentFolderRemoteId;
264 if (!parentFolder.isEmpty()) { 264 if (!parentFolder.isEmpty()) {
@@ -272,13 +272,13 @@ KAsync::Job<void> MaildirResource::replay(Akonadi2::Storage &synchronizationStor
272 const auto id = maildir.addEntry("foobar"); 272 const auto id = maildir.addEntry("foobar");
273 Trace() << "Creating a new mail: " << id; 273 Trace() << "Creating a new mail: " << id;
274 recordRemoteId(ENTITY_TYPE_MAIL, mail.identifier(), id.toUtf8(), synchronizationTransaction); 274 recordRemoteId(ENTITY_TYPE_MAIL, mail.identifier(), id.toUtf8(), synchronizationTransaction);
275 } else if (operation == Akonadi2::Operation_Removal) { 275 } else if (operation == Sink::Operation_Removal) {
276 const auto uid = Akonadi2::Storage::uidFromKey(key); 276 const auto uid = Sink::Storage::uidFromKey(key);
277 const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, uid, synchronizationTransaction); 277 const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, uid, synchronizationTransaction);
278 Trace() << "Removing a mail: " << remoteId; 278 Trace() << "Removing a mail: " << remoteId;
279 QFile::remove(remoteId); 279 QFile::remove(remoteId);
280 removeRemoteId(ENTITY_TYPE_MAIL, uid, remoteId, synchronizationTransaction); 280 removeRemoteId(ENTITY_TYPE_MAIL, uid, remoteId, synchronizationTransaction);
281 } else if (operation == Akonadi2::Operation_Modification) { 281 } else if (operation == Sink::Operation_Modification) {
282 Warning() << "Mail modifications are not implemented"; 282 Warning() << "Mail modifications are not implemented";
283 } else { 283 } else {
284 Warning() << "Unkown operation" << operation; 284 Warning() << "Unkown operation" << operation;
@@ -290,16 +290,16 @@ KAsync::Job<void> MaildirResource::replay(Akonadi2::Storage &synchronizationStor
290void MaildirResource::removeFromDisk(const QByteArray &instanceIdentifier) 290void MaildirResource::removeFromDisk(const QByteArray &instanceIdentifier)
291{ 291{
292 GenericResource::removeFromDisk(instanceIdentifier); 292 GenericResource::removeFromDisk(instanceIdentifier);
293 Akonadi2::Storage(Akonadi2::storageLocation(), instanceIdentifier + ".synchronization", Akonadi2::Storage::ReadWrite).removeFromDisk(); 293 Sink::Storage(Sink::storageLocation(), instanceIdentifier + ".synchronization", Sink::Storage::ReadWrite).removeFromDisk();
294} 294}
295 295
296KAsync::Job<void> MaildirResource::inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) 296KAsync::Job<void> MaildirResource::inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue)
297{ 297{
298 auto synchronizationStore = QSharedPointer<Akonadi2::Storage>::create(Akonadi2::storageLocation(), mResourceInstanceIdentifier + ".synchronization", Akonadi2::Storage::ReadOnly); 298 auto synchronizationStore = QSharedPointer<Sink::Storage>::create(Sink::storageLocation(), mResourceInstanceIdentifier + ".synchronization", Sink::Storage::ReadOnly);
299 auto synchronizationTransaction = synchronizationStore->createTransaction(Akonadi2::Storage::ReadOnly); 299 auto synchronizationTransaction = synchronizationStore->createTransaction(Sink::Storage::ReadOnly);
300 Trace() << "Inspecting " << inspectionType << domainType << entityId << property << expectedValue; 300 Trace() << "Inspecting " << inspectionType << domainType << entityId << property << expectedValue;
301 if (domainType == ENTITY_TYPE_MAIL) { 301 if (domainType == ENTITY_TYPE_MAIL) {
302 if (inspectionType == Akonadi2::Resources::Inspection::PropertyInspectionType) { 302 if (inspectionType == Sink::Resources::Inspection::PropertyInspectionType) {
303 if (property == "unread") { 303 if (property == "unread") {
304 const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, entityId, synchronizationTransaction); 304 const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, entityId, synchronizationTransaction);
305 const auto flags = KPIM::Maildir::readEntryFlags(remoteId.split('/').last()); 305 const auto flags = KPIM::Maildir::readEntryFlags(remoteId.split('/').last());
@@ -312,7 +312,7 @@ KAsync::Job<void> MaildirResource::inspect(int inspectionType, const QByteArray
312 return KAsync::null<void>(); 312 return KAsync::null<void>();
313 } 313 }
314 } 314 }
315 if (inspectionType == Akonadi2::Resources::Inspection::ExistenceInspectionType) { 315 if (inspectionType == Sink::Resources::Inspection::ExistenceInspectionType) {
316 const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, entityId, synchronizationTransaction); 316 const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, entityId, synchronizationTransaction);
317 if (QFileInfo(remoteId).exists() != expectedValue.toBool()) { 317 if (QFileInfo(remoteId).exists() != expectedValue.toBool()) {
318 return KAsync::error<void>(1, "Wrong file existence: " + remoteId); 318 return KAsync::error<void>(1, "Wrong file existence: " + remoteId);
@@ -323,19 +323,19 @@ KAsync::Job<void> MaildirResource::inspect(int inspectionType, const QByteArray
323} 323}
324 324
325MaildirResourceFactory::MaildirResourceFactory(QObject *parent) 325MaildirResourceFactory::MaildirResourceFactory(QObject *parent)
326 : Akonadi2::ResourceFactory(parent) 326 : Sink::ResourceFactory(parent)
327{ 327{
328 328
329} 329}
330 330
331Akonadi2::Resource *MaildirResourceFactory::createResource(const QByteArray &instanceIdentifier) 331Sink::Resource *MaildirResourceFactory::createResource(const QByteArray &instanceIdentifier)
332{ 332{
333 return new MaildirResource(instanceIdentifier); 333 return new MaildirResource(instanceIdentifier);
334} 334}
335 335
336void MaildirResourceFactory::registerFacades(Akonadi2::FacadeFactory &factory) 336void MaildirResourceFactory::registerFacades(Sink::FacadeFactory &factory)
337{ 337{
338 factory.registerFacade<Akonadi2::ApplicationDomain::Mail, MaildirResourceMailFacade>(PLUGIN_NAME); 338 factory.registerFacade<Sink::ApplicationDomain::Mail, MaildirResourceMailFacade>(PLUGIN_NAME);
339 factory.registerFacade<Akonadi2::ApplicationDomain::Folder, MaildirResourceFolderFacade>(PLUGIN_NAME); 339 factory.registerFacade<Sink::ApplicationDomain::Folder, MaildirResourceFolderFacade>(PLUGIN_NAME);
340} 340}
341 341
diff --git a/examples/maildirresource/maildirresource.h b/examples/maildirresource/maildirresource.h
index 5f7795b..9af2f39 100644
--- a/examples/maildirresource/maildirresource.h
+++ b/examples/maildirresource/maildirresource.h
@@ -39,34 +39,34 @@ class MaildirFolderAdaptorFactory;
39 * files: full file path 39 * files: full file path
40 * directories: full directory path 40 * directories: full directory path
41 */ 41 */
42class MaildirResource : public Akonadi2::GenericResource 42class MaildirResource : public Sink::GenericResource
43{ 43{
44public: 44public:
45 MaildirResource(const QByteArray &instanceIdentifier, const QSharedPointer<Akonadi2::Pipeline> &pipeline = QSharedPointer<Akonadi2::Pipeline>()); 45 MaildirResource(const QByteArray &instanceIdentifier, const QSharedPointer<Sink::Pipeline> &pipeline = QSharedPointer<Sink::Pipeline>());
46 KAsync::Job<void> synchronizeWithSource(Akonadi2::Storage &mainStore, Akonadi2::Storage &synchronizationStore) Q_DECL_OVERRIDE; 46 KAsync::Job<void> synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore) Q_DECL_OVERRIDE;
47 KAsync::Job<void> inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) Q_DECL_OVERRIDE; 47 KAsync::Job<void> inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) Q_DECL_OVERRIDE;
48 static void removeFromDisk(const QByteArray &instanceIdentifier); 48 static void removeFromDisk(const QByteArray &instanceIdentifier);
49private: 49private:
50 KAsync::Job<void> replay(Akonadi2::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE; 50 KAsync::Job<void> replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE;
51 51
52 void synchronizeFolders(Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction); 52 void synchronizeFolders(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction);
53 void synchronizeMails(Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction, const QString &folder); 53 void synchronizeMails(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, const QString &folder);
54 QStringList listAvailableFolders(); 54 QStringList listAvailableFolders();
55 QString mMaildirPath; 55 QString mMaildirPath;
56 QSharedPointer<MaildirMailAdaptorFactory> mMailAdaptorFactory; 56 QSharedPointer<MaildirMailAdaptorFactory> mMailAdaptorFactory;
57 QSharedPointer<MaildirFolderAdaptorFactory> mFolderAdaptorFactory; 57 QSharedPointer<MaildirFolderAdaptorFactory> mFolderAdaptorFactory;
58}; 58};
59 59
60class MaildirResourceFactory : public Akonadi2::ResourceFactory 60class MaildirResourceFactory : public Sink::ResourceFactory
61{ 61{
62 Q_OBJECT 62 Q_OBJECT
63 Q_PLUGIN_METADATA(IID "org.kde.maildir") 63 Q_PLUGIN_METADATA(IID "org.kde.maildir")
64 Q_INTERFACES(Akonadi2::ResourceFactory) 64 Q_INTERFACES(Sink::ResourceFactory)
65 65
66public: 66public:
67 MaildirResourceFactory(QObject *parent = 0); 67 MaildirResourceFactory(QObject *parent = 0);
68 68
69 Akonadi2::Resource *createResource(const QByteArray &instanceIdentifier) Q_DECL_OVERRIDE; 69 Sink::Resource *createResource(const QByteArray &instanceIdentifier) Q_DECL_OVERRIDE;
70 void registerFacades(Akonadi2::FacadeFactory &factory) Q_DECL_OVERRIDE; 70 void registerFacades(Sink::FacadeFactory &factory) Q_DECL_OVERRIDE;
71}; 71};
72 72
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 17:23:46 +0000