Index: sources/model/mmodel.h
===================================================================
diff -u -reb19475a6bf4ed7f6a16bc07eefc7813496620ef -r03de7d132838c54a23862809357c42102b6dab99
--- sources/model/mmodel.h	(.../mmodel.h)	(revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef)
+++ sources/model/mmodel.h	(.../mmodel.h)	(revision 03de7d132838c54a23862809357c42102b6dab99)
@@ -26,7 +26,7 @@
 #include "mtreatmentranges.h"
 #include "mtreatmentadjustblooddialysateresponse.h"
 #include "mtreatmentadjustdurationresponse.h"
-#include "mtreatmentultrafiltrationstate.h"
+#include "mtreatmentadjustultrafiltrationstateresponse.h"
 #include "mtreatmentadjustultrafiltrationresponse.h"
 
 /*!
@@ -106,85 +106,125 @@
  *
  */
 
+/*!
+ * Simple request models
+ * These are models to send the request for the doAdjustmet
+ * The the only reason thy have been defined to help overloadding the adjusmtent methods
+ * Otherwise the parameters are so tiny models.
+ */
+namespace Model {
+
+class MAdjustBloodDialysateReq {
+public:
+    quint32     bloodFlow = 0;
+    quint32 dialysateFlow = 0;
+};
+
+class MAdjustDurationReq {
+public:
+    quint32 duratoin = 0;
+};
+
+class MAdjustUltrafiltrationStateReq {
+public:
+    enum State{
+        ePaused     =  0,
+        eRunning    =  1,
+    };
+    State requestedState = ePaused; // the requested state. Initially it's running => paused.
+};
+
 class MAdjustUltrafiltrationReq {
 public:
     float volume = 0;
 };
 
+}
+
+
+typedef Model::      MAdjustBloodDialysateReq       AdjustBloodDialysateRequestData;
+typedef Model::            MAdjustDurationReq             AdjustDurationRequestData;
+typedef Model::MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData;
+typedef Model::     MAdjustUltrafiltrationReq      AdjustUltrafiltrationRequestData;
+
 //--------------------------------------------------------------------------------//
 //-------- Please add the model type to the lists below to register them ---------//
 //--------------------------------------------------------------------------------//
 #define REGISTER_MODEL_METATYPES                                                      \
