Index: sources/model/mmodel.h
===================================================================
diff -u -r524fee2471717bf627eae41c6a599c9b5f4fbe55 -r6616f7b9b88efffa42ab605833d296afb76d3cb1
--- sources/model/mmodel.h	(.../mmodel.h)	(revision 524fee2471717bf627eae41c6a599c9b5f4fbe55)
+++ sources/model/mmodel.h	(.../mmodel.h)	(revision 6616f7b9b88efffa42ab605833d296afb76d3cb1)
@@ -27,7 +27,8 @@
 #include "mtreatmentadjustblooddialysateresponse.h"
 #include "mtreatmentadjustdurationresponse.h"
 #include "mtreatmentadjustultrafiltrationstateresponse.h"
-#include "mtreatmentadjustultrafiltrationresponse.h"
+#include "mtreatmentadjustultrafiltrationeditresponse.h"
+#include "mtreatmentadjustultrafiltrationconfirmresponse.h"
 
 /*!
  * \brief Message interpretation instruction
@@ -156,88 +157,93 @@
 typedef Model::        MAdjustBloodDialysateReq         AdjustBloodDialysateRequestData;
 typedef Model::              MAdjustDurationReq               AdjustDurationRequestData;
 typedef Model::  MAdjustUltrafiltrationStateReq   AdjustUltrafiltrationStateRequestData;
-typedef Model::       MAdjustUltrafiltrationReq        AdjustUltrafiltrationRequestData;
+typedef Model::       MAdjustUltrafiltrationReq    AdjustUltrafiltrationEditRequestData;
 typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData;
 
 //--------------------------------------------------------------------------------//
 //-------- 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(                             AdjustUltrafiltrationStateResponseData ) \
-    REGISTER_METATYPE(                                   AdjustBloodDialysateResponseData ) \
-    REGISTER_METATYPE(                                         AdjustDurationResponseData ) \
-    REGISTER_METATYPE(                                  AdjustUltrafiltrationResponseData ) \
-    REGISTER_METATYPE(                              AdjustUltrafiltrationStateRequestData ) \
-    REGISTER_METATYPE(                                    AdjustBloodDialysateRequestData ) \
-    REGISTER_METATYPE(                                          AdjustDurationRequestData ) \
-    REGISTER_METATYPE(                                   AdjustUltrafiltrationRequestData ) \
-    REGISTER_METATYPE(                            AdjustUltrafiltrationConfirmRequestData )
+#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(                                      AdjustBloodDialysateRequestData  ) \
+    REGISTER_METATYPE(                                      AdjustBloodDialysateResponseData ) \
+    REGISTER_METATYPE(                                            AdjustDurationRequestData  ) \
+    REGISTER_METATYPE(                                            AdjustDurationResponseData ) \
+    REGISTER_METATYPE(                                AdjustUltrafiltrationStateRequestData  ) \
+    REGISTER_METATYPE(                                AdjustUltrafiltrationStateResponseData ) \
+    REGISTER_METATYPE(                                 AdjustUltrafiltrationEditRequestData  ) \
+    REGISTER_METATYPE(                                 AdjustUltrafiltrationEditResponseData ) \
+    REGISTER_METATYPE(                              AdjustUltrafiltrationConfirmRequestData  ) \
+    REGISTER_METATYPE(                              AdjustUltrafiltrationConfirmResponseData )
 
 //--------------------------------------------------------------------------------//
-#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,      AdjustUltrafiltrationStateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,            AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                  AdjustDurationResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationResponseData )
+#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,         AdjustUltrafiltrationStateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,               AdjustBloodDialysateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustDurationResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,          AdjustUltrafiltrationEditResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,       AdjustUltrafiltrationConfirmResponseData )
 
 //--------------------------------------------------------------------------------//
-#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(              AdjustUltrafiltrationStateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                    AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                          AdjustDurationResponseData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                   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(                  AdjustUltrafiltrationStateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustBloodDialysateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                              AdjustDurationResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustUltrafiltrationEditResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                AdjustUltrafiltrationConfirmResponseData )
 //--------------------------------------------------------------------------------//
-#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, AdjustUltrafiltrationStateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,       AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,             AdjustDurationResponseData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,      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,     AdjustUltrafiltrationStateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,           AdjustBloodDialysateResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,                 AdjustDurationResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,      AdjustUltrafiltrationEditResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,   AdjustUltrafiltrationConfirmResponseData )
 //--------------------------------------------------------------------------------//
-#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(                         AdjustUltrafiltrationStateResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                               AdjustBloodDialysateResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                                     AdjustDurationResponseData ) \
-    ACTION_RECEIVE_SIGNAL(                              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(                             AdjustUltrafiltrationStateResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                   AdjustBloodDialysateResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                         AdjustDurationResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                              AdjustUltrafiltrationEditResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                           AdjustUltrafiltrationConfirmResponseData )
 //--------------------------------------------------------------------------------//
 //--------------------------------------------------------------------------------//