marcoallegretti/a-la-karte
marcoallegretti/a-la-karte
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/a-la-karte.git synced 2026-03-26 17:03:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

src: migrate InputServiceClient to generated Input1 proxy

Browse source
This commit is contained in:
Marco Allegretti 2026-02-15 15:11:08 +01:00
parent a893d4fd71
commit d254b272fe
1 changed files with 38 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/inputserviceclient.cpp
View file

@ -3,11 +3,13 @@
#include "inputserviceclient.h" #include "inputserviceclient.h"
#include "input1interface.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QDBusConnection> #include <QDBusConnection>
#include <QDBusConnectionInterface> #include <QDBusConnectionInterface>
#include <QDBusError> #include <QDBusError>
#include <QDBusInterface> #include <QDBusPendingReply>
#include <QDBusReply> #include <QDBusReply>
#include <QDBusServiceWatcher> #include <QDBusServiceWatcher>
#include <QDBusVariant> #include <QDBusVariant>
@ -243,17 +245,21 @@ void InputServiceClient::refreshControllers()
return; return;
} }
QDBusInterface i(kInputService, kInputPath, kInputInterface, QDBusConnection::sessionBus()); org::kde::ALaKarte::Input1 iface(kInputService, kInputPath, QDBusConnection::sessionBus());
i.setTimeout(2000); iface.setTimeout(2000);
const QDBusReply<bool> rescanReply = i.call(QStringLiteral("Rescan")); {
if (!rescanReply.isValid()) { QDBusPendingReply<bool> rescanReply = iface.Rescan();
setLastError(rescanReply.error().message()); rescanReply.waitForFinished();
if (rescanReply.isError()) {
setLastError(rescanReply.error().message());
}
} }
const QDBusReply<QVariantList> reply = i.call(QStringLiteral("ListControllers")); QDBusPendingReply<QVariantList> reply = iface.ListControllers();
reply.waitForFinished();
if (!reply.isValid()) { if (reply.isError()) {
setLastError(reply.error().message()); setLastError(reply.error().message());
return; return;
} }
@ -274,11 +280,13 @@ void InputServiceClient::refreshProfiles()
return; return;
} }
QDBusInterface i(kInputService, kInputPath, kInputInterface, QDBusConnection::sessionBus()); org::kde::ALaKarte::Input1 iface(kInputService, kInputPath, QDBusConnection::sessionBus());
i.setTimeout(2000); iface.setTimeout(2000);
const QDBusReply<QVariantList> reply = i.call(QStringLiteral("ListProfiles"));
if (!reply.isValid()) { QDBusPendingReply<QVariantList> reply = iface.ListProfiles();
reply.waitForFinished();
if (reply.isError()) {
setLastError(reply.error().message()); setLastError(reply.error().message());
return; return;
} }
@ -300,11 +308,13 @@ bool InputServiceClient::setActiveProfile(const QString &controllerId, const QSt
return false; return false;
} }
QDBusInterface i(kInputService, kInputPath, kInputInterface, QDBusConnection::sessionBus()); org::kde::ALaKarte::Input1 iface(kInputService, kInputPath, QDBusConnection::sessionBus());
i.setTimeout(2000); iface.setTimeout(2000);
const QDBusReply<bool> reply = i.call(QStringLiteral("SetActiveProfile"), controllerId, profileId);
if (!reply.isValid()) { QDBusPendingReply<bool> reply = iface.SetActiveProfile(controllerId, profileId);
reply.waitForFinished();
if (reply.isError()) {
setLastError(reply.error().message()); setLastError(reply.error().message());
return false; return false;
} }
@ -319,11 +329,13 @@ QString InputServiceClient::createProfile(const QString &name)
return {}; return {};
} }
QDBusInterface i(kInputService, kInputPath, kInputInterface, QDBusConnection::sessionBus()); org::kde::ALaKarte::Input1 iface(kInputService, kInputPath, QDBusConnection::sessionBus());
i.setTimeout(2000); iface.setTimeout(2000);
const QDBusReply<QString> reply = i.call(QStringLiteral("CreateProfile"), name);
if (!reply.isValid()) { QDBusPendingReply<QString> reply = iface.CreateProfile(name);
reply.waitForFinished();
if (reply.isError()) {
setLastError(reply.error().message()); setLastError(reply.error().message());
return {}; return {};
} }
@ -339,11 +351,13 @@ bool InputServiceClient::deleteProfile(const QString &profileId)
return false; return false;
} }
QDBusInterface i(kInputService, kInputPath, kInputInterface, QDBusConnection::sessionBus()); org::kde::ALaKarte::Input1 iface(kInputService, kInputPath, QDBusConnection::sessionBus());
i.setTimeout(2000); iface.setTimeout(2000);
const QDBusReply<bool> reply = i.call(QStringLiteral("DeleteProfile"), profileId);
if (!reply.isValid()) { QDBusPendingReply<bool> reply = iface.DeleteProfile(profileId);
reply.waitForFinished();
if (reply.isError()) {
setLastError(reply.error().message()); setLastError(reply.error().message());
return false; return false;
} }