Index: sources/model/MTreatmentParametersResp.cpp
===================================================================
diff -u -r5387db3e9735f3bbf768906858dbcd725cf23528 -r0622f1ec79b9a24a3f9d58cd2de329df997b37d6
--- sources/model/MTreatmentParametersResp.cpp	(.../MTreatmentParametersResp.cpp)	(revision 5387db3e9735f3bbf768906858dbcd725cf23528)
+++ sources/model/MTreatmentParametersResp.cpp	(.../MTreatmentParametersResp.cpp)	(revision 0622f1ec79b9a24a3f9d58cd2de329df997b37d6)
@@ -9,26 +9,25 @@
  * @param list (&QVariantlist) - the list to write the data to
  */
 void MTreatmentParametersResponse::toVariantList(QVariantList &list) const
-{
-    list += _data.requestValid.value;
-    list += _data.bloodFlowRate.value;
-    list += _data.dialysateFlowRate.value;
-    list += _data.duration.value;
-    list += _data.heparinDispensingRate.value;
-    list += _data.heparinBolusVolume.value;
-    list += _data.heparinStopTime.value;
-    list += _data.salineBolus.value;
-    list += _data.acidConcentrate.value;
-    list += _data.bicarbonateConcentrate.value;
-    list += _data.dialyzerType.value;
-    list += _data.dialysateTemp.value;
-    list += _data.arterialPressureLimitLow.value;
-    list += _data.arterialPressureLimitHigh.value;
-    list += _data.venousPressureLimitLow.value;
-    list += _data.venousPressureLimitHigh.value;
-    list += _data.bloodPressureMeasureInterval.value;
-    list += _data.rinsebackFlowRate.value;
-
+{   
+    list += _data.requestValid                  .value;
+    list += _data.bloodFlowRate                 .value;
+    list += _data.dialysateFlowRate             .value;
+    list += _data.duration                      .value;
+    list += _data.heparinStopTime               .value;
+    list += _data.salineBolus                   .value;
+    list += _data.acidConcentrate               .value;
+    list += _data.bicarbonateConcentrate        .value;
+    list += _data.dialyzerType                  .value;
+    list += _data.bloodPressureMeasureInterval  .value;
+    list += _data.rinsebackFlowRate             .value;
+    list += _data.arterialPressureLimitLow      .value;
+    list += _data.arterialPressureLimitHigh     .value;
+    list += _data.venousPressureLimitLow        .value;
+    list += _data.venousPressureLimitHigh       .value;
+    list += _data.heparinDispensingRate         .value;
+    list += _data.heparinBolusVolume            .value;
+    list += _data.dialysateTemp                 .value;
 }
 
 AdjustTreatmentParametersResponseData MTreatmentParametersResponse::fromVariantList(const QVariantList &list)
@@ -43,20 +42,20 @@
     data.bloodFlowRate                   = list[1].toUInt();
     data.dialysateFlowRate               = list[2].toUInt();
     data.duration                        = list[3].toUInt();
-    data.heparinDispensingRate           = list[4].toUInt();
-    data.heparinBolusVolume              = list[5].toUInt();
-    data.heparinStopTime                 = list[6].toUInt();
-    data.salineBolus                     = list[7].toUInt();
-    data.acidConcentrate                 = list[8].toUInt();
-    data.bicarbonateConcentrate          = list[9].toUInt();
-    data.dialyzerType                    = list[10].toUInt();
-    data.dialysateTemp                   = list[11].toUInt();
-    data.arterialPressureLimitLow        = list[12].toUInt();
-    data.arterialPressureLimitHigh       = list[13].toUInt();
-    data.venousPressureLimitLow          = list[14].toUInt();
-    data.venousPressureLimitHigh         = list[15].toUInt();
-    data.bloodPressureMeasureInterval    = list[16].toUInt();
-    data.rinsebackFlowRate               = list[17].toUInt();
+    data.heparinStopTime                 = list[4].toUInt();
+    data.salineBolus                     = list[5].toUInt();
+    data.acidConcentrate                 = list[6].toUInt();
+    data.bicarbonateConcentrate          = list[7].toUInt();
+    data.dialyzerType                    = list[8].toUInt();
+    data.bloodPressureMeasureInterval    = list[9].toUInt();
+    data.rinsebackFlowRate               = list[10].toUInt();
+    data.arterialPressureLimitLow        = list[11].toUInt();
+    data.arterialPressureLimitHigh       = list[12].toUInt();
+    data.venousPressureLimitLow          = list[13].toUInt();
+    data.venousPressureLimitHigh         = list[14].toUInt();
+    data.heparinDispensingRate           = list[15].toUInt();
+    data.heparinBolusVolume              = list[16].toUInt();
+    data.dialysateTemp                   = list[17].toUInt();
     return data;
 }
 
