1 files changed, 11 insertions, 14 deletions
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);
 };