From 6e55c1a428a6dbc7b7d731fb554c7759d2ab1fc0 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 24 Aug 2023 15:44:08 -0400 Subject: Update VehicleSignals usage Update usage of the VehicleSignals class from libqtappfw to work with its changes to switch to using the KUKSA.val databroker. Changes: - Update set calls to use appropriate type for the signal. - Remove authorized & disconnected signal handling, as they are no-ops now. Bug-AGL: SPEC-4762 Signed-off-by: Scott Murray Change-Id: I84f9d8fa5f0c516b2f2953f8ab61797484270c95 --- homescreen/src/mastervolume.h | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'homescreen/src/mastervolume.h') diff --git a/homescreen/src/mastervolume.h b/homescreen/src/mastervolume.h index fbbab4b..89d763b 100644 --- a/homescreen/src/mastervolume.h +++ b/homescreen/src/mastervolume.h @@ -21,29 +21,26 @@ class MasterVolume : public QObject { Q_OBJECT - Q_PROPERTY (uint32_t volume READ getVolume WRITE setVolume NOTIFY VolumeChanged) - -private: - qint32 m_volume; - VehicleSignals *m_vs; - bool m_connected; - - void updateVolume(QString value); public: MasterVolume(QObject* parent = nullptr); - ~MasterVolume() = default; + ~MasterVolume(); Q_INVOKABLE qint32 getVolume() const; - Q_INVOKABLE void setVolume(qint32 val); + Q_INVOKABLE void setVolume(quint32 val); + Q_PROPERTY (uint32_t volume READ getVolume WRITE setVolume NOTIFY VolumeChanged) + +signals: + void VolumeChanged(); private slots: void onConnected(); - void onAuthorized(); - void onDisconnected(); void onGetSuccessResponse(QString path, QString value, QString timestamp); void onSignalNotification(QString path, QString value, QString timestamp); -signals: - void VolumeChanged(); +private: + quint32 m_volume; + VehicleSignals *m_vs; + + void updateVolume(QString value); }; -- cgit 1.2.3-korg