9 files changed, 31 insertions, 31 deletions

diff --git a/framework/mail/CMakeLists.txt b/framework/mail/CMakeLists.txt
index 9a32cc83..0a0e0ac6 100644
--- a/framework/mail/CMakeLists.txt
+++ b/framework/mail/CMakeLists.txt
@@ -5,7 +5,7 @@ set(mailplugin_SRCS
     singlemailcontroller.cpp
     folderlistmodel.cpp
     folderlistcontroller.cpp
-    actions/akonadiactions.cpp
+    actions/sinkactions.cpp
     objecttreesource.cpp
     stringhtmlwriter.cpp
 )
@@ -14,7 +14,7 @@ add_library(mailplugin SHARED ${mailplugin_SRCS})
 
 qt5_use_modules(mailplugin Core Quick Qml)
 
-target_link_libraries(mailplugin actionplugin KF5::akonadi2common KF5::Otp actionplugin)
+target_link_libraries(mailplugin actionplugin Sink KF5::Otp)
 
 install(TARGETS mailplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail)
 install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kube/mail)
diff --git a/framework/mail/actions/akonadiactions.cpp b/framework/mail/actions/sinkactions.cpp
index d0a51deb..8918f996 100644
--- a/framework/mail/actions/akonadiactions.cpp
+++ b/framework/mail/actions/sinkactions.cpp
@@ -16,11 +16,11 @@
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301, USA.
 */
-#include "akonadiactions.h"
+#include "sinkactions.h"
 
 #include <actions/context.h>
 
-#include <akonadi2common/clientapi.h>
+#include <sinkcommon/clientapi.h>
 
 using namespace Kube;
 
@@ -47,14 +47,14 @@ static ActionHandlerHelper markAsReadHandler("org.kde.kube.actions.mark-as-read"
         return context->property("mail").isValid();
     },
     [](Context *context) {
-        auto mail = context->property("mail").value<Akonadi2::ApplicationDomain::Mail::Ptr>();
+        auto mail = context->property("mail").value<Sink::ApplicationDomain::Mail::Ptr>();
         if (!mail) {
             qWarning() << "Failed to get the mail mail: " << context->property("mail");
             return;
         }
         mail->setProperty("unread", false);
         qDebug() << "Mark as read " << mail->identifier();
-        Akonadi2::Store::modify(*mail).exec();
+        Sink::Store::modify(*mail).exec();
     }
 );
 
@@ -63,13 +63,13 @@ static ActionHandlerHelper deleteHandler("org.kde.kube.actions.delete",
         return context->property("mail").isValid();
     },
     [](Context *context) {
-        auto mail = context->property("mail").value<Akonadi2::ApplicationDomain::Mail::Ptr>();
+        auto mail = context->property("mail").value<Sink::ApplicationDomain::Mail::Ptr>();
         if (!mail) {
             qWarning() << "Failed to get the mail mail: " << context->property("mail");
             return;
         }
         mail->setProperty("unread", false);
         qDebug() << "Remove " << mail->identifier();
-        Akonadi2::Store::remove(*mail).exec();
+        Sink::Store::remove(*mail).exec();
     }
 );
diff --git a/framework/mail/actions/akonadiactions.h b/framework/mail/actions/sinkactions.h
index a583ebf8..a583ebf8 100644
--- a/framework/mail/actions/akonadiactions.h
+++ b/framework/mail/actions/sinkactions.h
diff --git a/framework/mail/folderlistcontroller.cpp b/framework/mail/folderlistcontroller.cpp
index 3b1cf9f8..46a6f648 100644
--- a/framework/mail/folderlistcontroller.cpp
+++ b/framework/mail/folderlistcontroller.cpp
@@ -52,7 +52,7 @@ FolderListModel* FolderListController::model() const
 
 void FolderListController::loadFolders(const QString &id)
 {
-    //load foldermodel from akonadi
+    //load foldermodel from sink
 
 }
 
diff --git a/framework/mail/folderlistmodel.cpp b/framework/mail/folderlistmodel.cpp
index 204dfdbf..645ecc30 100644
--- a/framework/mail/folderlistmodel.cpp
+++ b/framework/mail/folderlistmodel.cpp
@@ -19,17 +19,17 @@
 */
 
 #include "folderlistmodel.h"
-#include <akonadi2common/clientapi.h>
-#include <akonadi2common/applicationdomaintype.h>
+#include <sinkcommon/clientapi.h>
+#include <sinkcommon/applicationdomaintype.h>
 
 FolderListModel::FolderListModel(QObject *parent) : QIdentityProxyModel()
 {
-    Akonadi2::Query query;
+    Sink::Query query;
     query.syncOnDemand = false;
     query.processAll = false;
     query.liveQuery = true;
     query.requestedProperties << "name" << "icon";
-    mModel = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Folder>(query);
+    mModel = Sink::Store::loadModel<Sink::ApplicationDomain::Folder>(query);
     setSourceModel(mModel.data());
 }
 
@@ -59,9 +59,9 @@ QVariant FolderListModel::data(const QModelIndex &idx, int role) const
         case Icon:
             return srcIdx.sibling(srcIdx.row(), 1).data(Qt::DisplayRole).toString();
         case Id:
-            return srcIdx.data(Akonadi2::Store::DomainObjectBaseRole).value<Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr>()->identifier();
+            return srcIdx.data(Sink::Store::DomainObjectBaseRole).value<Sink::ApplicationDomain::ApplicationDomainType::Ptr>()->identifier();
         case DomainObject:
-            return srcIdx.data(Akonadi2::Store::DomainObjectRole);
+            return srcIdx.data(Sink::Store::DomainObjectRole);
     }
     return QIdentityProxyModel::data(idx, role);
 }
