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/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 ++++++------- 6 files changed, 52 insertions(+), 52 deletions(-) (limited to 'examples/dummyresource') 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; }; -- cgit v1.2.3