From f1b0405d50f9e83f84c5f3aabb29ce3524220b61 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Wed, 10 Feb 2016 08:17:20 +0100
Subject: Adapt to changes.

---
 framework/CMakeLists.txt                 | 2 +-
 framework/mail/CMakeLists.txt            | 2 +-
 framework/mail/actions/sinkactions.cpp   | 2 +-
 framework/mail/folderlistmodel.cpp       | 4 ++--
 framework/mail/maillistcontroller.cpp    | 2 +-
 framework/mail/maillistmodel.h           | 2 +-
 framework/settings/CMakeLists.txt        | 4 ++--
 framework/settings/resourcelistmodel.cpp | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index 8b0a7ca1..0987f018 100644
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -18,7 +18,7 @@ find_package(Qt5 COMPONENTS REQUIRED Core Qml)
 
 find_package(KF5Otp "5.1.42" CONFIG REQUIRED)
 find_package(KF5Mime "4.87.0" CONFIG REQUIRED)
-find_package(SinkCommon CONFIG REQUIRED)
+find_package(Sink CONFIG REQUIRED)
 find_package(KF5Async)
 find_package(KF5Libkleo)
 
diff --git a/framework/mail/CMakeLists.txt b/framework/mail/CMakeLists.txt
index 6616e492..f83a3a9e 100644
--- a/framework/mail/CMakeLists.txt
+++ b/framework/mail/CMakeLists.txt
@@ -17,7 +17,7 @@ add_library(mailplugin SHARED ${mailplugin_SRCS})
 
 qt5_use_modules(mailplugin Core Quick Qml)
 
-target_link_libraries(mailplugin actionplugin sinkcommon KF5::Otp)
+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/sinkactions.cpp b/framework/mail/actions/sinkactions.cpp
index 63b837aa..cffa5104 100644
--- a/framework/mail/actions/sinkactions.cpp
+++ b/framework/mail/actions/sinkactions.cpp
@@ -20,7 +20,7 @@
 
 #include <actions/context.h>
 
-#include <sinkcommon/clientapi.h>
+#include <sink/clientapi.h>
 
 using namespace Kube;
 
diff --git a/framework/mail/folderlistmodel.cpp b/framework/mail/folderlistmodel.cpp
index 645ecc30..431354d7 100644
--- a/framework/mail/folderlistmodel.cpp
+++ b/framework/mail/folderlistmodel.cpp
@@ -19,8 +19,8 @@
 */
 
 #include "folderlistmodel.h"
-#include <sinkcommon/clientapi.h>
-#include <sinkcommon/applicationdomaintype.h>
+#include <sink/clientapi.h>
+#include <sink/applicationdomaintype.h>
 
 FolderListModel::FolderListModel(QObject *parent) : QIdentityProxyModel()
 {
diff --git a/framework/mail/maillistcontroller.cpp b/framework/mail/maillistcontroller.cpp
index b342b1ec..66e51012 100644
--- a/framework/mail/maillistcontroller.cpp
+++ b/framework/mail/maillistcontroller.cpp
@@ -22,7 +22,7 @@
 
 #include <QStringList>
 
-#include <sinkcommon/clientapi.h>
+#include <sink/clientapi.h>
 
 #include "maillistmodel.h"
 
diff --git a/framework/mail/maillistmodel.h b/framework/mail/maillistmodel.h
index f15c3e77..8b35966f 100644
--- a/framework/mail/maillistmodel.h
+++ b/framework/mail/maillistmodel.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <sinkcommon/clientapi.h>
+#include <sink/clientapi.h>
 
 #include <QSortFilterProxyModel>
 #include <QSharedPointer>
diff --git a/framework/settings/CMakeLists.txt b/framework/settings/CMakeLists.txt
index 017820b6..77268ab9 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::sinkcommon)
+target_link_libraries(settingsplugin sink)
 
 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
+install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/sink/settings)
diff --git a/framework/settings/resourcelistmodel.cpp b/framework/settings/resourcelistmodel.cpp
index ae1ffc15..7d97f342 100644
--- a/framework/settings/resourcelistmodel.cpp
+++ b/framework/settings/resourcelistmodel.cpp
@@ -1,6 +1,6 @@
 #include "resourcelistmodel.h"
 
-#include <sinkcommon/clientapi.h>
+#include <sink/clientapi.h>
 
 ResourceListModel::ResourceListModel(QObject *parent) : QIdentityProxyModel()
 {
-- 
cgit v1.2.3