Commit 40d97399 authored by Volker Krause's avatar Volker Krause
Browse files

Remove usage of KDBusConnectionPool

Summary:
As per T12722 this is no longer needed, QDBusConnection now behaves
correctly in a multi-threaded scenario.

Reviewers: mlaurent

Reviewed By: mlaurent

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D27569
parent 0a338599
...@@ -47,7 +47,6 @@ find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) ...@@ -47,7 +47,6 @@ find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5XmlGui ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5MailTransportAkonadi ${MAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MailTransportAkonadi ${MAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
......
...@@ -64,7 +64,6 @@ PRIVATE ...@@ -64,7 +64,6 @@ PRIVATE
KF5::MailTransportAkonadi KF5::MailTransportAkonadi
KF5::IdentityManagement KF5::IdentityManagement
KF5::Codecs KF5::Codecs
KF5::DBusAddons
) )
set_target_properties(KF5AkonadiCalendar PROPERTIES set_target_properties(KF5AkonadiCalendar PROPERTIES
......
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
#include "freebusyproviderbase.h" #include "freebusyproviderbase.h"
#include "freebusyproviderbase_p.h" #include "freebusyproviderbase_p.h"
#include <KDBusConnectionPool>
#include "freebusyprovideradaptor.h" #include "freebusyprovideradaptor.h"
#include <QDBusConnection>
#include <QDateTime> #include <QDateTime>
using namespace Akonadi; using namespace Akonadi;
...@@ -32,7 +32,7 @@ FreeBusyProviderBasePrivate::FreeBusyProviderBasePrivate(FreeBusyProviderBase *q ...@@ -32,7 +32,7 @@ FreeBusyProviderBasePrivate::FreeBusyProviderBasePrivate(FreeBusyProviderBase *q
, q(qq) , q(qq)
{ {
new Akonadi__FreeBusyProviderAdaptor(this); new Akonadi__FreeBusyProviderAdaptor(this);
KDBusConnectionPool::threadConnection().registerObject(QStringLiteral("/FreeBusyProvider"), QDBusConnection::sessionBus().registerObject(QStringLiteral("/FreeBusyProvider"),
this, QDBusConnection::ExportAdaptors); this, QDBusConnection::ExportAdaptors);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment