diff --git a/src/service/Activities.cpp b/src/service/Activities.cpp --- a/src/service/Activities.cpp +++ b/src/service/Activities.cpp @@ -32,7 +32,6 @@ #include // KDE -#include #include #include #include @@ -495,7 +494,7 @@ // Initializing D-Bus service new ActivitiesAdaptor(this); - KDBusConnectionPool::threadConnection().registerObject( + QDBusConnection::sessionBus().registerObject( KAMD_DBUS_OBJECT_PATH(Activities), this); // Initializing config diff --git a/src/service/Application.cpp b/src/service/Application.cpp --- a/src/service/Application.cpp +++ b/src/service/Application.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -35,7 +36,6 @@ #include #include #include -#include #include // Boost and utils @@ -138,7 +138,7 @@ void Application::init() { - if (!KDBusConnectionPool::threadConnection().registerService( + if (!QDBusConnection::sessionBus().registerService( KAMD_DBUS_SERVICE)) { QCoreApplication::exit(EXIT_SUCCESS); } diff --git a/src/service/Features.cpp b/src/service/Features.cpp --- a/src/service/Features.cpp +++ b/src/service/Features.cpp @@ -21,8 +21,8 @@ // Self #include "Features.h" -// KDE -#include +// Qt +#include // Utils #include @@ -40,7 +40,7 @@ , d() { new FeaturesAdaptor(this); - KDBusConnectionPool::threadConnection().registerObject( + QDBusConnection::sessionBus().registerObject( KAMD_DBUS_OBJECT_PATH(Features), this); } diff --git a/src/service/Resources.cpp b/src/service/Resources.cpp --- a/src/service/Resources.cpp +++ b/src/service/Resources.cpp @@ -30,7 +30,6 @@ // KDE #include -#include // Utils #include @@ -271,7 +270,7 @@ qRegisterMetaType("WId"); new ResourcesAdaptor(this); - KDBusConnectionPool::threadConnection().registerObject( + QDBusConnection::sessionBus().registerObject( KAMD_DBUS_OBJECT_PATH(Resources), this); connect(KWindowSystem::self(), &KWindowSystem::windowRemoved, diff --git a/src/service/ksmserver/KSMServer.cpp b/src/service/ksmserver/KSMServer.cpp --- a/src/service/ksmserver/KSMServer.cpp +++ b/src/service/ksmserver/KSMServer.cpp @@ -30,9 +30,6 @@ #include #include -// KDE -#include - // Utils #include diff --git a/src/service/plugins/activitytemplates/TemplatesPlugin.cpp b/src/service/plugins/activitytemplates/TemplatesPlugin.cpp --- a/src/service/plugins/activitytemplates/TemplatesPlugin.cpp +++ b/src/service/plugins/activitytemplates/TemplatesPlugin.cpp @@ -19,12 +19,10 @@ #include "TemplatesPlugin.h" // Qt +#include #include #include -// KDE -#include - // Utils #include @@ -42,7 +40,7 @@ setName(QStringLiteral("org.kde.ActivityManager.ActivityTemplates")); new TemplatesAdaptor(this); - KDBusConnectionPool::threadConnection().registerObject(QStringLiteral("/Templates"), this); + QDBusConnection::sessionBus().registerObject(QStringLiteral("/Templates"), this); } TemplatesPlugin::~TemplatesPlugin() diff --git a/src/service/plugins/slc/SlcPlugin.cpp b/src/service/plugins/slc/SlcPlugin.cpp --- a/src/service/plugins/slc/SlcPlugin.cpp +++ b/src/service/plugins/slc/SlcPlugin.cpp @@ -21,9 +21,6 @@ // Qt #include -// KDE -#include - // Local #include "slcadaptor.h" @@ -35,7 +32,7 @@ Q_UNUSED(args); new SLCAdaptor(this); - KDBusConnectionPool::threadConnection().registerObject(QStringLiteral("/SLC"), this); + QDBusConnection::sessionBus().registerObject(QStringLiteral("/SLC"), this); } SlcPlugin::~SlcPlugin() diff --git a/src/service/plugins/sqlite/ResourceLinking.cpp b/src/service/plugins/sqlite/ResourceLinking.cpp --- a/src/service/plugins/sqlite/ResourceLinking.cpp +++ b/src/service/plugins/sqlite/ResourceLinking.cpp @@ -22,12 +22,12 @@ #include "ResourceLinking.h" // Qt +#include #include #include // KDE #include -#include #include // Boost @@ -45,7 +45,7 @@ : QObject(parent) { new ResourcesLinkingAdaptor(this); - KDBusConnectionPool::threadConnection().registerObject( + QDBusConnection::sessionBus().registerObject( QStringLiteral("/ActivityManager/Resources/Linking"), this); } diff --git a/src/service/plugins/sqlite/StatsPlugin.cpp b/src/service/plugins/sqlite/StatsPlugin.cpp --- a/src/service/plugins/sqlite/StatsPlugin.cpp +++ b/src/service/plugins/sqlite/StatsPlugin.cpp @@ -22,13 +22,13 @@ #include "StatsPlugin.h" // Qt +#include #include #include #include // KDE #include -#include #include // Boost @@ -58,7 +58,7 @@ s_instance = this; new ResourcesScoringAdaptor(this); - KDBusConnectionPool::threadConnection().registerObject( + QDBusConnection::sessionBus().registerObject( QStringLiteral("/ActivityManager/Resources/Scoring"), this); setName(QStringLiteral("org.kde.ActivityManager.Resources.Scoring"));