inputd: export Input1 via generated adaptor

This commit is contained in:
Marco Allegretti 2026-02-15 14:46:51 +01:00
parent c58801828c
commit 47cab1cbe5
2 changed files with 8 additions and 4 deletions

View file

@ -3,6 +3,8 @@
#include "inputdaemon.h" #include "inputdaemon.h"
#include "input1adaptor.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QDBusConnection> #include <QDBusConnection>
#include <QDBusConnectionInterface> #include <QDBusConnectionInterface>
@ -150,7 +152,9 @@ bool InputDaemon::init()
return false; 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(); qWarning() << "InputDaemon: failed to register object" << kInputPath << bus.lastError().message();
return false; return false;
} }
@ -199,10 +203,10 @@ QString InputDaemon::Ping() const
return QStringLiteral("ok"); return QStringLiteral("ok");
} }
void InputDaemon::Version(uint &major, uint &minor) const uint InputDaemon::Version(uint &minor) const
{ {
major = 1;
minor = 0; minor = 0;
return 1;
} }
QVariantMap InputDaemon::GetCapabilities() const QVariantMap InputDaemon::GetCapabilities() 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;
QVariantMap GetCapabilities() const; QVariantMap GetCapabilities() const;
QVariantList ListControllers() const; QVariantList ListControllers() const;