Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp
===================================================================
diff -u -r88563177f10f20ced98750b2e40036201728131d -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e
--- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp	(.../MPostTreatmentAdjustTreatmentLogResponse.cpp)	(revision 88563177f10f20ced98750b2e40036201728131d)
+++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp	(.../MPostTreatmentAdjustTreatmentLogResponse.cpp)	(revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e)
@@ -46,7 +46,7 @@
         _data.mHeparinConcentration         .value,
         _data.mHeparinBolusVolume           .value,
         _data.mHeparinDispenseRate          .value,
-        _data.mHeparinPreStop               .value,
+        _data.mHeparinStop                  .value,
         _data.mHeparinDeliveredVolume       .value,
         _data.mAverageArterialPressure      .value,
         _data.mAverageVenousPressure        .value,
@@ -58,77 +58,77 @@
 
 bool MAdjustTreatmentLogResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mAccepted                     )) {
-    if (GetValue(vByteArray, index, _data.mReason                       )) {
-    if (GetValue(vByteArray, index, _data.mBloodFlowRate                )) {
-    if (GetValue(vByteArray, index, _data.mDialysateFlowRate            )) {
-    if (GetValue(vByteArray, index, _data.mTreatmentDuration            )) {
-    if (GetValue(vByteArray, index, _data.mActualTreatmentDuration      )) {
-    if (GetValue(vByteArray, index, _data.mAcidConcentrateType          )) {
-    if (GetValue(vByteArray, index, _data.mBicarbonateConcentrateType   )) {
-    if (GetValue(vByteArray, index, _data.mPotassiumConcentration       )) {
-    if (GetValue(vByteArray, index, _data.mCalciumConcentration         )) {
-    if (GetValue(vByteArray, index, _data.mBicarbonateConcentration     )) {
-    if (GetValue(vByteArray, index, _data.mSodiumConcentration          )) {
-    if (GetValue(vByteArray, index, _data.mDialysateTemperature         )) {
-    if (GetValue(vByteArray, index, _data.mDialyzerType                 )) {
-    if (GetValue(vByteArray, index, _data.mTreatmentDateTime            )) {
-    if (GetValue(vByteArray, index, _data.mAverageBloodFlow             )) {
-    if (GetValue(vByteArray, index, _data.mAverageDialysateFlow         )) {
-    if (GetValue(vByteArray, index, _data.mDialysateVolumeUsed          )) {
-    if (GetValue(vByteArray, index, _data.mAverageDialysateTemp         )) {
-    if (GetValue(vByteArray, index, _data.mTargetUFVolume               )) {
-    if (GetValue(vByteArray, index, _data.mActualUFVolume               )) {
-    if (GetValue(vByteArray, index, _data.mTargetUFRate                 )) {
-    if (GetValue(vByteArray, index, _data.mActualUFRate                 )) {
-    if (GetValue(vByteArray, index, _data.mSalineBolusVolume            )) {
-    if (GetValue(vByteArray, index, _data.mHeparinType                  )) {
-    if (GetValue(vByteArray, index, _data.mHeparinConcentration         )) {
-    if (GetValue(vByteArray, index, _data.mHeparinBolusVolume           )) {
-    if (GetValue(vByteArray, index, _data.mHeparinDispenseRate          )) {
-    if (GetValue(vByteArray, index, _data.mHeparinPreStop               )) {
-    if (GetValue(vByteArray, index, _data.mHeparinDeliveredVolume       )) {
-    if (GetValue(vByteArray, index, _data.mAverageArterialPressure      )) {
-    if (GetValue(vByteArray, index, _data.mAverageVenousPressure        )) {
-    if (GetValue(vByteArray, index, _data.mEndTreatmentEarlyAlarm       )) {
-    if (GetValue(vByteArray, index, _data.mDeviceID                     )) {
-    if (GetValue(vByteArray, index, _data.mWaterSampleTestResult        )) {
+    if (GetValue(vByteArray, index, _data.mAccepted                     ))
+    if (GetValue(vByteArray, index, _data.mReason                       ))
+    if (GetValue(vByteArray, index, _data.mBloodFlowRate                ))
+    if (GetValue(vByteArray, index, _data.mDialysateFlowRate            ))
+    if (GetValue(vByteArray, index, _data.mTreatmentDuration            ))
+    if (GetValue(vByteArray, index, _data.mActualTreatmentDuration      ))
+    if (GetValue(vByteArray, index, _data.mAcidConcentrateType          ))
+    if (GetValue(vByteArray, index, _data.mBicarbonateConcentrateType   ))
+    if (GetValue(vByteArray, index, _data.mPotassiumConcentration       ))
+    if (GetValue(vByteArray, index, _data.mCalciumConcentration         ))
+    if (GetValue(vByteArray, index, _data.mBicarbonateConcentration     ))
+    if (GetValue(vByteArray, index, _data.mSodiumConcentration          ))
+    if (GetValue(vByteArray, index, _data.mDialysateTemperature         ))
+    if (GetValue(vByteArray, index, _data.mDialyzerType                 ))
+    if (GetValue(vByteArray, index, _data.mTreatmentDateTime            ))
+    if (GetValue(vByteArray, index, _data.mAverageBloodFlow             ))
+    if (GetValue(vByteArray, index, _data.mAverageDialysateFlow         ))
+    if (GetValue(vByteArray, index, _data.mDialysateVolumeUsed          ))
+    if (GetValue(vByteArray, index, _data.mAverageDialysateTemp         ))
+    if (GetValue(vByteArray, index, _data.mTargetUFVolume               ))
+    if (GetValue(vByteArray, index, _data.mActualUFVolume               ))
+    if (GetValue(vByteArray, index, _data.mTargetUFRate                 ))
+    if (GetValue(vByteArray, index, _data.mActualUFRate                 ))
+    if (GetValue(vByteArray, index, _data.mSalineBolusVolume            ))
+    if (GetValue(vByteArray, index, _data.mHeparinType                  ))
+    if (GetValue(vByteArray, index, _data.mHeparinConcentration         ))
+    if (GetValue(vByteArray, index, _data.mHeparinBolusVolume           ))
+    if (GetValue(vByteArray, index, _data.mHeparinDispenseRate          ))
+    if (GetValue(vByteArray, index, _data.mHeparinStop                  ))
+    if (GetValue(vByteArray, index, _data.mHeparinDeliveredVolume       ))
+    if (GetValue(vByteArray, index, _data.mAverageArterialPressure      ))
+    if (GetValue(vByteArray, index, _data.mAverageVenousPressure        ))
+    if (GetValue(vByteArray, index, _data.mEndTreatmentEarlyAlarm       ))
+    if (GetValue(vByteArray, index, _data.mDeviceID                     ))
+    if (GetValue(vByteArray, index, _data.mWaterSampleTestResult        ))
          return true ;
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
-    } else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
 }
 
 /*!
@@ -166,7 +166,7 @@
     data.mHeparinConcentration          = _data.mHeparinConcentration       .value;
     data.mHeparinBolusVolume            = _data.mHeparinBolusVolume         .value;
     data.mHeparinDispenseRate           = _data.mHeparinDispenseRate        .value;
-    data.mHeparinPreStop                = _data.mHeparinPreStop             .value;
+    data.mHeparinStop                   = _data.mHeparinStop                .value;
     data.mHeparinDeliveredVolume        = _data.mHeparinDeliveredVolume     .value;
     data.mAverageArterialPressure       = _data.mAverageArterialPressure    .value;
     data.mAverageVenousPressure         = _data.mAverageVenousPressure      .value;