Index: sources/gui/guiglobals.h
===================================================================
diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r90bcc276f2a879169fef20e9168711cf906c0e54
--- sources/gui/guiglobals.h	(.../guiglobals.h)	(revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5)
+++ sources/gui/guiglobals.h	(.../guiglobals.h)	(revision 90bcc276f2a879169fef20e9168711cf906c0e54)
@@ -39,56 +39,56 @@
          * *** then it can be compared exactly the way it is with no conversion.***\n
          */
         enum GuiActionsType_Enum /*: quint16 QML doesn't support enum types */ {
-            idUnknown                 = 0x0000,
+            ID_Unknown                 = 0x0000,
 
-            idCANBusFaultCount        = 0x9909,
+            ID_CANBusFaultCount        = 0x9909,
 
-            idRawData                 = 0xFFFE,
+            ID_RawData                 = 0xFFFE,
 
-            idAcknow                  = 0xFFFF,
-            idAcknowGeneric           = 0x0000, //< Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder
+            ID_Acknow                  = 0xFFFF,
+            ID_AcknowGeneric           = 0x0000, //< Generic Acknowledgment is not a unique message ID and inherits its Id from the actual message. Zero is a placeholder
 
-            idDGCheckIn               = 0x0600,
-            idKeepAlive               = 0x0700,
+            ID_DGCheckIn               = 0x0600,
+            ID_KeepAlive               = 0x0700,
 
-            idPowerOff                = 0x0100,
-            idPowerOffBroadcast       = 0x0E00,
-            idTreatmentTime           = 0x0D00,
-            idBloodFlow               = 0x0500,
-            idDialysateInletFlow      = 0x0800,
-            idDialysateOutletFlow     = 0x0B00,
-            idTreatmentRanges         = 0x1A00, // 26
-            idPressureOcclusion       = 0x0900,
-            idTreatmentState          = 0x0F00, // 15
+            ID_PowerOff                = 0x0100,
+            ID_PowerOffBroadcast       = 0x0E00,
+            ID_TreatmentTime           = 0x0D00,
+            ID_BloodFlow               = 0x0500,
+            ID_DialysateInletFlow      = 0x0800,
+            ID_DialysateOutletFlow     = 0x0B00,
+            ID_TreatmentRanges         = 0x1A00, // 26
+            ID_PressureOcclusion       = 0x0900,
+            ID_TreatmentState          = 0x0F00, // 15
 
-            idAlarmStatus             = 0x0200,
-            idAlarmTriggered          = 0x0300,
-            idAlarmCleared            = 0x0400,
+            ID_AlarmStatus             = 0x0200,
+            ID_AlarmTriggered          = 0x0300,
+            ID_AlarmCleared            = 0x0400,
 
-            idDGROPumpData            = 0x1F00, // 31
-            idDGPressuresData         = 0x2000, // 32
-            idDGDrainPumpData         = 0x2400, // 36
-            idDGOperationModeData     = 0x2700, // 39
-            idDGReservoirData         = 0x2800, // 40
-            idDGValvesStatesData      = 0x2A00, // 42
-            idDGHeatersData           = 0x2C00, // 44
-            idDGLoadCellReadingsData  = 0x0C00, // 12
-            idDGTemperaturesData      = 0x2D00, // 45
+            ID_DGROPumpData            = 0x1F00, // 31
+            ID_DGPressuresData         = 0x2000, // 32
+            ID_DGDrainPumpData         = 0x2400, // 36
+            ID_DGOperationModeData     = 0x2700, // 39
+            ID_DGReservoirData         = 0x2800, // 40
+            ID_DGValvesStatesData      = 0x2A00, // 42
+            ID_DGHeatersData           = 0x2C00, // 44
+            ID_DGLoadCellReadingsData  = 0x0C00, // 12
+            ID_DGTemperaturesData      = 0x2D00, // 45
 
-            idAdjustBloodDialysateReq = 0x1700, // 23
-            idAdjustBloodDialysateRsp = 0x1800, // 24
+            ID_AdjustBloodDialysateReq = 0x1700, // 23
+            ID_AdjustBloodDialysateRsp = 0x1800, // 24
 
-            idAdjustUltrafiltrationStateReq   = 0x1000, // 16
+            ID_AdjustUltrafiltrationStateReq   = 0x1000, // 16
             // idAcknowGeneric : the response is the AcknowGeneric with the same msgID
 
-            idAdjustUltrafiltrationEditReq    = 0x1100, // 17
-            idAdjustUltrafiltrationEditRsp    = 0x1300, // 19
+            ID_AdjustUltrafiltrationEditReq    = 0x1100, // 17
+            ID_AdjustUltrafiltrationEditRsp    = 0x1300, // 19
 
-            idAdjustUltrafiltrationConfirmReq = 0x1500, // 21
-            idAdjustUltrafiltrationConfirmRsp = 0x2E00, // 46
+            ID_AdjustUltrafiltrationConfirmReq = 0x1500, // 21
+            ID_AdjustUltrafiltrationConfirmRsp = 0x2E00, // 46
 
-            idAdjustDurationReq       = 0x1600, // 22
-            idAdjustDurationRsp       = 0x1B00, // 27
+            ID_AdjustDurationReq       = 0x1600, // 22
+            ID_AdjustDurationRsp       = 0x1B00, // 27
         };
 
         enum class GuiActionsData_Enum /*: quint8  QML doesn't support*/ {