From bdb01c2c068df326f5a8328ed1492ab1bea388c5 Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 20 Jan 2016 19:07:07 +0100 Subject: Renamed Akonadi2 to Sink (except for documentation). --- examples/client/CMakeLists.txt | 4 +- examples/client/main.cpp | 66 +++++++++--------- examples/dummyresource/CMakeLists.txt | 6 +- examples/dummyresource/domainadaptor.h | 6 +- examples/dummyresource/facade.cpp | 6 +- examples/dummyresource/facade.h | 6 +- examples/dummyresource/resourcefactory.cpp | 56 +++++++-------- examples/dummyresource/resourcefactory.h | 24 +++---- examples/maildirresource/CMakeLists.txt | 6 +- examples/maildirresource/domainadaptor.h | 4 +- examples/maildirresource/facade.cpp | 4 +- examples/maildirresource/facade.h | 4 +- examples/maildirresource/libmaildir/maildir.cpp | 16 ++--- examples/maildirresource/libmaildir/maildir.h | 2 +- examples/maildirresource/maildirresource.cpp | 90 ++++++++++++------------- examples/maildirresource/maildirresource.h | 20 +++--- 16 files changed, 160 insertions(+), 160 deletions(-) (limited to 'examples') 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 @@ -project(akonadi2_client) +project(sink_client) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) add_executable(${PROJECT_NAME} main.cpp console.cpp) -target_link_libraries(${PROJECT_NAME} akonadi2common) +target_link_libraries(${PROJECT_NAME} sinkcommon) qt5_use_modules(${PROJECT_NAME} Widgets Network) install(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 @@ #include /** - * A small abstraction layer to use the akonadi store with the type available as string. + * A small abstraction layer to use the sink store with the type available as string. */ class StoreBase { public: - virtual Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr getObject() = 0; - virtual Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr getObject(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier = QByteArray()) = 0; - virtual KAsync::Job create(const Akonadi2::ApplicationDomain::ApplicationDomainType &type) = 0; - virtual KAsync::Job modify(const Akonadi2::ApplicationDomain::ApplicationDomainType &type) = 0; - virtual KAsync::Job remove(const Akonadi2::ApplicationDomain::ApplicationDomainType &type) = 0; - virtual QSharedPointer loadModel(const Akonadi2::Query &query) = 0; + virtual Sink::ApplicationDomain::ApplicationDomainType::Ptr getObject() = 0; + virtual Sink::ApplicationDomain::ApplicationDomainType::Ptr getObject(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier = QByteArray()) = 0; + virtual KAsync::Job create(const Sink::ApplicationDomain::ApplicationDomainType &type) = 0; + virtual KAsync::Job modify(const Sink::ApplicationDomain::ApplicationDomainType &type) = 0; + virtual KAsync::Job remove(const Sink::ApplicationDomain::ApplicationDomainType &type) = 0; + virtual QSharedPointer loadModel(const Sink::Query &query) = 0; }; template class Store : public StoreBase { public: - Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr getObject() Q_DECL_OVERRIDE { + Sink::ApplicationDomain::ApplicationDomainType::Ptr getObject() Q_DECL_OVERRIDE { return T::Ptr::create(); } - Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr getObject(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier = QByteArray()) Q_DECL_OVERRIDE { - return T::Ptr::create(resourceInstanceIdentifier, identifier, 0, QSharedPointer::create()); + Sink::ApplicationDomain::ApplicationDomainType::Ptr getObject(const QByteArray &resourceInstanceIdentifier, const QByteArray &identifier = QByteArray()) Q_DECL_OVERRIDE { + return T::Ptr::create(resourceInstanceIdentifier, identifier, 0, QSharedPointer::create()); } - KAsync::Job create(const Akonadi2::ApplicationDomain::ApplicationDomainType &type) Q_DECL_OVERRIDE { - return Akonadi2::Store::create(*static_cast(&type)); + KAsync::Job create(const Sink::ApplicationDomain::ApplicationDomainType &type) Q_DECL_OVERRIDE { + return Sink::Store::create(*static_cast(&type)); } - KAsync::Job modify(const Akonadi2::ApplicationDomain::ApplicationDomainType &type) Q_DECL_OVERRIDE { - return Akonadi2::Store::modify(*static_cast(&type)); + KAsync::Job modify(const Sink::ApplicationDomain::ApplicationDomainType &type) Q_DECL_OVERRIDE { + return Sink::Store::modify(*static_cast(&type)); } - KAsync::Job remove(const Akonadi2::ApplicationDomain::ApplicationDomainType &type) Q_DECL_OVERRIDE { - return Akonadi2::Store::remove(*static_cast(&type)); + KAsync::Job remove(const Sink::ApplicationDomain::ApplicationDomainType &type) Q_DECL_OVERRIDE { + return Sink::Store::remove(*static_cast(&type)); } - QSharedPointer loadModel(const Akonadi2::Query &query) Q_DECL_OVERRIDE { - return Akonadi2::Store::loadModel(query); + QSharedPointer loadModel(const Sink::Query &query) Q_DECL_OVERRIDE { + return Sink::Store::loadModel(query); } }; StoreBase& getStore(const QString &type) { if (type == "folder") { - static Store store; + static Store store; return store; } else if (type == "mail") { - static Store store; + static Store store; return store; } else if (type == "event") { - static Store store; + static Store store; return store; } else if (type == "resource") { - static Store store; + static Store store; return store; } Q_ASSERT(false); qWarning() << "Trying to get a store that doesn't exist, falling back to event"; - static Store store; + static Store store; return store; } @@ -118,17 +118,17 @@ public: auto syncButton = new QPushButton(this); syncButton->setText("Synchronize!"); QObject::connect(syncButton, &QPushButton::pressed, []() { - Akonadi2::Query query; + Sink::Query query; query.resources << "org.kde.dummy.instance1"; - Akonadi2::Store::synchronize(query).exec(); + Sink::Store::synchronize(query).exec(); }); auto removeButton = new QPushButton(this); removeButton->setText("Remove"); QObject::connect(removeButton, &QPushButton::pressed, [modelView]() { for (auto index : modelView->selectionModel()->selectedIndexes()) { - auto object = index.data(Akonadi2::Store::DomainObjectRole).value(); - Akonadi2::Store::remove(*object).exec(); + auto object = index.data(Sink::Store::DomainObjectRole).value(); + Sink::Store::remove(*object).exec(); } }); @@ -142,7 +142,7 @@ public: }; -static QSharedPointer loadModel(const QString &type, Akonadi2::Query query) +static QSharedPointer loadModel(const QString &type, Sink::Query query) { QTime time; time.start(); @@ -187,13 +187,13 @@ int main(int argc, char *argv[]) QStringList args = cliOptions.positionalArguments(); if (cliOptions.isSet("debuglevel")) { - Akonadi2::Log::setDebugOutputLevel(static_cast(cliOptions.value("debuglevel").toInt())); + Sink::Log::setDebugOutputLevel(static_cast(cliOptions.value("debuglevel").toInt())); } auto type = !args.isEmpty() ? args.takeFirst() : QByteArray(); auto resources = args; - Akonadi2::Query query; + Sink::Query query; for (const auto &res : resources) { query.resources << res.toLatin1(); } @@ -208,13 +208,13 @@ int main(int argc, char *argv[]) model->fetchMore(model->index(i, 0, index)); } }); - auto view = QSharedPointer >::create(model.data()); + auto view = QSharedPointer >::create(model.data()); app.exec(); } else if (type == "mail") { - auto view = QSharedPointer >::create(model.data()); + auto view = QSharedPointer >::create(model.data()); app.exec(); } else if (type == "event") { - auto view = QSharedPointer >::create(model.data()); + auto view = QSharedPointer >::create(model.data()); app.exec(); } 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 @@ -project(akonadi2_resource_dummy) +project(sink_resource_dummy) add_definitions(-DQT_PLUGIN) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) @@ -7,6 +7,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) add_library(${PROJECT_NAME} SHARED facade.cpp resourcefactory.cpp domainadaptor.cpp dummystore.cpp) generate_flatbuffers(${PROJECT_NAME} dummycalendar) qt5_use_modules(${PROJECT_NAME} Core Network) -target_link_libraries(${PROJECT_NAME} akonadi2common) +target_link_libraries(${PROJECT_NAME} sinkcommon) -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${AKONADI2_RESOURCE_PLUGINS_PATH}) +install(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 @@ #include "dummycalendar_generated.h" #include "entity_generated.h" -class DummyEventAdaptorFactory : public DomainTypeAdaptorFactory +class DummyEventAdaptorFactory : public DomainTypeAdaptorFactory { public: DummyEventAdaptorFactory(); virtual ~DummyEventAdaptorFactory() {}; }; -class DummyMailAdaptorFactory : public DomainTypeAdaptorFactory +class DummyMailAdaptorFactory : public DomainTypeAdaptorFactory { public: DummyMailAdaptorFactory(); virtual ~DummyMailAdaptorFactory() {}; }; -class DummyFolderAdaptorFactory : public DomainTypeAdaptorFactory +class DummyFolderAdaptorFactory : public DomainTypeAdaptorFactory { public: 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 @@ #include "domainadaptor.h" DummyResourceFacade::DummyResourceFacade(const QByteArray &instanceIdentifier) - : Akonadi2::GenericFacade(instanceIdentifier, QSharedPointer::create()) + : Sink::GenericFacade(instanceIdentifier, QSharedPointer::create()) { } @@ -32,7 +32,7 @@ DummyResourceFacade::~DummyResourceFacade() DummyResourceMailFacade::DummyResourceMailFacade(const QByteArray &instanceIdentifier) - : Akonadi2::GenericFacade(instanceIdentifier, QSharedPointer::create()) + : Sink::GenericFacade(instanceIdentifier, QSharedPointer::create()) { } @@ -42,7 +42,7 @@ DummyResourceMailFacade::~DummyResourceMailFacade() DummyResourceFolderFacade::DummyResourceFolderFacade(const QByteArray &instanceIdentifier) - : Akonadi2::GenericFacade(instanceIdentifier, QSharedPointer::create()) + : Sink::GenericFacade(instanceIdentifier, QSharedPointer::create()) { } 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 @@ #include "common/facade.h" #include "common/domain/event.h" -class DummyResourceFacade : public Akonadi2::GenericFacade +class DummyResourceFacade : public Sink::GenericFacade { public: DummyResourceFacade(const QByteArray &instanceIdentifier); virtual ~DummyResourceFacade(); }; -class DummyResourceMailFacade : public Akonadi2::GenericFacade +class DummyResourceMailFacade : public Sink::GenericFacade { public: DummyResourceMailFacade(const QByteArray &instanceIdentifier); virtual ~DummyResourceMailFacade(); }; -class DummyResourceFolderFacade : public Akonadi2::GenericFacade +class DummyResourceFolderFacade : public Sink::GenericFacade { public: 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 @@ #define ENTITY_TYPE_MAIL "mail" #define ENTITY_TYPE_FOLDER "folder" -DummyResource::DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer &pipeline) - : Akonadi2::GenericResource(instanceIdentifier, pipeline), +DummyResource::DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer &pipeline) + : Sink::GenericResource(instanceIdentifier, pipeline), mEventAdaptorFactory(QSharedPointer::create()), mMailAdaptorFactory(QSharedPointer::create()), mFolderAdaptorFactory(QSharedPointer::create()) { addType(ENTITY_TYPE_MAIL, mMailAdaptorFactory, - QVector() << new DefaultIndexUpdater); + QVector() << new DefaultIndexUpdater); addType(ENTITY_TYPE_FOLDER, mFolderAdaptorFactory, - QVector() << new DefaultIndexUpdater); + QVector() << new DefaultIndexUpdater); addType(ENTITY_TYPE_EVENT, mEventAdaptorFactory, - QVector() << new DefaultIndexUpdater); + QVector() << new DefaultIndexUpdater); } -Akonadi2::ApplicationDomain::Event::Ptr DummyResource::createEvent(const QByteArray &ridBuffer, const QMap &data, Akonadi2::Storage::Transaction &transaction) +Sink::ApplicationDomain::Event::Ptr DummyResource::createEvent(const QByteArray &ridBuffer, const QMap &data, Sink::Storage::Transaction &transaction) { static uint8_t rawData[100]; - auto event = Akonadi2::ApplicationDomain::Event::Ptr::create(); + auto event = Sink::ApplicationDomain::Event::Ptr::create(); event->setProperty("summary", data.value("summary").toString()); event->setProperty("remoteId", ridBuffer); event->setProperty("description", data.value("description").toString()); @@ -68,9 +68,9 @@ Akonadi2::ApplicationDomain::Event::Ptr DummyResource::createEvent(const QByteAr return event; } -Akonadi2::ApplicationDomain::Mail::Ptr DummyResource::createMail(const QByteArray &ridBuffer, const QMap &data, Akonadi2::Storage::Transaction &transaction) +Sink::ApplicationDomain::Mail::Ptr DummyResource::createMail(const QByteArray &ridBuffer, const QMap &data, Sink::Storage::Transaction &transaction) { - auto mail = Akonadi2::ApplicationDomain::Mail::Ptr::create(); + auto mail = Sink::ApplicationDomain::Mail::Ptr::create(); mail->setProperty("subject", data.value("subject").toString()); mail->setProperty("senderEmail", data.value("senderEmail").toString()); mail->setProperty("senderName", data.value("senderName").toString()); @@ -81,19 +81,19 @@ Akonadi2::ApplicationDomain::Mail::Ptr DummyResource::createMail(const QByteArra return mail; } -Akonadi2::ApplicationDomain::Folder::Ptr DummyResource::createFolder(const QByteArray &ridBuffer, const QMap &data, Akonadi2::Storage::Transaction &transaction) +Sink::ApplicationDomain::Folder::Ptr DummyResource::createFolder(const QByteArray &ridBuffer, const QMap &data, Sink::Storage::Transaction &transaction) { - auto folder = Akonadi2::ApplicationDomain::Folder::Ptr::create(); + auto folder = Sink::ApplicationDomain::Folder::Ptr::create(); folder->setProperty("name", data.value("name").toString()); folder->setProperty("icon", data.value("icon").toString()); if (!data.value("parent").toString().isEmpty()) { - auto akonadiId = resolveRemoteId(ENTITY_TYPE_FOLDER, data.value("parent").toByteArray(), transaction); - folder->setProperty("parent", akonadiId); + auto sinkId = resolveRemoteId(ENTITY_TYPE_FOLDER, data.value("parent").toByteArray(), transaction); + folder->setProperty("parent", sinkId); } return folder; } -void DummyResource::synchronize(const QByteArray &bufferType, const QMap > &data, Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, std::function &data, Akonadi2::Storage::Transaction &)> createEntity) +void DummyResource::synchronize(const QByteArray &bufferType, const QMap > &data, Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, std::function &data, Sink::Storage::Transaction &)> createEntity) { //TODO find items to remove for (auto it = data.constBegin(); it != data.constEnd(); it++) { @@ -103,26 +103,26 @@ void DummyResource::synchronize(const QByteArray &bufferType, const QMap DummyResource::synchronizeWithSource(Akonadi2::Storage &mainStore, Akonadi2::Storage &synchronizationStore) +KAsync::Job DummyResource::synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore) { Log() << " Synchronizing"; return KAsync::start([this, &mainStore, &synchronizationStore]() { - auto transaction = mainStore.createTransaction(Akonadi2::Storage::ReadOnly); - auto synchronizationTransaction = synchronizationStore.createTransaction(Akonadi2::Storage::ReadWrite); - synchronize(ENTITY_TYPE_EVENT, DummyStore::instance().events(), transaction, synchronizationTransaction, *mEventAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap &data, Akonadi2::Storage::Transaction &synchronizationTransaction) { + auto transaction = mainStore.createTransaction(Sink::Storage::ReadOnly); + auto synchronizationTransaction = synchronizationStore.createTransaction(Sink::Storage::ReadWrite); + synchronize(ENTITY_TYPE_EVENT, DummyStore::instance().events(), transaction, synchronizationTransaction, *mEventAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap &data, Sink::Storage::Transaction &synchronizationTransaction) { return createEvent(ridBuffer, data, synchronizationTransaction); }); - synchronize(ENTITY_TYPE_MAIL, DummyStore::instance().mails(), transaction, synchronizationTransaction, *mMailAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap &data, Akonadi2::Storage::Transaction &synchronizationTransaction) { + synchronize(ENTITY_TYPE_MAIL, DummyStore::instance().mails(), transaction, synchronizationTransaction, *mMailAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap &data, Sink::Storage::Transaction &synchronizationTransaction) { return createMail(ridBuffer, data, synchronizationTransaction); }); - synchronize(ENTITY_TYPE_FOLDER, DummyStore::instance().folders(), transaction, synchronizationTransaction, *mFolderAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap &data, Akonadi2::Storage::Transaction &synchronizationTransaction) { + synchronize(ENTITY_TYPE_FOLDER, DummyStore::instance().folders(), transaction, synchronizationTransaction, *mFolderAdaptorFactory, [this](const QByteArray &ridBuffer, const QMap &data, Sink::Storage::Transaction &synchronizationTransaction) { return createFolder(ridBuffer, data, synchronizationTransaction); }); Log() << "Done Synchronizing"; }); } -KAsync::Job DummyResource::replay(Akonadi2::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) +KAsync::Job DummyResource::replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) { Trace() << "Replaying " << key; return KAsync::null(); @@ -131,7 +131,7 @@ KAsync::Job DummyResource::replay(Akonadi2::Storage &synchronizationStore, void DummyResource::removeFromDisk(const QByteArray &instanceIdentifier) { GenericResource::removeFromDisk(instanceIdentifier); - Akonadi2::Storage(Akonadi2::storageLocation(), instanceIdentifier + ".synchronization", Akonadi2::Storage::ReadWrite).removeFromDisk(); + Sink::Storage(Sink::storageLocation(), instanceIdentifier + ".synchronization", Sink::Storage::ReadWrite).removeFromDisk(); } KAsync::Job 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 DummyResource::inspect(int inspectionType, const QByteArray &i } DummyResourceFactory::DummyResourceFactory(QObject *parent) - : Akonadi2::ResourceFactory(parent) + : Sink::ResourceFactory(parent) { } -Akonadi2::Resource *DummyResourceFactory::createResource(const QByteArray &instanceIdentifier) +Sink::Resource *DummyResourceFactory::createResource(const QByteArray &instanceIdentifier) { return new DummyResource(instanceIdentifier); } -void DummyResourceFactory::registerFacades(Akonadi2::FacadeFactory &factory) +void DummyResourceFactory::registerFacades(Sink::FacadeFactory &factory) { - factory.registerFacade(PLUGIN_NAME); - factory.registerFacade(PLUGIN_NAME); - factory.registerFacade(PLUGIN_NAME); + factory.registerFacade(PLUGIN_NAME); + factory.registerFacade(PLUGIN_NAME); + factory.registerFacade(PLUGIN_NAME); } 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; class DummyMailAdaptorFactory; class DummyFolderAdaptorFactory; -class DummyResource : public Akonadi2::GenericResource +class DummyResource : public Sink::GenericResource { public: - DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer &pipeline = QSharedPointer()); - KAsync::Job synchronizeWithSource(Akonadi2::Storage &mainStore, Akonadi2::Storage &synchronizationStore) Q_DECL_OVERRIDE; + DummyResource(const QByteArray &instanceIdentifier, const QSharedPointer &pipeline = QSharedPointer()); + KAsync::Job synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore) Q_DECL_OVERRIDE; using GenericResource::synchronizeWithSource; static void removeFromDisk(const QByteArray &instanceIdentifier); KAsync::Job inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) Q_DECL_OVERRIDE; private: - KAsync::Job replay(Akonadi2::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE; - Akonadi2::ApplicationDomain::Event::Ptr createEvent(const QByteArray &rid, const QMap &data, Akonadi2::Storage::Transaction &); - Akonadi2::ApplicationDomain::Mail::Ptr createMail(const QByteArray &rid, const QMap &data, Akonadi2::Storage::Transaction &); - Akonadi2::ApplicationDomain::Folder::Ptr createFolder(const QByteArray &rid, const QMap &data, Akonadi2::Storage::Transaction &); - void synchronize(const QByteArray &bufferType, const QMap > &data, Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, std::function &data, Akonadi2::Storage::Transaction &)> createEntity); + KAsync::Job replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE; + Sink::ApplicationDomain::Event::Ptr createEvent(const QByteArray &rid, const QMap &data, Sink::Storage::Transaction &); + Sink::ApplicationDomain::Mail::Ptr createMail(const QByteArray &rid, const QMap &data, Sink::Storage::Transaction &); + Sink::ApplicationDomain::Folder::Ptr createFolder(const QByteArray &rid, const QMap &data, Sink::Storage::Transaction &); + void synchronize(const QByteArray &bufferType, const QMap > &data, Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, std::function &data, Sink::Storage::Transaction &)> createEntity); QSharedPointer mEventAdaptorFactory; QSharedPointer mMailAdaptorFactory; QSharedPointer mFolderAdaptorFactory; }; -class DummyResourceFactory : public Akonadi2::ResourceFactory +class DummyResourceFactory : public Sink::ResourceFactory { Q_OBJECT Q_PLUGIN_METADATA(IID "org.kde.dummy") - Q_INTERFACES(Akonadi2::ResourceFactory) + Q_INTERFACES(Sink::ResourceFactory) public: DummyResourceFactory(QObject *parent = 0); - Akonadi2::Resource *createResource(const QByteArray &instanceIdentifier) Q_DECL_OVERRIDE; - void registerFacades(Akonadi2::FacadeFactory &factory) Q_DECL_OVERRIDE; + Sink::Resource *createResource(const QByteArray &instanceIdentifier) Q_DECL_OVERRIDE; + void registerFacades(Sink::FacadeFactory &factory) Q_DECL_OVERRIDE; }; 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 @@ -project(akonadi2_resource_maildir) +project(sink_resource_maildir) add_definitions(-DQT_PLUGIN) include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) @@ -8,8 +8,8 @@ find_package(KF5 COMPONENTS REQUIRED Mime) add_library(${PROJECT_NAME} SHARED facade.cpp maildirresource.cpp domainadaptor.cpp) # generate_flatbuffers(${PROJECT_NAME} dummycalendar) qt5_use_modules(${PROJECT_NAME} Core Network) -target_link_libraries(${PROJECT_NAME} akonadi2common maildir KF5::Mime) +target_link_libraries(${PROJECT_NAME} sinkcommon maildir KF5::Mime) -install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${AKONADI2_RESOURCE_PLUGINS_PATH}) +install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH}) add_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 @@ #include "folder_generated.h" #include "dummy_generated.h" -class MaildirMailAdaptorFactory : public DomainTypeAdaptorFactory +class MaildirMailAdaptorFactory : public DomainTypeAdaptorFactory { public: MaildirMailAdaptorFactory(); virtual ~MaildirMailAdaptorFactory() {}; }; -class MaildirFolderAdaptorFactory : public DomainTypeAdaptorFactory +class MaildirFolderAdaptorFactory : public DomainTypeAdaptorFactory { public: 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 @@ #include "domainadaptor.h" MaildirResourceMailFacade::MaildirResourceMailFacade(const QByteArray &instanceIdentifier) - : Akonadi2::GenericFacade(instanceIdentifier, QSharedPointer::create()) + : Sink::GenericFacade(instanceIdentifier, QSharedPointer::create()) { } @@ -32,7 +32,7 @@ MaildirResourceMailFacade::~MaildirResourceMailFacade() MaildirResourceFolderFacade::MaildirResourceFolderFacade(const QByteArray &instanceIdentifier) - : Akonadi2::GenericFacade(instanceIdentifier, QSharedPointer::create()) + : Sink::GenericFacade(instanceIdentifier, QSharedPointer::create()) { } 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 @@ #include "common/facade.h" -class MaildirResourceMailFacade : public Akonadi2::GenericFacade +class MaildirResourceMailFacade : public Sink::GenericFacade { public: MaildirResourceMailFacade(const QByteArray &instanceIdentifier); virtual ~MaildirResourceMailFacade(); }; -class MaildirResourceFolderFacade : public Akonadi2::GenericFacade +class MaildirResourceFolderFacade : public Sink::GenericFacade { public: 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) // return QFile::remove(realKey); } -// QString Maildir::changeEntryFlags(const QString& key, const Akonadi::Item::Flags& flags) +// QString Maildir::changeEntryFlags(const QString& key, const Sink::Item::Flags& flags) // { // QString realKey(d->findRealKey(key)); // if (realKey.isEmpty()) { @@ -701,16 +701,16 @@ bool Maildir::removeEntry(const QString& key) // QString finalKey = key.left(key.indexOf(rx)); // // QStringList mailDirFlags; -// Q_FOREACH (const Akonadi::Item::Flag &flag, flags) { -// if (flag == Akonadi::MessageFlags::Forwarded) +// Q_FOREACH (const Sink::Item::Flag &flag, flags) { +// if (flag == Sink::MessageFlags::Forwarded) // mailDirFlags << QLatin1String("P"); -// if (flag == Akonadi::MessageFlags::Replied) +// if (flag == Sink::MessageFlags::Replied) // mailDirFlags << QLatin1String("R"); -// if (flag == Akonadi::MessageFlags::Seen) +// if (flag == Sink::MessageFlags::Seen) // mailDirFlags << QLatin1String("S"); -// if (flag == Akonadi::MessageFlags::Deleted) +// if (flag == Sink::MessageFlags::Deleted) // mailDirFlags << QLatin1String("T"); -// if (flag == Akonadi::MessageFlags::Flagged) +// if (flag == Sink::MessageFlags::Flagged) // mailDirFlags << QLatin1String("F"); // } // mailDirFlags.sort(); @@ -726,7 +726,7 @@ bool Maildir::removeEntry(const QString& key) // finalKey.prepend(d->path + QString::fromLatin1("/cur/")); // // if (realKey == finalKey) { -// // Somehow it already is named this way (e.g. migration bug -> wrong status in akonadi) +// // Somehow it already is named this way (e.g. migration bug -> wrong status in sink) // return newUniqueKey; // } // 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: * Change the flags for an entry specified by @p key. Returns the new key of the entry (the key might change because * flags are stored in the unique filename). */ - // QString changeEntryFlags( const QString& key, const Akonadi::Item::Flags& flags ); + // QString changeEntryFlags( const QString& key, const Sink::Item::Flags& flags ); /** * 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 @@ #define ENTITY_TYPE_MAIL "mail" #define ENTITY_TYPE_FOLDER "folder" -MaildirResource::MaildirResource(const QByteArray &instanceIdentifier, const QSharedPointer &pipeline) - : Akonadi2::GenericResource(instanceIdentifier, pipeline), +MaildirResource::MaildirResource(const QByteArray &instanceIdentifier, const QSharedPointer &pipeline) + : Sink::GenericResource(instanceIdentifier, pipeline), mMailAdaptorFactory(QSharedPointer::create()), mFolderAdaptorFactory(QSharedPointer::create()) { addType(ENTITY_TYPE_MAIL, mMailAdaptorFactory, - QVector() << new DefaultIndexUpdater); + QVector() << new DefaultIndexUpdater); addType(ENTITY_TYPE_FOLDER, mFolderAdaptorFactory, - QVector() << new DefaultIndexUpdater); + QVector() << new DefaultIndexUpdater); auto config = ResourceConfig::getConfiguration(instanceIdentifier); mMaildirPath = QDir::cleanPath(QDir::fromNativeSeparators(config.value("path").toString())); //Chop a trailing slash if necessary @@ -91,7 +91,7 @@ QStringList MaildirResource::listAvailableFolders() return folderList; } -void MaildirResource::synchronizeFolders(Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction) +void MaildirResource::synchronizeFolders(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction) { const QByteArray bufferType = ENTITY_TYPE_FOLDER; QStringList folderList = listAvailableFolders(); @@ -102,7 +102,7 @@ void MaildirResource::synchronizeFolders(Akonadi2::Storage::Transaction &transac //TODO Instead of iterating over all entries in the database, which can also pick up the same item multiple times, //we should rather iterate over an index that contains every uid exactly once. The remoteId index would be such an index, //but we currently fail to iterate over all entries in an index it seems. - // auto remoteIds = synchronizationTransaction.openDatabase("rid.mapping." + bufferType, std::function(), true); + // auto remoteIds = synchronizationTransaction.openDatabase("rid.mapping." + bufferType, std::function(), true); auto mainDatabase = transaction.openDatabase(bufferType + ".main"); mainDatabase.scan("", [&](const QByteArray &key, const QByteArray &) { callback(key); @@ -119,7 +119,7 @@ void MaildirResource::synchronizeFolders(Akonadi2::Storage::Transaction &transac Trace() << "Processing folder " << remoteId; KPIM::Maildir md(folderPath, folderPath == mMaildirPath); - Akonadi2::ApplicationDomain::Folder folder; + Sink::ApplicationDomain::Folder folder; folder.setProperty("name", md.name()); folder.setProperty("icon", "folder"); if (!md.isRoot()) { @@ -129,7 +129,7 @@ void MaildirResource::synchronizeFolders(Akonadi2::Storage::Transaction &transac } } -void MaildirResource::synchronizeMails(Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction, const QString &path) +void MaildirResource::synchronizeMails(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, const QString &path) { Trace() << "Synchronizing mails" << path; const QByteArray bufferType = ENTITY_TYPE_MAIL; @@ -150,8 +150,8 @@ void MaildirResource::synchronizeMails(Akonadi2::Storage::Transaction &transacti scanForRemovals(transaction, synchronizationTransaction, bufferType, [&](const std::function &callback) { Index index(bufferType + ".index." + property, transaction); - index.lookup(folderLocalId, [&](const QByteArray &akonadiId) { - callback(akonadiId); + index.lookup(folderLocalId, [&](const QByteArray &sinkId) { + callback(sinkId); }, [&](const Index::Error &error) { Warning() << "Error in index: " << error.message << property; @@ -175,7 +175,7 @@ void MaildirResource::synchronizeMails(Akonadi2::Storage::Transaction &transacti Trace() << "Found a mail " << filePath << " : " << fileName << msg->subject(true)->asUnicodeString(); - Akonadi2::ApplicationDomain::Mail mail; + Sink::ApplicationDomain::Mail mail; mail.setProperty("subject", msg->subject(true)->asUnicodeString()); mail.setProperty("sender", msg->from(true)->asUnicodeString()); mail.setProperty("senderName", msg->from(true)->asUnicodeString()); @@ -189,19 +189,19 @@ void MaildirResource::synchronizeMails(Akonadi2::Storage::Transaction &transacti } } -KAsync::Job MaildirResource::synchronizeWithSource(Akonadi2::Storage &mainStore, Akonadi2::Storage &synchronizationStore) +KAsync::Job MaildirResource::synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore) { Log() << " Synchronizing"; return KAsync::start([this, &mainStore, &synchronizationStore]() { - auto transaction = mainStore.createTransaction(Akonadi2::Storage::ReadOnly); + auto transaction = mainStore.createTransaction(Sink::Storage::ReadOnly); { - auto synchronizationTransaction = synchronizationStore.createTransaction(Akonadi2::Storage::ReadWrite); + auto synchronizationTransaction = synchronizationStore.createTransaction(Sink::Storage::ReadWrite); synchronizeFolders(transaction, synchronizationTransaction); //The next sync needs the folders available synchronizationTransaction.commit(); } for (const auto &folder : listAvailableFolders()) { - auto synchronizationTransaction = synchronizationStore.createTransaction(Akonadi2::Storage::ReadWrite); + auto synchronizationTransaction = synchronizationStore.createTransaction(Sink::Storage::ReadWrite); synchronizeMails(transaction, synchronizationTransaction, folder); //Don't let the transaction grow too much synchronizationTransaction.commit(); @@ -210,23 +210,23 @@ KAsync::Job MaildirResource::synchronizeWithSource(Akonadi2::Storage &main }); } -KAsync::Job MaildirResource::replay(Akonadi2::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) +KAsync::Job MaildirResource::replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) { - auto synchronizationTransaction = synchronizationStore.createTransaction(Akonadi2::Storage::ReadWrite); + auto synchronizationTransaction = synchronizationStore.createTransaction(Sink::Storage::ReadWrite); Trace() << "Replaying " << key << type; if (type == ENTITY_TYPE_FOLDER) { - Akonadi2::EntityBuffer buffer(value.data(), value.size()); - const Akonadi2::Entity &entity = buffer.entity(); - const auto metadataBuffer = Akonadi2::EntityBuffer::readBuffer(entity.metadata()); + Sink::EntityBuffer buffer(value.data(), value.size()); + const Sink::Entity &entity = buffer.entity(); + const auto metadataBuffer = Sink::EntityBuffer::readBuffer(entity.metadata()); if (metadataBuffer && !metadataBuffer->replayToSource()) { Trace() << "Change is coming from the source"; return KAsync::null(); } const qint64 revision = metadataBuffer ? metadataBuffer->revision() : -1; - const auto operation = metadataBuffer ? metadataBuffer->operation() : Akonadi2::Operation_Creation; - if (operation == Akonadi2::Operation_Creation) { - const Akonadi2::ApplicationDomain::Folder folder(mResourceInstanceIdentifier, Akonadi2::Storage::uidFromKey(key), revision, mFolderAdaptorFactory->createAdaptor(entity)); + const auto operation = metadataBuffer ? metadataBuffer->operation() : Sink::Operation_Creation; + if (operation == Sink::Operation_Creation) { + const Sink::ApplicationDomain::Folder folder(mResourceInstanceIdentifier, Sink::Storage::uidFromKey(key), revision, mFolderAdaptorFactory->createAdaptor(entity)); auto folderName = folder.getProperty("name").toString(); //TODO handle non toplevel folders auto path = mMaildirPath + "/" + folderName; @@ -234,31 +234,31 @@ KAsync::Job MaildirResource::replay(Akonadi2::Storage &synchronizationStor KPIM::Maildir maildir(path, false); maildir.create(); recordRemoteId(ENTITY_TYPE_FOLDER, folder.identifier(), path.toUtf8(), synchronizationTransaction); - } else if (operation == Akonadi2::Operation_Removal) { - const auto uid = Akonadi2::Storage::uidFromKey(key); + } else if (operation == Sink::Operation_Removal) { + const auto uid = Sink::Storage::uidFromKey(key); const auto remoteId = resolveLocalId(ENTITY_TYPE_FOLDER, uid, synchronizationTransaction); const auto path = remoteId; Trace() << "Removing a folder: " << path; KPIM::Maildir maildir(path, false); maildir.remove(); removeRemoteId(ENTITY_TYPE_FOLDER, uid, remoteId, synchronizationTransaction); - } else if (operation == Akonadi2::Operation_Modification) { + } else if (operation == Sink::Operation_Modification) { Warning() << "Folder modifications are not implemented"; } else { Warning() << "Unkown operation" << operation; } } else if (type == ENTITY_TYPE_MAIL) { - Akonadi2::EntityBuffer buffer(value.data(), value.size()); - const Akonadi2::Entity &entity = buffer.entity(); - const auto metadataBuffer = Akonadi2::EntityBuffer::readBuffer(entity.metadata()); + Sink::EntityBuffer buffer(value.data(), value.size()); + const Sink::Entity &entity = buffer.entity(); + const auto metadataBuffer = Sink::EntityBuffer::readBuffer(entity.metadata()); if (metadataBuffer && !metadataBuffer->replayToSource()) { Trace() << "Change is coming from the source"; return KAsync::null(); } const qint64 revision = metadataBuffer ? metadataBuffer->revision() : -1; - const auto operation = metadataBuffer ? metadataBuffer->operation() : Akonadi2::Operation_Creation; - if (operation == Akonadi2::Operation_Creation) { - const Akonadi2::ApplicationDomain::Mail mail(mResourceInstanceIdentifier, Akonadi2::Storage::uidFromKey(key), revision, mMailAdaptorFactory->createAdaptor(entity)); + const auto operation = metadataBuffer ? metadataBuffer->operation() : Sink::Operation_Creation; + if (operation == Sink::Operation_Creation) { + const Sink::ApplicationDomain::Mail mail(mResourceInstanceIdentifier, Sink::Storage::uidFromKey(key), revision, mMailAdaptorFactory->createAdaptor(entity)); auto parentFolder = mail.getProperty("folder").toByteArray(); QByteArray parentFolderRemoteId; if (!parentFolder.isEmpty()) { @@ -272,13 +272,13 @@ KAsync::Job MaildirResource::replay(Akonadi2::Storage &synchronizationStor const auto id = maildir.addEntry("foobar"); Trace() << "Creating a new mail: " << id; recordRemoteId(ENTITY_TYPE_MAIL, mail.identifier(), id.toUtf8(), synchronizationTransaction); - } else if (operation == Akonadi2::Operation_Removal) { - const auto uid = Akonadi2::Storage::uidFromKey(key); + } else if (operation == Sink::Operation_Removal) { + const auto uid = Sink::Storage::uidFromKey(key); const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, uid, synchronizationTransaction); Trace() << "Removing a mail: " << remoteId; QFile::remove(remoteId); removeRemoteId(ENTITY_TYPE_MAIL, uid, remoteId, synchronizationTransaction); - } else if (operation == Akonadi2::Operation_Modification) { + } else if (operation == Sink::Operation_Modification) { Warning() << "Mail modifications are not implemented"; } else { Warning() << "Unkown operation" << operation; @@ -290,16 +290,16 @@ KAsync::Job MaildirResource::replay(Akonadi2::Storage &synchronizationStor void MaildirResource::removeFromDisk(const QByteArray &instanceIdentifier) { GenericResource::removeFromDisk(instanceIdentifier); - Akonadi2::Storage(Akonadi2::storageLocation(), instanceIdentifier + ".synchronization", Akonadi2::Storage::ReadWrite).removeFromDisk(); + Sink::Storage(Sink::storageLocation(), instanceIdentifier + ".synchronization", Sink::Storage::ReadWrite).removeFromDisk(); } KAsync::Job MaildirResource::inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) { - auto synchronizationStore = QSharedPointer::create(Akonadi2::storageLocation(), mResourceInstanceIdentifier + ".synchronization", Akonadi2::Storage::ReadOnly); - auto synchronizationTransaction = synchronizationStore->createTransaction(Akonadi2::Storage::ReadOnly); + auto synchronizationStore = QSharedPointer::create(Sink::storageLocation(), mResourceInstanceIdentifier + ".synchronization", Sink::Storage::ReadOnly); + auto synchronizationTransaction = synchronizationStore->createTransaction(Sink::Storage::ReadOnly); Trace() << "Inspecting " << inspectionType << domainType << entityId << property << expectedValue; if (domainType == ENTITY_TYPE_MAIL) { - if (inspectionType == Akonadi2::Resources::Inspection::PropertyInspectionType) { + if (inspectionType == Sink::Resources::Inspection::PropertyInspectionType) { if (property == "unread") { const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, entityId, synchronizationTransaction); const auto flags = KPIM::Maildir::readEntryFlags(remoteId.split('/').last()); @@ -312,7 +312,7 @@ KAsync::Job MaildirResource::inspect(int inspectionType, const QByteArray return KAsync::null(); } } - if (inspectionType == Akonadi2::Resources::Inspection::ExistenceInspectionType) { + if (inspectionType == Sink::Resources::Inspection::ExistenceInspectionType) { const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, entityId, synchronizationTransaction); if (QFileInfo(remoteId).exists() != expectedValue.toBool()) { return KAsync::error(1, "Wrong file existence: " + remoteId); @@ -323,19 +323,19 @@ KAsync::Job MaildirResource::inspect(int inspectionType, const QByteArray } MaildirResourceFactory::MaildirResourceFactory(QObject *parent) - : Akonadi2::ResourceFactory(parent) + : Sink::ResourceFactory(parent) { } -Akonadi2::Resource *MaildirResourceFactory::createResource(const QByteArray &instanceIdentifier) +Sink::Resource *MaildirResourceFactory::createResource(const QByteArray &instanceIdentifier) { return new MaildirResource(instanceIdentifier); } -void MaildirResourceFactory::registerFacades(Akonadi2::FacadeFactory &factory) +void MaildirResourceFactory::registerFacades(Sink::FacadeFactory &factory) { - factory.registerFacade(PLUGIN_NAME); - factory.registerFacade(PLUGIN_NAME); + factory.registerFacade(PLUGIN_NAME); + factory.registerFacade(PLUGIN_NAME); } 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; * files: full file path * directories: full directory path */ -class MaildirResource : public Akonadi2::GenericResource +class MaildirResource : public Sink::GenericResource { public: - MaildirResource(const QByteArray &instanceIdentifier, const QSharedPointer &pipeline = QSharedPointer()); - KAsync::Job synchronizeWithSource(Akonadi2::Storage &mainStore, Akonadi2::Storage &synchronizationStore) Q_DECL_OVERRIDE; + MaildirResource(const QByteArray &instanceIdentifier, const QSharedPointer &pipeline = QSharedPointer()); + KAsync::Job synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore) Q_DECL_OVERRIDE; KAsync::Job inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue) Q_DECL_OVERRIDE; static void removeFromDisk(const QByteArray &instanceIdentifier); private: - KAsync::Job replay(Akonadi2::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE; + KAsync::Job replay(Sink::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE; - void synchronizeFolders(Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction); - void synchronizeMails(Akonadi2::Storage::Transaction &transaction, Akonadi2::Storage::Transaction &synchronizationTransaction, const QString &folder); + void synchronizeFolders(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction); + void synchronizeMails(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, const QString &folder); QStringList listAvailableFolders(); QString mMaildirPath; QSharedPointer mMailAdaptorFactory; QSharedPointer mFolderAdaptorFactory; }; -class MaildirResourceFactory : public Akonadi2::ResourceFactory +class MaildirResourceFactory : public Sink::ResourceFactory { Q_OBJECT Q_PLUGIN_METADATA(IID "org.kde.maildir") - Q_INTERFACES(Akonadi2::ResourceFactory) + Q_INTERFACES(Sink::ResourceFactory) public: MaildirResourceFactory(QObject *parent = 0); - Akonadi2::Resource *createResource(const QByteArray &instanceIdentifier) Q_DECL_OVERRIDE; - void registerFacades(Akonadi2::FacadeFactory &factory) Q_DECL_OVERRIDE; + Sink::Resource *createResource(const QByteArray &instanceIdentifier) Q_DECL_OVERRIDE; + void registerFacades(Sink::FacadeFactory &factory) Q_DECL_OVERRIDE; }; -- cgit v1.2.3