8 files changed, 73 insertions, 73 deletions

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<Akonadi2::ApplicationDomain::Mail, Akonadi2::ApplicationDomain::Buffer::Dummy, Akonadi2::ApplicationDomain::Buffer::DummyBuilder>
+class MaildirMailAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Mail, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
 {
 public:
     MaildirMailAdaptorFactory();
     virtual ~MaildirMailAdaptorFactory() {};
 };
 
-class MaildirFolderAdaptorFactory : public DomainTypeAdaptorFactory<Akonadi2::ApplicationDomain::Folder, Akonadi2::ApplicationDomain::Buffer::Dummy, Akonadi2::ApplicationDomain::Buffer::DummyBuilder>
+class MaildirFolderAdaptorFactory : public DomainTypeAdaptorFactory<Sink::ApplicationDomain::Folder, Sink::ApplicationDomain::Buffer::Dummy, Sink::ApplicationDomain::Buffer::DummyBuilder>
 {
 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<Akonadi2::ApplicationDomain::Mail>(instanceIdentifier, QSharedPointer<MaildirMailAdaptorFactory>::create())
+    : Sink::GenericFacade<Sink::ApplicationDomain::Mail>(instanceIdentifier, QSharedPointer<MaildirMailAdaptorFactory>::create())
 {
 }
 
@@ -32,7 +32,7 @@ MaildirResourceMailFacade::~MaildirResourceMailFacade()
 
 
 MaildirResourceFolderFacade::MaildirResourceFolderFacade(const QByteArray &instanceIdentifier)
-    : Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Folder>(instanceIdentifier, QSharedPointer<MaildirFolderAdaptorFactory>::create())
+    : Sink::GenericFacade<Sink::ApplicationDomain::Folder>(instanceIdentifier, QSharedPointer<MaildirFolderAdaptorFactory>::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<Akonadi2::ApplicationDomain::Mail>
+class MaildirResourceMailFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Mail>
 {
 public:
     MaildirResourceMailFacade(const QByteArray &instanceIdentifier);
     virtual ~MaildirResourceMailFacade();
 };
 
-class MaildirResourceFolderFacade : public Akonadi2::GenericFacade<Akonadi2::ApplicationDomain::Folder>
+class MaildirResourceFolderFacade : public Sink::GenericFacade<Sink::ApplicationDomain::Folder>
 {
 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<Akonadi2::Pipeline> &pipeline)
-    : Akonadi2::GenericResource(instanceIdentifier, pipeline),
+MaildirResource::MaildirResource(const QByteArray &instanceIdentifier, const QSharedPointer<Sink::Pipeline> &pipeline)
+    : Sink::GenericResource(instanceIdentifier, pipeline),
     mMailAdaptorFactory(QSharedPointer<MaildirMailAdaptorFactory>::create()),
     mFolderAdaptorFactory(QSharedPointer<MaildirFolderAdaptorFactory>::create())
 {
     addType(ENTITY_TYPE_MAIL, mMailAdaptorFactory,
-            QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Mail>);
+            QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Mail>);
     addType(ENTITY_TYPE_FOLDER, mFolderAdaptorFactory,
-            QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Folder>);
+            QVector<Sink::Preprocessor*>() << new DefaultIndexUpdater<Sink::ApplicationDomain::Folder>);
     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<void(const Akonadi2::Storage::Error &)>(), true);
+            // auto remoteIds = synchronizationTransaction.openDatabase("rid.mapping." + bufferType, std::function<void(const Sink::Storage::Error &)>(), 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<void(const QByteArray &)> &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<void> MaildirResource::synchronizeWithSource(Akonadi2::Storage &mainStore, Akonadi2::Storage &synchronizationStore)
+KAsync::Job<void> MaildirResource::synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore)
 {
     Log() << " Synchronizing";
     return KAsync::start<void>([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<void> MaildirResource::synchronizeWithSource(Akonadi2::Storage &main
     });
 }
 
-KAsync::Job<void> MaildirResource::replay(Akonadi2::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value)
+KAsync::Job<void> 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<Akonadi2::Metadata>(entity.metadata());
+        Sink::EntityBuffer buffer(value.data(), value.size());
+        const Sink::Entity &entity = buffer.entity();
+        const auto metadataBuffer = Sink::EntityBuffer::readBuffer<Sink::Metadata>(entity.metadata());
         if (metadataBuffer && !metadataBuffer->replayToSource()) {
             Trace() << "Change is coming from the source";
             return KAsync::null<void>();
         }
         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<void> 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<Akonadi2::Metadata>(entity.metadata());
+        Sink::EntityBuffer buffer(value.data(), value.size());
+        const Sink::Entity &entity = buffer.entity();
+        const auto metadataBuffer = Sink::EntityBuffer::readBuffer<Sink::Metadata>(entity.metadata());
         if (metadataBuffer && !metadataBuffer->replayToSource()) {
             Trace() << "Change is coming from the source";
             return KAsync::null<void>();
         }
         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<void> 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<void> 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<void> MaildirResource::inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue)
 {
-    auto synchronizationStore = QSharedPointer<Akonadi2::Storage>::create(Akonadi2::storageLocation(), mResourceInstanceIdentifier + ".synchronization", Akonadi2::Storage::ReadOnly);
-    auto synchronizationTransaction = synchronizationStore->createTransaction(Akonadi2::Storage::ReadOnly);
+    auto synchronizationStore = QSharedPointer<Sink::Storage>::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<void> MaildirResource::inspect(int inspectionType, const QByteArray
                 return KAsync::null<void>();
             }
         }
-        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<void>(1, "Wrong file existence: " + remoteId);
@@ -323,19 +323,19 @@ KAsync::Job<void> 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<Akonadi2::ApplicationDomain::Mail, MaildirResourceMailFacade>(PLUGIN_NAME);
-    factory.registerFacade<Akonadi2::ApplicationDomain::Folder, MaildirResourceFolderFacade>(PLUGIN_NAME);
+    factory.registerFacade<Sink::ApplicationDomain::Mail, MaildirResourceMailFacade>(PLUGIN_NAME);
+    factory.registerFacade<Sink::ApplicationDomain::Folder, MaildirResourceFolderFacade>(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<Akonadi2::Pipeline> &pipeline = QSharedPointer<Akonadi2::Pipeline>());
-    KAsync::Job<void> synchronizeWithSource(Akonadi2::Storage &mainStore, Akonadi2::Storage &synchronizationStore) Q_DECL_OVERRIDE;
+    MaildirResource(const QByteArray &instanceIdentifier, const QSharedPointer<Sink::Pipeline> &pipeline = QSharedPointer<Sink::Pipeline>());
+    KAsync::Job<void> synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore) Q_DECL_OVERRIDE;
     KAsync::Job<void> 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<void> replay(Akonadi2::Storage &synchronizationStore, const QByteArray &type, const QByteArray &key, const QByteArray &value) Q_DECL_OVERRIDE;
+    KAsync::Job<void> 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<MaildirMailAdaptorFactory> mMailAdaptorFactory;
     QSharedPointer<MaildirFolderAdaptorFactory> 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;
 };