Index: sources/canbus/messageinterpreter.h =================================================================== diff -u -r2437559b2d4cd4c2ac6a926b4f55652e55e1f616 -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 --- sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 2437559b2d4cd4c2ac6a926b4f55652e55e1f616) +++ sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) @@ -18,7 +18,7 @@ // Project #include "messageglobals.h" -#include "mmodel.h" +#include "MModel.h" // forward declaration class tst_messaging; @@ -62,17 +62,16 @@ bool pressureOcclusionData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; bool treatmentStateData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - // ----- - DG - bool loadCellReadingsData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - bool temperatureSensorsData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - // ----- Events // ----- - HD bool powerOff(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; bool alarmStatus(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; bool alarmTriggered(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; bool alarmCleared(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; + // ----- - DG + bool prepareData (const Message &vMessage, Gui::GuiActionType vID, Model::MAbstract &vModel, QVariantList &vData); + // ----- Adjustments bool adjustDuration (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; bool adjustBloodDialysate (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__;