From 47cab1cbe539f0ceb376655dee0d0698c730d52c Mon Sep 17 00:00:00 2001 From: Marco Allegretti Date: Sun, 15 Feb 2026 14:46:51 +0100 Subject: [PATCH] inputd: export Input1 via generated adaptor --- src/input/inputdaemon.cpp | 10 +++++++--- src/input/inputdaemon.h | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/input/inputdaemon.cpp b/src/input/inputdaemon.cpp index 907e3b1..f8cc540 100644 --- a/src/input/inputdaemon.cpp +++ b/src/input/inputdaemon.cpp @@ -3,6 +3,8 @@ #include "inputdaemon.h" +#include "input1adaptor.h" + #include #include #include @@ -150,7 +152,9 @@ bool InputDaemon::init() return false; } - if (!bus.registerObject(kInputPath, this, QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals)) { + new Input1Adaptor(this); + + if (!bus.registerObject(kInputPath, this, QDBusConnection::ExportAdaptors)) { qWarning() << "InputDaemon: failed to register object" << kInputPath << bus.lastError().message(); return false; } @@ -199,10 +203,10 @@ QString InputDaemon::Ping() const return QStringLiteral("ok"); } -void InputDaemon::Version(uint &major, uint &minor) const +uint InputDaemon::Version(uint &minor) const { - major = 1; minor = 0; + return 1; } QVariantMap InputDaemon::GetCapabilities() const diff --git a/src/input/inputdaemon.h b/src/input/inputdaemon.h index 776a0ab..a219199 100644 --- a/src/input/inputdaemon.h +++ b/src/input/inputdaemon.h @@ -24,7 +24,7 @@ public: public Q_SLOTS: QString Ping() const; - void Version(uint &major, uint &minor) const; + uint Version(uint &minor) const; QVariantMap GetCapabilities() const; QVariantList ListControllers() const;