From 343dd8b9ea105df128f3576323f802a0db6bba54 Mon Sep 17 00:00:00 2001 From: Jussi Kuokkanen Date: Thu, 21 Apr 2022 21:29:34 +0300 Subject: [PATCH] daemon: expose unit from Assignable --- src/tuxclockerd/Adaptors.hpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/tuxclockerd/Adaptors.hpp b/src/tuxclockerd/Adaptors.hpp index 193494e..5c180f8 100644 --- a/src/tuxclockerd/Adaptors.hpp +++ b/src/tuxclockerd/Adaptors.hpp @@ -87,6 +87,7 @@ public: qDBusRegisterMetaType>(); qDBusRegisterMetaType>(); qDBusRegisterMetaType>(); + qDBusRegisterMetaType>(); QVariant a_info; // Unwrap AssignableInfo :( match(a.assignableInfo()) @@ -117,7 +118,19 @@ public: m_dbusAssignableInfo = QDBusVariant(a_info); } QDBusVariant assignableInfo_() {return m_dbusAssignableInfo;} - //QString unit_() {return m_assignable.uni} + TCDBus::Result unit_() { + if (m_assignable.unit().has_value()) { + return TCDBus::Result { + .error = false, + .value = QString::fromStdString(m_assignable.unit().value()) + }; + + } + return TCDBus::Result { + .error = true, + .value = QString("") + }; + } public Q_SLOTS: QDBusVariant currentValue() { QDBusVariant retval; @@ -178,10 +191,12 @@ public Q_SLOTS: return res; } + private: Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.tuxclocker.Assignable") Q_PROPERTY(QDBusVariant assignableInfo READ assignableInfo_) + Q_PROPERTY(TCDBus::Result unit READ unit_) Assignable m_assignable; QDBusVariant m_dbusAssignableInfo;