daemon: expose unit from Assignable

This commit is contained in:
Jussi Kuokkanen 2022-04-21 21:29:34 +03:00
parent 09581b8e96
commit 343dd8b9ea

View File

@ -87,6 +87,7 @@ public:
qDBusRegisterMetaType<TCDBus::Result<int>>(); qDBusRegisterMetaType<TCDBus::Result<int>>();
qDBusRegisterMetaType<TCDBus::Result<double>>(); qDBusRegisterMetaType<TCDBus::Result<double>>();
qDBusRegisterMetaType<TCDBus::Result<uint>>(); qDBusRegisterMetaType<TCDBus::Result<uint>>();
qDBusRegisterMetaType<TCDBus::Result<QString>>();
QVariant a_info; QVariant a_info;
// Unwrap AssignableInfo :( // Unwrap AssignableInfo :(
match(a.assignableInfo()) match(a.assignableInfo())
@ -117,7 +118,19 @@ public:
m_dbusAssignableInfo = QDBusVariant(a_info); m_dbusAssignableInfo = QDBusVariant(a_info);
} }
QDBusVariant assignableInfo_() {return m_dbusAssignableInfo;} QDBusVariant assignableInfo_() {return m_dbusAssignableInfo;}
//QString unit_() {return m_assignable.uni} TCDBus::Result<QString> unit_() {
if (m_assignable.unit().has_value()) {
return TCDBus::Result<QString> {
.error = false,
.value = QString::fromStdString(m_assignable.unit().value())
};
}
return TCDBus::Result<QString> {
.error = true,
.value = QString("")
};
}
public Q_SLOTS: public Q_SLOTS:
QDBusVariant currentValue() { QDBusVariant currentValue() {
QDBusVariant retval; QDBusVariant retval;
@ -178,10 +191,12 @@ public Q_SLOTS:
return res; return res;
} }
private: private:
Q_OBJECT Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "org.tuxclocker.Assignable") Q_CLASSINFO("D-Bus Interface", "org.tuxclocker.Assignable")
Q_PROPERTY(QDBusVariant assignableInfo READ assignableInfo_) Q_PROPERTY(QDBusVariant assignableInfo READ assignableInfo_)
Q_PROPERTY(TCDBus::Result<QString> unit READ unit_)
Assignable m_assignable; Assignable m_assignable;
QDBusVariant m_dbusAssignableInfo; QDBusVariant m_dbusAssignableInfo;