dbus: export daemons via generated adaptors

This commit is contained in:
Marco Allegretti 2026-02-15 13:55:50 +01:00
parent ed0e6ae181
commit d94029fbc4
4 changed files with 16 additions and 8 deletions

View file

@ -3,6 +3,8 @@
#include "gamecenterdaemon.h" #include "gamecenterdaemon.h"
#include "gamecenter1adaptor.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QDBusArgument> #include <QDBusArgument>
#include <QDBusConnection> #include <QDBusConnection>
@ -968,7 +970,9 @@ bool GameCenterDaemon::init()
return false; return false;
} }
if (!bus.registerObject(QStringLiteral("/org/kde/ALaKarte/GameCenter1"), this, QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals)) { new GameCenter1Adaptor(this);
if (!bus.registerObject(QStringLiteral("/org/kde/ALaKarte/GameCenter1"), this, QDBusConnection::ExportAdaptors)) {
qWarning() << "Failed to register D-Bus object" << bus.lastError().name() << bus.lastError().message(); qWarning() << "Failed to register D-Bus object" << bus.lastError().name() << bus.lastError().message();
return false; return false;
} }
@ -1015,10 +1019,10 @@ QString GameCenterDaemon::Ping() const
return QStringLiteral("ok"); return QStringLiteral("ok");
} }
void GameCenterDaemon::Version(uint &major, uint &minor) const uint GameCenterDaemon::Version(uint &minor) const
{ {
major = 1;
minor = 0; minor = 0;
return 1;
} }
QVariantMap GameCenterDaemon::GetCapabilities() const QVariantMap GameCenterDaemon::GetCapabilities() const

View file

@ -29,7 +29,7 @@ public:
public Q_SLOTS: public Q_SLOTS:
QString Ping() const; QString Ping() const;
void Version(uint &major, uint &minor) const; uint Version(uint &minor) const;
QVariantMap GetCapabilities() const; QVariantMap GetCapabilities() const;
QVariantList ListSessions() const; QVariantList ListSessions() const;

View file

@ -3,6 +3,8 @@
#include "runnermanagerdaemon.h" #include "runnermanagerdaemon.h"
#include "runner1adaptor.h"
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QDBusArgument> #include <QDBusArgument>
#include <QDBusConnection> #include <QDBusConnection>
@ -109,7 +111,9 @@ bool RunnerManagerDaemon::init()
return false; return false;
} }
if (!bus.registerObject(kRunnerPath, this, QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals)) { new Runner1Adaptor(this);
if (!bus.registerObject(kRunnerPath, this, QDBusConnection::ExportAdaptors)) {
qWarning() << "RunnerManagerDaemon: failed to register object" << kRunnerPath << bus.lastError().message(); qWarning() << "RunnerManagerDaemon: failed to register object" << kRunnerPath << bus.lastError().message();
return false; return false;
} }
@ -122,10 +126,10 @@ QString RunnerManagerDaemon::Ping() const
return QStringLiteral("ok"); return QStringLiteral("ok");
} }
void RunnerManagerDaemon::Version(uint &major, uint &minor) const uint RunnerManagerDaemon::Version(uint &minor) const
{ {
major = 1;
minor = 0; minor = 0;
return 1;
} }
QVariantMap RunnerManagerDaemon::RunnerInfo::toVariantMap() const QVariantMap RunnerManagerDaemon::RunnerInfo::toVariantMap() const

View file

@ -24,7 +24,7 @@ public:
public Q_SLOTS: public Q_SLOTS:
QString Ping() const; QString Ping() const;
void Version(uint &major, uint &minor) const; uint Version(uint &minor) const;
QVariantList ListRunners(); QVariantList ListRunners();
bool Rescan(); bool Rescan();