Differential D27510 Diff 76062 src/core/agentconfigurationmanager.cpp

Changeset View

Standalone View

View Options

src/core/agentconfigurationmanager.cpp

Show All 20 Lines
21#include "akonadicore_debug.h" 21​#include "akonadicore_debug.h"
22#include "servermanager.h" 22​#include "servermanager.h"
23 23​
24#include <QDBusConnectionInterface> 24​#include <QDBusConnectionInterface>
25#include <QCoreApplication> 25​#include <QCoreApplication>
26#include <QPluginLoader> 26​#include <QPluginLoader>
27#include <QDir> 27​#include <QDir>
28 28​
29#include <KDBusConnectionPool> 29​#include <QDBusConnection>
30 30​
31namespace Akonadi { 31​namespace Akonadi {
32class Q_DECL_HIDDEN AgentConfigurationManager::Private { 32​class Q_DECL_HIDDEN AgentConfigurationManager::Private {
33public: 33​public:
34 QString serviceName(const QString &instance) const 34​ QString serviceName(const QString &instance) const
35 { 35​ {
36 QString service = QStringLiteral("org.freedesktop.Akonadi.AgentConfig.%1").arg(instance); 36​ QString service = QStringLiteral("org.freedesktop.Akonadi.AgentConfig.%1").arg(instance);
37 if (ServerManager::self()->hasInstanceIdentifier()) { 37​ if (ServerManager::self()->hasInstanceIdentifier()) {
Show All 23 Lines
61 61​
62AgentConfigurationManager::~AgentConfigurationManager() 62​AgentConfigurationManager::~AgentConfigurationManager()
63{ 63​{
64} 64​}
65 65​
66bool AgentConfigurationManager::registerInstanceConfiguration(const QString &instance) 66​bool AgentConfigurationManager::registerInstanceConfiguration(const QString &instance)
67{ 67​{
68 const auto serviceName = d->serviceName(instance); 68​ const auto serviceName = d->serviceName(instance);
69 QDBusConnection conn = KDBusConnectionPool::threadConnection(); 69​ QDBusConnection conn = QDBusConnection::sessionBus();
70 if (conn.interface()->isServiceRegistered(serviceName)) { 70​ if (conn.interface()->isServiceRegistered(serviceName)) {
71 qCDebug(AKONADICORE_LOG) << "Service " << serviceName << " is already registered"; 71​ qCDebug(AKONADICORE_LOG) << "Service " << serviceName << " is already registered";
72 return false; 72​ return false;
73 } 73​ }
74 74​
75 return conn.registerService(serviceName); 75​ return conn.registerService(serviceName);
76} 76​}
77 77​
78void AgentConfigurationManager::unregisterInstanceConfiguration(const QString &instance) 78​void AgentConfigurationManager::unregisterInstanceConfiguration(const QString &instance)
79{ 79​{
80 const auto serviceName = d->serviceName(instance); 80​ const auto serviceName = d->serviceName(instance);
81 KDBusConnectionPool::threadConnection().unregisterService(serviceName); 81​ QDBusConnection::sessionBus().unregisterService(serviceName);
82} 82​}
83 83​
84bool AgentConfigurationManager::isInstanceRegistered(const QString &instance) const 84​bool AgentConfigurationManager::isInstanceRegistered(const QString &instance) const
85{ 85​{
86 const auto serviceName = d->serviceName(instance); 86​ const auto serviceName = d->serviceName(instance);
87 return KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(serviceName); 87​ return QDBusConnection::sessionBus().interface()->isServiceRegistered(serviceName);
88} 88​}
89 89​
90QString AgentConfigurationManager::findConfigPlugin(const QString &type) const 90​QString AgentConfigurationManager::findConfigPlugin(const QString &type) const
91{ 91​{
92 const auto libPaths = QCoreApplication::libraryPaths(); 92​ const auto libPaths = QCoreApplication::libraryPaths();
93 for (const auto &libPath : libPaths) { 93​ for (const auto &libPath : libPaths) {
94 const QString pluginPath = QStringLiteral("%1/akonadi/config/").arg(libPath); 94​ const QString pluginPath = QStringLiteral("%1/akonadi/config/").arg(libPath);
95 const auto libs = QDir(pluginPath).entryInfoList(QDir::Files | QDir::NoDotAndDotDot); 95​ const auto libs = QDir(pluginPath).entryInfoList(QDir::Files | QDir::NoDotAndDotDot);
Show All 19 Lines