From 42d34555397dd62399233fac1fbfa216c255ef68 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 21 Jan 2016 11:46:46 +0100
Subject: Akonadi2 -> Sink

---
 framework/settings/CMakeLists.txt        | 6 +++---
 framework/settings/qmldir                | 4 ++--
 framework/settings/resourcelistmodel.cpp | 8 ++++----
 framework/settings/settingsplugin.cpp    | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'framework/settings')

diff --git a/framework/settings/CMakeLists.txt b/framework/settings/CMakeLists.txt
index 5d61851f..017820b6 100644
--- a/framework/settings/CMakeLists.txt
+++ b/framework/settings/CMakeLists.txt
@@ -9,7 +9,7 @@ add_library(settingsplugin SHARED ${settingsplugin_SRCS})
 
 qt5_use_modules(settingsplugin Core Quick Qml)
 
-target_link_libraries(settingsplugin KF5::akonadi2common)
+target_link_libraries(settingsplugin KF5::sinkcommon)
 
-install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/akonadi2/settings)
\ No newline at end of file
+install(TARGETS settingsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/sink/settings)
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/sink/settings)
\ No newline at end of file
diff --git a/framework/settings/qmldir b/framework/settings/qmldir
index 4db161bc..1740f29a 100644
--- a/framework/settings/qmldir
+++ b/framework/settings/qmldir
@@ -1,3 +1,3 @@
-module org.kde.akonadi2.settings
+module org.kde.sink.settings
 
-plugin settingsplugin
\ No newline at end of file
+plugin settingsplugin
diff --git a/framework/settings/resourcelistmodel.cpp b/framework/settings/resourcelistmodel.cpp
index ebeaac32..ae1ffc15 100644
--- a/framework/settings/resourcelistmodel.cpp
+++ b/framework/settings/resourcelistmodel.cpp
@@ -1,15 +1,15 @@
 #include "resourcelistmodel.h"
 
-#include <akonadi2common/clientapi.h>
+#include <sinkcommon/clientapi.h>
 
 ResourceListModel::ResourceListModel(QObject *parent) : QIdentityProxyModel()
 {
-    Akonadi2::Query query;
+    Sink::Query query;
     query.syncOnDemand = false;
     query.processAll = false;
     query.liveQuery = true;
     query.requestedProperties << "type";
-    m_model = Akonadi2::Store::loadModel<Akonadi2::ApplicationDomain::AkonadiResource>(query);
+    m_model = Sink::Store::loadModel<Sink::ApplicationDomain::SinkResource>(query);
 }
 
 ResourceListModel::~ResourceListModel()
@@ -32,7 +32,7 @@ QVariant ResourceListModel::data(const QModelIndex& index, int role) const
     auto srcIdx = mapToSource(index);
     switch (role) {
         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 Type:
             return srcIdx.sibling(srcIdx.row(), 0).data(Qt::DisplayRole).toString();
     }
diff --git a/framework/settings/settingsplugin.cpp b/framework/settings/settingsplugin.cpp
index 6c2951e7..ca670583 100644
--- a/framework/settings/settingsplugin.cpp
+++ b/framework/settings/settingsplugin.cpp
@@ -8,7 +8,7 @@
 
 void SettingsPlugin::registerTypes (const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kde.akonadi2.settings"));
+    Q_ASSERT(uri == QLatin1String("org.kde.sink.settings"));
 
     qmlRegisterType<ResourceListModel>();
     qmlRegisterType<ResourcesController>(uri, 1, 0, "Resources");
-- 
cgit v1.2.3