Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r490a131c41be4c335a7fbd74ff79b5784fb1726c --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 490a131c41be4c335a7fbd74ff79b5784fb1726c) @@ -329,7 +329,7 @@ ID_AdjustTreatmentLogRsp = 0xAA00, // 167 // Treatment Log Data - ID_TreatmentLogAvrgeData = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication + ID_TreatmentLogAvrgeData = 0xAD00, // ID_TreatmentLogAlarmData = 0x6A00, // 106 //// ----- @LEAHIZED ID_TreatmentLogEventData = 0x6B00, // 107 //// ----- @LEAHIZED @@ -406,8 +406,8 @@ Q_ENUM(UF_Adjustments) Q_ENUM(UF_Commands) // Saline - Q_ENUM(Saline_Bolus_States) - Q_ENUM(Saline_Commands) + Q_ENUM(Fluid_Bolus_States) + Q_ENUM(Fluid_Bolus_Commands) // Heparin Q_ENUM(Heparin_States) Q_ENUM(Heparin_Commands) @@ -482,8 +482,8 @@ typedef GuiActions::UF_Commands GuiUFCommands; typedef GuiActions::UF_Adjustments GuiUFAdjustment; // Saline - typedef GuiActions::Saline_Bolus_States GuiSalineStates; - typedef GuiActions::Saline_Commands GuiSalineCommands; + typedef GuiActions::Fluid_Bolus_States GuiSalineStates; + typedef GuiActions::Fluid_Bolus_Commands GuiSalineCommands; // Heparin typedef GuiActions::Heparin_States GuiHeparinStates; typedef GuiActions::Heparin_Commands GuiHeparinCommands;