Index: sources/AlarmGenerator.cpp
===================================================================
diff -u -r712f4c8a1b2382919300895b4422b831471044a3 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021
--- sources/AlarmGenerator.cpp	(.../AlarmGenerator.cpp)	(revision 712f4c8a1b2382919300895b4422b831471044a3)
+++ sources/AlarmGenerator.cpp	(.../AlarmGenerator.cpp)	(revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021)
@@ -29,7 +29,7 @@
 // namespace
 using namespace Gui;
 
-Model::MAlarmStatus AlarmGenerator::_model;
+Model::MAlarmTriggered AlarmGenerator::_model;
 
 /*!
  * \brief   AlarmGenerator::setBits
@@ -55,24 +55,25 @@
  * \details generates the ALARM_ID_TD_COMM_TIMEOUT alarm.
  * \return  The AlarmStatusData filled with appropriate data for the alarm.
  */
+// AUTOGEN ISSUE
 const AlarmStatusData AlarmGenerator::ALARM_ID_TD_COMM_TIMEOUT()
 {
     AlarmStatusData data;
-    data.mState         = GuiAlarmPriority::ALARM_PRIORITY_HIGH;    // Alarm priority
-    data.mTop           = GuiAlarmID::ALARM_ID_TD_COMM_TIMEOUT;     // Alarm ID
-    data.mMuteTimeout   = 0;                                        // Alarm timeout
-    data.mFlags         = setBits(NO_BUTTON);                       // No button since there is no communicate.
-    _model.data(data);
+    data.malarmState         = GuiAlarmPriority::ALARM_PRIORITY_HIGH;    // Alarm priority
+    data.malarmTop           = GuiAlarmID::ALARM_ID_TD_COMM_TIMEOUT;     // Alarm ID
+    data.msilenceExpiresIn   = 0;                                        // Alarm timeout
+    data.malarmsFlags        = 0; //setBits(NO_BUTTON);                       // No button since there is no communicate.
+    //_model.data(data);
     return data;
 }
 
-const AlarmStatusData AlarmGenerator::ALARM_ID_NO_ALARM()
+const AlarmTriggeredData AlarmGenerator::ALARM_ID_NO_ALARM()
 {
-    AlarmStatusData data;
-    data.mState         = GuiAlarmPriority::ALARM_PRIORITY_NONE;    // Alarm priority
-    data.mTop           = GuiAlarmID::ALARM_ID_NO_ALARM;            // Alarm ID
-    data.mMuteTimeout   = 0;                                        // Alarm timeout
-    data.mFlags         = setBits(NO_BUTTON);                       // No button since there is no communicate.
-    _model.data(data);
+    AlarmTriggeredData data;
+    //data.mState         = GuiAlarmPriority::ALARM_PRIORITY_NONE;    // Alarm priority
+    //data.mTop           = GuiAlarmID::ALARM_ID_NO_ALARM;            // Alarm ID
+    //data.mMuteTimeout   = 0;                                        // Alarm timeout
+    //data.mFlags         = setBits(NO_BUTTON);                       // No button since there is no communicate.
+    //_model.data(data);
     return data;
 }