diff --git a/framework/mail/maillistcontroller.cpp b/framework/mail/maillistcontroller.cpp
index ed353b70..b342b1ec 100644
--- a/framework/mail/maillistcontroller.cpp
+++ b/framework/mail/maillistcontroller.cpp
@@ -22,7 +22,7 @@
 
 #include <QStringList>
 
-#include <akonadi2common/clientapi.h>
+#include <sinkcommon/clientapi.h>
 
 #include "maillistmodel.h"
 
@@ -38,7 +38,7 @@ MailListModel *MailListController::model() const
 
 void MailListController::loadAllMail()
 {
-        Akonadi2::Query query;
+        Sink::Query query;
         query.syncOnDemand = false;
         query.processAll = false;
         query.liveQuery = true;
@@ -48,7 +48,7 @@ void MailListController::loadAllMail()
 
 void MailListController::loadMailFolder(const QString &folderId)
 {
-        Akonadi2::Query query;
+        Sink::Query query;
         query.syncOnDemand = false;
         query.processAll = false;
         query.liveQuery = true;
@@ -59,7 +59,7 @@ void MailListController::loadMailFolder(const QString &folderId)
 
 void MailListController::loadUnreadMail()
 {
-        Akonadi2::Query query;
+        Sink::Query query;
         query.syncOnDemand = false;
         query.processAll = false;
         query.liveQuery = true;
@@ -70,7 +70,7 @@ void MailListController::loadUnreadMail()
 
 void MailListController::loadImportantMail()
 {
-        Akonadi2::Query query;
+        Sink::Query query;
         query.syncOnDemand = false;
         query.processAll = false;
         query.liveQuery = true;
diff --git a/framework/mail/maillistmodel.cpp b/framework/mail/maillistmodel.cpp
index 2314e155..e43351b0 100644
--- a/framework/mail/maillistmodel.cpp
+++ b/framework/mail/maillistmodel.cpp
@@ -74,9 +74,9 @@ QVariant MailListModel::data(const QModelIndex &idx, int role) const
         case Important:
             return srcIdx.sibling(srcIdx.row(), 5).data(Qt::DisplayRole).toString();
         case Id:
-            return srcIdx.data(Akonadi2::Store::DomainObjectBaseRole).value<Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr>()->identifier();
+            return srcIdx.data(Sink::Store::DomainObjectBaseRole).value<Sink::ApplicationDomain::ApplicationDomainType::Ptr>()->identifier();
         case DomainObject:
-            return srcIdx.data(Akonadi2::Store::DomainObjectRole);
+            return srcIdx.data(Sink::Store::DomainObjectRole);
         case MimeMessage: {
             auto filename = srcIdx.sibling(srcIdx.row(), 6).data(Qt::DisplayRole).toString();
             QFile file(filename);
@@ -123,20 +123,20 @@ QVariant MailListModel::data(const QModelIndex &idx, int role) const
     return QIdentityProxyModel::data(idx, role);
 }
 
-void MailListModel::runQuery(const Akonadi2::Query &query)
+void MailListModel::runQuery(const Sink::Query &query)
 {
-    m_model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::Mail>(query);
+    m_model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
     setSourceModel(m_model.data());
 }
 
 void MailListModel::setParentFolder(const QVariant &parentFolder)
 {
-    auto folder = parentFolder.value<Akonadi2::ApplicationDomain::Folder::Ptr>();
+    auto folder = parentFolder.value<Sink::ApplicationDomain::Folder::Ptr>();
     if (!folder) {
         qWarning() << "No folder: " << parentFolder;
         return;
     }
-    Akonadi2::Query query;
+    Sink::Query query;
     query.syncOnDemand = false;
     query.processAll = false;
     query.liveQuery = true;
@@ -154,12 +154,12 @@ QVariant MailListModel::parentFolder() const
 
 void MailListModel::setMail(const QVariant &variant)
 {
-    auto mail = variant.value<Akonadi2::ApplicationDomain::Mail::Ptr>();
+    auto mail = variant.value<Sink::ApplicationDomain::Mail::Ptr>();
     if (!mail) {
         qWarning() << "No mail: " << mail;
         return;
     }
-    Akonadi2::Query query;
+    Sink::Query query;
     query.syncOnDemand = false;
     query.processAll = false;
     query.liveQuery = false;
diff --git a/framework/mail/maillistmodel.h b/framework/mail/maillistmodel.h
index 1d56e6b8..6593a59c 100644
--- a/framework/mail/maillistmodel.h
+++ b/framework/mail/maillistmodel.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <akonadi2common/clientapi.h>
+#include <sinkcommon/clientapi.h>
 
 #include <QIdentityProxyModel>
 #include <QSharedPointer>
@@ -53,7 +53,7 @@ public:
 
     QHash<int, QByteArray> roleNames() const;
 
-    void runQuery(const Akonadi2::Query &query);
+    void runQuery(const Sink::Query &query);
 
     void setParentFolder(const QVariant &parentFolder);
     QVariant parentFolder() const;
diff --git a/framework/mail/singlemailcontroller.cpp b/framework/mail/singlemailcontroller.cpp
index 5f7a6d93..d0ab9f3c 100644
--- a/framework/mail/singlemailcontroller.cpp
+++ b/framework/mail/singlemailcontroller.cpp
@@ -38,7 +38,7 @@ MailListModel* SingleMailController::model() const
 
 void SingleMailController::loadMail(const QString &id)
 {
-    Akonadi2::Query query;
+    Sink::Query query;
     query.syncOnDemand = false;
     query.processAll = false;
     query.liveQuery = false;