@@ -66,20 +65,20 @@
     if (GetValue(vByteArray, index, _data.bloodFlowRate                ))
     if (GetValue(vByteArray, index, _data.dialysateFlowRate            ))
     if (GetValue(vByteArray, index, _data.duration                     ))
-    if (GetValue(vByteArray, index, _data.heparinDispensingRate        ))
-    if (GetValue(vByteArray, index, _data.heparinBolusVolume           ))
     if (GetValue(vByteArray, index, _data.heparinStopTime              ))
     if (GetValue(vByteArray, index, _data.salineBolus                  ))
     if (GetValue(vByteArray, index, _data.acidConcentrate              ))
     if (GetValue(vByteArray, index, _data.bicarbonateConcentrate       ))
     if (GetValue(vByteArray, index, _data.dialyzerType                 ))
-    if (GetValue(vByteArray, index, _data.dialysateTemp                ))
+    if (GetValue(vByteArray, index, _data.bloodPressureMeasureInterval ))
+    if (GetValue(vByteArray, index, _data.rinsebackFlowRate            ))
     if (GetValue(vByteArray, index, _data.arterialPressureLimitLow     ))
     if (GetValue(vByteArray, index, _data.arterialPressureLimitHigh    ))
     if (GetValue(vByteArray, index, _data.venousPressureLimitLow       ))
     if (GetValue(vByteArray, index, _data.venousPressureLimitHigh      ))
-    if (GetValue(vByteArray, index, _data.bloodPressureMeasureInterval ))
-    if (GetValue(vByteArray, index, _data.rinsebackFlowRate            ))
+    if (GetValue(vByteArray, index, _data.heparinDispensingRate        ))
+    if (GetValue(vByteArray, index, _data.heparinBolusVolume           ))
+    if (GetValue(vByteArray, index, _data.dialysateTemp                ))
          return true;
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
@@ -107,20 +106,20 @@
             .arg(_data.bloodFlowRate.value)
             .arg(_data.dialysateFlowRate.value)
             .arg(_data.duration.value)
-            .arg(_data.heparinDispensingRate.value)
-            .arg(_data.heparinBolusVolume.value)
             .arg(_data.heparinStopTime.value)
             .arg(_data.salineBolus.value)
             .arg(_data.acidConcentrate.value)
             .arg(_data.bicarbonateConcentrate.value)
             .arg(_data.dialyzerType.value)
-            .arg(_data.dialysateTemp.value)
+            .arg(_data.bloodPressureMeasureInterval.value)
+            .arg(_data.rinsebackFlowRate.value)
             .arg(_data.arterialPressureLimitLow.value)
             .arg(_data.arterialPressureLimitHigh.value)
             .arg(_data.venousPressureLimitLow.value)
             .arg(_data.venousPressureLimitHigh.value)
-            .arg(_data.bloodPressureMeasureInterval.value)
-            .arg(_data.rinsebackFlowRate.value);
+            .arg(_data.heparinDispensingRate.value)
+            .arg(_data.heparinBolusVolume.value)
+            .arg(_data.dialysateTemp.value);
 }
 
 AdjustTreatmentParametersResponseData MTreatmentParametersResponse::data() const {
@@ -129,20 +128,20 @@
     data.bloodFlowRate                   = _data.bloodFlowRate.value;
     data.dialysateFlowRate               = _data.dialysateFlowRate.value;
     data.duration                        = _data.duration.value;
-    data.heparinDispensingRate           = _data.heparinDispensingRate.value;
-    data.heparinBolusVolume              = _data.heparinBolusVolume.value;
     data.heparinStopTime                 = _data.heparinStopTime.value;
     data.salineBolus                     = _data.salineBolus.value;
     data.acidConcentrate                 = _data.acidConcentrate.value;
     data.bicarbonateConcentrate          = _data.bicarbonateConcentrate.value;
     data.dialyzerType                    = _data.dialyzerType.value;
-    data.dialysateTemp                   = _data.dialysateTemp.value;
+    data.bloodPressureMeasureInterval    = _data.bloodPressureMeasureInterval.value;
+    data.rinsebackFlowRate               = _data.rinsebackFlowRate.value;
     data.arterialPressureLimitLow        = _data.arterialPressureLimitLow.value;
     data.arterialPressureLimitHigh       = _data.arterialPressureLimitHigh.value;
     data.venousPressureLimitLow          = _data.venousPressureLimitLow.value;
     data.venousPressureLimitHigh         = _data.venousPressureLimitHigh.value;
-    data.bloodPressureMeasureInterval    = _data.bloodPressureMeasureInterval.value;
-    data.rinsebackFlowRate               = _data.rinsebackFlowRate.value;
+    data.heparinDispensingRate           = _data.heparinDispensingRate.value;
+    data.heparinBolusVolume              = _data.heparinBolusVolume.value;
+    data.dialysateTemp                   = _data.dialysateTemp.value;
     return data;
 }