Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -63,7 +63,6 @@ // ********** DYNAMIC PROPERTIES: The properties which need to be updated by each alarm message received. ********** // READONLY( bool , hasAlarm , false) - // disabled coco begin validated: Has been validated manually PROPERTY( quint32 , alarm_Priority , 0) PROPERTY( quint32 , alarm_AlarmID , 0) PROPERTY( quint32 , alarm_EscalateIn , 0) @@ -82,7 +81,6 @@ // 3 reserved flags are here... // PROPERTY( bool , alarm_Flag_noMinimize , false) PROPERTY( bool , alarm_Flag_alarmsCondition , false) - // disabled coco end // ********** STATIC PROPERTIES: The properties which need to be updated by each alarm message received. ********** // Q_PROPERTY(QString title READ title NOTIFY alarm_AlarmIDChanged ) @@ -97,7 +95,6 @@ ADJUST_TRANSMT_SIGNAL ( AlarmSilenceRequestData ) ADJUST_TRANSMT_SIGNAL ( AlarmUserActionRequestData ) - ADJUST_TRANSMT_SIGNAL ( AlarmClearedConditionRequestData ) private: QString title (); @@ -117,6 +114,5 @@ void doUserActionEnd (); void doUserActionOk (); void doSilence (); - void doClearCondition (); }; }