From d94029fbc403c57413e80cf0bd6276407b1ca812 Mon Sep 17 00:00:00 2001 From: Marco Allegretti Date: Sun, 15 Feb 2026 13:55:50 +0100 Subject: [PATCH] dbus: export daemons via generated adaptors --- src/gamecenter/gamecenterdaemon.cpp | 10 +++++++--- src/gamecenter/gamecenterdaemon.h | 2 +- src/runner/runnermanagerdaemon.cpp | 10 +++++++--- src/runner/runnermanagerdaemon.h | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/gamecenter/gamecenterdaemon.cpp b/src/gamecenter/gamecenterdaemon.cpp index 8145a85..b335e4f 100644 --- a/src/gamecenter/gamecenterdaemon.cpp +++ b/src/gamecenter/gamecenterdaemon.cpp @@ -3,6 +3,8 @@ #include "gamecenterdaemon.h" +#include "gamecenter1adaptor.h" + #include #include #include @@ -968,7 +970,9 @@ bool GameCenterDaemon::init() 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(); return false; } @@ -1015,10 +1019,10 @@ QString GameCenterDaemon::Ping() const return QStringLiteral("ok"); } -void GameCenterDaemon::Version(uint &major, uint &minor) const +uint GameCenterDaemon::Version(uint &minor) const { - major = 1; minor = 0; + return 1; } QVariantMap GameCenterDaemon::GetCapabilities() const diff --git a/src/gamecenter/gamecenterdaemon.h b/src/gamecenter/gamecenterdaemon.h index 0bed398..b034e99 100644 --- a/src/gamecenter/gamecenterdaemon.h +++ b/src/gamecenter/gamecenterdaemon.h @@ -29,7 +29,7 @@ public: public Q_SLOTS: QString Ping() const; - void Version(uint &major, uint &minor) const; + uint Version(uint &minor) const; QVariantMap GetCapabilities() const; QVariantList ListSessions() const; diff --git a/src/runner/runnermanagerdaemon.cpp b/src/runner/runnermanagerdaemon.cpp index 063a738..37b5a09 100644 --- a/src/runner/runnermanagerdaemon.cpp +++ b/src/runner/runnermanagerdaemon.cpp @@ -3,6 +3,8 @@ #include "runnermanagerdaemon.h" +#include "runner1adaptor.h" + #include #include #include @@ -109,7 +111,9 @@ bool RunnerManagerDaemon::init() 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(); return false; } @@ -122,10 +126,10 @@ QString RunnerManagerDaemon::Ping() const return QStringLiteral("ok"); } -void RunnerManagerDaemon::Version(uint &major, uint &minor) const +uint RunnerManagerDaemon::Version(uint &minor) const { - major = 1; minor = 0; + return 1; } QVariantMap RunnerManagerDaemon::RunnerInfo::toVariantMap() const diff --git a/src/runner/runnermanagerdaemon.h b/src/runner/runnermanagerdaemon.h index 9575eee..c815213 100644 --- a/src/runner/runnermanagerdaemon.h +++ b/src/runner/runnermanagerdaemon.h @@ -24,7 +24,7 @@ public: public Q_SLOTS: QString Ping() const; - void Version(uint &major, uint &minor) const; + uint Version(uint &minor) const; QVariantList ListRunners(); bool Rescan();