Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -r0f83de066c8a116195a3cc60577d597ef9654c55 -ra6b0dd1e380125fc9128dbe882c6eaf488098c3d --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 0f83de066c8a116195a3cc60577d597ef9654c55) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision a6b0dd1e380125fc9128dbe882c6eaf488098c3d) @@ -60,6 +60,19 @@ QMap _alarms; + typedef struct { + QString group ; + quint32 alarmID ; + quint16 index ; + quint16 locIndex; + quint16 prmIndex; + QString prmExtra; + quint16 prmRound; + } TLocation; + typedef QList TLocationList; + typedef QMap TReplacements; + TReplacements _replacements; + // ********** DYNAMIC PROPERTIES: The properties which need to be updated by each alarm message received. ********** // READONLY( bool , hasAlarm , false) PROPERTY( quint32 , alarm_Priority , 0) @@ -88,7 +101,7 @@ // ********** STATIC PROPERTIES: The properties which need to be updated by each alarm message received. ********** // Q_PROPERTY(QString title READ title NOTIFY alarm_AlarmIDChanged ) Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged ) - Q_PROPERTY(MListModel* instructions READ instructions NOTIFY alarm_AlarmIDChanged) + Q_PROPERTY(MListModel* instructions READ instructions NOTIFY alarm_AlarmIDChanged ) VIEW_DEC_CLASS ( VAlarmStatus ) VIEW_DEC_SLOT ( AlarmStatusData ) @@ -110,6 +123,12 @@ MListModel* instructions () { return &_instructionsList; } ; MListModel _instructionsList; + QStringList updateReplacements( const QString &vGroup , + const QString &vKey , + const int &vAlarmID , + const int &vIndex ); +private slots: + void onActionReceive (GuiActionType vAction, const QVariantList &vData); signals: void didAlarmRaise();