Index: sources/gui/guiglobals.h
===================================================================
diff -u -r0e87420e50dd94c37eb25f289ef3262e0e45d7f4 -r70a248b93720a46cb3a0f60b092698acd2acc7c1
--- sources/gui/guiglobals.h	(.../guiglobals.h)	(revision 0e87420e50dd94c37eb25f289ef3262e0e45d7f4)
+++ sources/gui/guiglobals.h	(.../guiglobals.h)	(revision 70a248b93720a46cb3a0f60b092698acd2acc7c1)
@@ -100,34 +100,52 @@
             Timeout     = 0x01,
         };
 
-        enum GuiAlarmPriority_Enum {
-            AlarmPriority_None             = 0 ,
-            AlarmPriority_Low                  ,
-            AlarmPriority_Medium               ,
-            AlarmPriority_High                 ,
+        enum GuiAlarmPriority_Enum {  // TODO : this code has to be in common repository soon.
+            ALARM_PRIORITY_NONE = 0,
+            ALARM_PRIORITY_LOW,
+            ALARM_PRIORITY_MEDIUM,
+            ALARM_PRIORITY_HIGH,
+            NUM_OF_ALARM_PRIORITIES
         };
 
-        enum GuiAlarmID_Enum {
-            No_Alarm                        = 0 ,
-            Software_Fault                      ,
-            Stuck_Button_Test_Failed            ,
-            FPGA_Post_Test_Failed               ,
-            Watchdog_Post_Test_Failed           ,
-            UI_Comm_Post_Failed                 , // 5
-            Blood_pump_Mc_Current_Check         ,
-            Blood_Pump_Mc_Speed_Check           ,
-            Blood_Pump_Mc_Direction_Check       ,
-            Blood_Pump_Rotor_Speed_Check        ,
-            Dial_In_pump_Mc_Current_Check       , // 10
-            Dial_In_pump_Mc_Speed_Check         ,
-            Dial_In_pump_Mc_Direction_Check     ,
-            Dial_In_pump_Rotor_Speed_Check      ,
-            Dial_Out_Pump_Mc_Current_Check      ,
-            Dial_Out_Pump_Mc_Speed_Check        , // 15
-            Dial_Out_Pump_Mc_Direction_Check    ,
-            Dial_Out_Pump_Rotor_Speed_Check     ,
-            Watchdog_Expired                    ,
-            Num_Of_Alarm_IDs                    ,
+        enum GuiAlarmID_Enum { // TODO : this code has to be in common repository soon.
+            ALARM_ID_NO_ALARM = 0,
+            ALARM_ID_SOFTWARE_FAULT,
+            ALARM_ID_STUCK_BUTTON_TEST_FAILED,
+            ALARM_ID_FPGA_POST_TEST_FAILED,
+            ALARM_ID_WATCHDOG_POST_TEST_FAILED,
+            ALARM_ID_UI_COMM_POST_FAILED,                       // 5
+            ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK,
+            ALARM_ID_BLOOD_PUMP_MC_SPEED_CHECK,
+            ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK,
+            ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK,
+            ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK,             // 10
+            ALARM_ID_DIAL_IN_PUMP_MC_SPEED_CHECK,
+            ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK,
+            ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK,
+            ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK,
+            ALARM_ID_DIAL_OUT_PUMP_MC_SPEED_CHECK,              // 15
+            ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK,
+            ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK,
+            ALARM_ID_WATCHDOG_EXPIRED,
+            ALARM_ID_RTC_COMM_ERROR,
+            ALARM_ID_RTC_CONFIG_ERROR,                          // 20
+            ALARM_ID_DG_COMM_TIMEOUT,
+            ALARM_ID_UI_COMM_TIMEOUT,
+            ALARM_ID_COMM_TOO_MANY_BAD_CRCS,
+            ALARM_ID_TREATMENT_STOPPED_BY_USER,
+            ALARM_ID_BLOOD_SITTING_WARNING,                     // 25
+            ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RESUME,
+            ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK,
+            ALARM_ID_CAN_MESSAGE_NOT_ACKED,
+            ALARM_ID_OCCLUSION_BLOOD_PUMP,
+            ALARM_ID_OCCLUSION_DIAL_IN_PUMP,                    // 30
+            ALARM_ID_OCCLUSION_DIAL_OUT_PUMP,
+            ALARM_ID_ARTERIAL_PRESSURE_LOW,
+            ALARM_ID_ARTERIAL_PRESSURE_HIGH,
+            ALARM_ID_VENOUS_PRESSURE_LOW,
+            ALARM_ID_VENOUS_PRESSURE_HIGH,                      // 35
+            NUM_OF_ALARM_IDS
         };
 
 
Index: sources/gui/guiview.cpp
===================================================================
diff -u -r8c69137f18382bdc55a5678e6ed44a7683fe4dea -r70a248b93720a46cb3a0f60b092698acd2acc7c1
--- sources/gui/guiview.cpp	(.../guiview.cpp)	(revision 8c69137f18382bdc55a5678e6ed44a7683fe4dea)
+++ sources/gui/guiview.cpp	(.../guiview.cpp)	(revision 70a248b93720a46cb3a0f60b092698acd2acc7c1)
@@ -185,7 +185,7 @@
  */
 QString GuiView::alarmIDName(GuiAlarmID vEnum)
 {
-    // this code is the place holder for the alarms description mapping
+    // TEST : this code is the place holder for the alarms description mapping
     // since it is another feature
     // it returns the enum name for now
     const QMetaObject *mo = qt_getEnumMetaObject(vEnum);