-    REGISTER_METATYPE(                                                BloodFlowData ) \
-    REGISTER_METATYPE(                                            DialysateFlowData ) \
-    REGISTER_METATYPE(                                               OutletFlowData ) \
-    REGISTER_METATYPE(                                            TreatmentTimeData ) \
-    REGISTER_METATYPE(                                        PressureOcclusionData ) \
-    REGISTER_METATYPE(                                              AlarmStatusData ) \
-    REGISTER_METATYPE(                                              AlarmStatusFlag ) \
-    REGISTER_METATYPE(                                                 PowerOffData ) \
-    REGISTER_METATYPE(                                          TreatmentRangesData ) \
-    REGISTER_METATYPE(                            TreatmentUltrafiltrationStateData ) \
-    REGISTER_METATYPE(                             AdjustBloodDialysateResponseData ) \
-    REGISTER_METATYPE(                                   AdjustDurationResponseData ) \
-    REGISTER_METATYPE(                            AdjustUltrafiltrationResponseData ) \
-    REGISTER_METATYPE(                                    MAdjustUltrafiltrationReq )
+    REGISTER_METATYPE(                                                      BloodFlowData ) \
+    REGISTER_METATYPE(                                                  DialysateFlowData ) \
+    REGISTER_METATYPE(                                                     OutletFlowData ) \
+    REGISTER_METATYPE(                                                  TreatmentTimeData ) \
+    REGISTER_METATYPE(                                              PressureOcclusionData ) \
+    REGISTER_METATYPE(                                                    AlarmStatusData ) \
+    REGISTER_METATYPE(                                                    AlarmStatusFlag ) \
+    REGISTER_METATYPE(                                                       PowerOffData ) \
+    REGISTER_METATYPE(                                                TreatmentRangesData ) \
+    REGISTER_METATYPE(                             AdjustUltrafiltrationStateResponseData ) \
+    REGISTER_METATYPE(                                   AdjustBloodDialysateResponseData ) \
+    REGISTER_METATYPE(                                         AdjustDurationResponseData ) \
+    REGISTER_METATYPE(                                  AdjustUltrafiltrationResponseData ) \
+    REGISTER_METATYPE(                              AdjustUltrafiltrationStateRequestData ) \
+    REGISTER_METATYPE(                                    AdjustBloodDialysateRequestData ) \
+    REGISTER_METATYPE(                                          AdjustDurationRequestData ) \
+    REGISTER_METATYPE(                                   AdjustUltrafiltrationRequestData )
+
 //--------------------------------------------------------------------------------//
 #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE)                              \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                         BloodFlowData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     DialysateFlowData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        OutletFlowData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     TreatmentTimeData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                 PressureOcclusionData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                       AlarmStatusData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                          PowerOffData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                   TreatmentRangesData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,     TreatmentUltrafiltrationStateData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,      AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,            AdjustDurationResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,     AdjustUltrafiltrationResponseData )
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               BloodFlowData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                           DialysateFlowData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              OutletFlowData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                           TreatmentTimeData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                       PressureOcclusionData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             AlarmStatusData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                PowerOffData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                         TreatmentRangesData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,      AdjustUltrafiltrationStateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,            AdjustBloodDialysateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                  AdjustDurationResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationResponseData )
 
 //--------------------------------------------------------------------------------//
 #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS                                       \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                 BloodFlowData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                             DialysateFlowData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                OutletFlowData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                             TreatmentTimeData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                         PressureOcclusionData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                               AlarmStatusData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                  PowerOffData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                           TreatmentRangesData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(             TreatmentUltrafiltrationStateData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(              AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                    AdjustDurationResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(             AdjustUltrafiltrationResponseData )
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                       BloodFlowData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                   DialysateFlowData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                      OutletFlowData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                   TreatmentTimeData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                               PressureOcclusionData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                     AlarmStatusData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                        PowerOffData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                 TreatmentRangesData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(              AdjustUltrafiltrationStateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                    AdjustBloodDialysateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                          AdjustDurationResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustUltrafiltrationResponseData )
 //--------------------------------------------------------------------------------//
 #define ACTION_RECEIVE_INTERPRETER_CONNECTIONS                                        \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                    BloodFlowData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                DialysateFlowData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                   OutletFlowData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                TreatmentTimeData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,            PressureOcclusionData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                  AlarmStatusData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                     PowerOffData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,              TreatmentRangesData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,TreatmentUltrafiltrationStateData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,       AdjustDurationResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,AdjustUltrafiltrationResponseData )
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                          BloodFlowData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                      DialysateFlowData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                         OutletFlowData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                      TreatmentTimeData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                  PressureOcclusionData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                        AlarmStatusData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                           PowerOffData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                    TreatmentRangesData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustUltrafiltrationStateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,       AdjustBloodDialysateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,             AdjustDurationResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,      AdjustUltrafiltrationResponseData )
 //--------------------------------------------------------------------------------//
 #define ACTION_RECEIVE_SIGNALS                                                        \
-    ACTION_RECEIVE_SIGNAL(                                            BloodFlowData ) \
-    ACTION_RECEIVE_SIGNAL(                                        DialysateFlowData ) \
-    ACTION_RECEIVE_SIGNAL(                                           OutletFlowData ) \
-    ACTION_RECEIVE_SIGNAL(                                        TreatmentTimeData ) \
-    ACTION_RECEIVE_SIGNAL(                                    PressureOcclusionData ) \
-    ACTION_RECEIVE_SIGNAL(                                          AlarmStatusData ) \
-    ACTION_RECEIVE_SIGNAL(                                             PowerOffData ) \
-    ACTION_RECEIVE_SIGNAL(                                      TreatmentRangesData ) \
-    ACTION_RECEIVE_SIGNAL(                        TreatmentUltrafiltrationStateData ) \
-    ACTION_RECEIVE_SIGNAL(                         AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                               AdjustDurationResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                        AdjustUltrafiltrationResponseData )
+    ACTION_RECEIVE_SIGNAL(                                                  BloodFlowData ) \
+    ACTION_RECEIVE_SIGNAL(                                              DialysateFlowData ) \
+    ACTION_RECEIVE_SIGNAL(                                                 OutletFlowData ) \
+    ACTION_RECEIVE_SIGNAL(                                              TreatmentTimeData ) \
+    ACTION_RECEIVE_SIGNAL(                                          PressureOcclusionData ) \
+    ACTION_RECEIVE_SIGNAL(                                                AlarmStatusData ) \
+    ACTION_RECEIVE_SIGNAL(                                                   PowerOffData ) \
+    ACTION_RECEIVE_SIGNAL(                                            TreatmentRangesData ) \
+    ACTION_RECEIVE_SIGNAL(                         AdjustUltrafiltrationStateResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                               AdjustBloodDialysateResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                     AdjustDurationResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                              AdjustUltrafiltrationResponseData )
 //--------------------------------------------------------------------------------//
 //--------------------------------------------------------------------------------//