Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba -rf835b04c0a82a4ebf58f94b817f7961b2e824c35 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision f835b04c0a82a4ebf58f94b817f7961b2e824c35) @@ -123,7 +123,7 @@ ID_TDOpModeData = 0x1200, // 18 //// ----- @LEAHIZED ID_PreTreatmentStates = 0xB700, // 183 //// ----- @LEAHIZED ID_TreatmentStates = 0x3C00, // 60 //// ----- @LEAHIZED - ID_PostTreatmentStates = 0x770F, // 119 //// ----- @CRAPIZED: had to change to avoid duplication + ID_PostTreatmentStates = 0xDA00, // 218 //// ----- @LEAHIZED // ----- ID_PowerOffWarning = 0x2200, // 34 //// ----- @LEAHIZED @@ -466,7 +466,7 @@ #include "DDDefs.h" Q_ENUM(DD_Op_Modes) - Q_ENUM(DD_Disinfect_States) + Q_ENUM(Disinfect_Selection) Q_ENUM(DD_Heat_UI_States) Q_ENUM(DD_Valves) @@ -544,7 +544,7 @@ typedef GuiActions::TD_Post_Treatment_Mode_States GuiPostTreatmentStates; // Disinfection Heat States - typedef GuiActions::DD_Disinfect_States GuiDisinfectDGStates; + typedef GuiActions::Disinfect_Selection GuiDisinfectDDSelection; typedef GuiActions::DD_Heat_UI_States GuiDisinfectDGHeatStates; // DD Valves