Index: sources/view/VAlarmVolume.h =================================================================== diff -u -rb55cd9ea96a465115044a79bb768c7445461f2a2 -r62d4bbefa96100e5a01194c0b704fe32d9db56ec --- sources/view/VAlarmVolume.h (.../VAlarmVolume.h) (revision b55cd9ea96a465115044a79bb768c7445461f2a2) +++ sources/view/VAlarmVolume.h (.../VAlarmVolume.h) (revision 62d4bbefa96100e5a01194c0b704fe32d9db56ec) @@ -8,7 +8,7 @@ #include "VView.h" #include "main.h" #include "GuiController.h" -#include "MAlarmVolumeData.h" +#include "MAdjustHDAlarmVolumeResponse.h" // forward declarations class tst_views; @@ -28,19 +28,16 @@ friend class ::tst_views; VIEW_DEC_CLASS(VAlarmVolume) -VIEW_DEC_SLOT(AlarmVolumeData) +VIEW_DEC_SLOT(AdjustHDAlarmVolumeResponseData) protected: + PROPERTY(QString, status, "") PROPERTY(quint32, alarmVolume, 5) - PROPERTY(quint32, alarmVolumeTemp, 5) PROPERTY(quint32, alarmVolumeMinimum, 1) PROPERTY(quint32, alarmVolumeMaximum, 5) - PROPERTY(bool, editingAlarmVolume, false) public slots: - void doSetAlarmVolume(const quint32 &vVolume); - void doConfirmAlarmVolume(); - void doCancelAlarmVolume(); + void doConfirmAlarmVolume(const quint32 &vVolume); signals: void didAdjustment(const AdjustAlarmVolumeRequestData &vData);