Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rfef971047be21dd255a497fbf54c170316d617a9 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision fef971047be21dd255a497fbf54c170316d617a9) @@ -141,12 +141,6 @@ Timeout = 0x01, }; - enum Saline_States { // FW currently doesn't have enum for Saline Bolus when provided better to be replaced. - SALINE_STOP_STATE = 0, ///< Saline is not delivered - SALINE_START_STATE , ///< Saline being Delivered - SALINE_DISABLE_STATE , ///< Saline cumulative volume delivery has reached the maximum - }; - Q_ENUM(GuiActionsType_Enum) Q_ENUM(GuiActionsData_Enum) @@ -162,7 +156,7 @@ Q_ENUM(UF_Adjustments) Q_ENUM(Treatment_States) Q_ENUM(UF_States) - Q_ENUM(Saline_States) + Q_ENUM(Saline_Bolus_States) #include "DGDefs.h" Q_ENUM(DG_Op_Modes) @@ -181,9 +175,9 @@ typedef GuiActions::DG_Op_Modes GuiDGOpModes; typedef GuiActions::UF_Adjustments GuiUFAdjustment; - typedef GuiActions::Treatment_States GuiTreatment_States; + typedef GuiActions::Treatment_States GuiTreatmentStates; typedef GuiActions::UF_States GuiUFStates; - typedef GuiActions::Saline_States GuiSalineStates; + typedef GuiActions::Saline_Bolus_States GuiSalineStates; void registerTypes(); void registerQmlTypes();