diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,6 @@ find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED) -find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Service ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) diff --git a/src/akonadi-contacts/CMakeLists.txt b/src/akonadi-contacts/CMakeLists.txt --- a/src/akonadi-contacts/CMakeLists.txt +++ b/src/akonadi-contacts/CMakeLists.txt @@ -136,7 +136,6 @@ KF5::IconThemes KF5::KIOWidgets KF5::Mime - KF5::DBusAddons KF5::I18n KF5::TextWidgets KF5::XmlGui diff --git a/src/akonadi-contacts/actions/qekigadialer.cpp b/src/akonadi-contacts/actions/qekigadialer.cpp --- a/src/akonadi-contacts/actions/qekigadialer.cpp +++ b/src/akonadi-contacts/actions/qekigadialer.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include @@ -44,7 +43,7 @@ return true; } - interface = KDBusConnectionPool::threadConnection().interface(); + interface = QDBusConnection::sessionBus().interface(); if (interface->isServiceRegistered(service)) { return true; } @@ -59,7 +58,7 @@ QDBusInterface *interface = new QDBusInterface(service, path, QString(), QDBusConnection::sessionBus()); if (!interface->isValid()) { delete interface; - interface = new QDBusInterface(service, path, QString(), KDBusConnectionPool::threadConnection()); + interface = new QDBusInterface(service, path, QString(), QDBusConnection::sessionBus()); } return interface; diff --git a/src/akonadi-contacts/actions/qsflphonedialer.cpp b/src/akonadi-contacts/actions/qsflphonedialer.cpp --- a/src/akonadi-contacts/actions/qsflphonedialer.cpp +++ b/src/akonadi-contacts/actions/qsflphonedialer.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #if !defined(Q_OS_WIN) #include @@ -42,7 +41,7 @@ return true; } - interface = KDBusConnectionPool::threadConnection().interface(); + interface = QDBusConnection::sessionBus().interface(); if (interface->isServiceRegistered(service)) { return true; } diff --git a/src/akonadi-contacts/actions/qskypedialer.cpp b/src/akonadi-contacts/actions/qskypedialer.cpp --- a/src/akonadi-contacts/actions/qskypedialer.cpp +++ b/src/akonadi-contacts/actions/qskypedialer.cpp @@ -21,8 +21,6 @@ #include "qskypedialer.h" -#include - #include #include #include @@ -45,7 +43,7 @@ return true; } - interface = KDBusConnectionPool::threadConnection().interface(); + interface = QDBusConnection::sessionBus().interface(); if (interface->isServiceRegistered(service)) { return true; } @@ -61,7 +59,7 @@ QDBusInterface *interface = new QDBusInterface(service, path, QString(), QDBusConnection::sessionBus()); if (!interface->isValid()) { delete interface; - interface = new QDBusInterface(service, path, QString(), KDBusConnectionPool::threadConnection()); + interface = new QDBusInterface(service, path, QString(), QDBusConnection::sessionBus()); } return interface;