Index: sources/model/MTreatmentParametersResp.cpp
===================================================================
diff -u -ra51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1 -rf7b3e0bcd926f8aabc5caa1e76fce04aa8c5eb89
--- sources/model/MTreatmentParametersResp.cpp	(.../MTreatmentParametersResp.cpp)	(revision a51b1ec80d65c7cf9f7f3b86f45a637a6d42efc1)
+++ sources/model/MTreatmentParametersResp.cpp	(.../MTreatmentParametersResp.cpp)	(revision f7b3e0bcd926f8aabc5caa1e76fce04aa8c5eb89)
@@ -1,68 +1,30 @@
 #include "MTreatmentParametersResp.h"
+
 using namespace Model;
 
-MTreatmentParametersResponse::MTreatmentParametersResponse() {}
-
-/**
- * @brief TreatmentParametersResp::toVariantList
- *  Converts the response data to a QVariantList
- * @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.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;
-
+QVariantList MTreatmentParametersResponse::parameters() const {
+    return {
+        _data.requestValid.value,
+        _data.bloodFlowRate.value,
+        _data.dialysateFlowRate.value,
+        _data.duration.value,
+        _data.heparinDispensingRate.value,
+        _data.heparinBolusVolume.value,
+        _data.heparinStopTime.value,
+        _data.salineBolus.value,
+        _data.acidConcentrate.value,
+        _data.bicarbonateConcentrate.value,
+        _data.dialyzerType.value,
+        _data.dialysateTemp.value,
+        _data.arterialPressureLimitLow.value,
+        _data.arterialPressureLimitHigh.value,
+        _data.venousPressureLimitLow.value,
+        _data.venousPressureLimitHigh.value,
+        _data.bloodPressureMeasureInterval.value,
+        _data.rinsebackFlowRate.value,
+    };
 }
 
-AdjustTreatmentParametersResponseData MTreatmentParametersResponse::fromVariantList(const QVariantList &list)
-{
-    Data data;
-    if (list.length() != 18)
-    {
-        qDebug() << "Invalid QVariant List in " << __FUNCTION__;
-        return data;
-    }
-
-    data.requestValid                    = list[0].toUInt();
-    data.bloodFlowRate                   = list[1].toUInt();
-    data.dialysateFlowRate               = list[2].toUInt();
-    data.duration                        = list[3].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;
-}
-
 bool MTreatmentParametersResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
     if (GetValue(vByteArray, index, _data.requestValid                 ))
@@ -104,48 +66,25 @@
     else { if(vIndex) *vIndex = index; return false; }
 }
 
-QString MTreatmentParametersResponse::toString() const {
-    return QString(stringPrefix + "(%0, %1, %2, %3, %4, %5, %6, %7, %8, %9, %10, %11, %12, %13, %14, %15, %16, %17)")
-            .arg(_data.requestValid.value)
-            .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.arterialPressureLimitLow.value)
-            .arg(_data.arterialPressureLimitHigh.value)
-            .arg(_data.venousPressureLimitLow.value)
-            .arg(_data.venousPressureLimitHigh.value)
-            .arg(_data.bloodPressureMeasureInterval.value)
-            .arg(_data.rinsebackFlowRate.value);
+MTreatmentParametersResponse::Data MTreatmentParametersResponse::data() const {
+   Data data;
+   data.requestValid                   = _data.requestValid.value;
+   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.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;
+   return data;
 }
-
-AdjustTreatmentParametersResponseData MTreatmentParametersResponse::data() const {
-    Data data;
-    data.requestValid                    = _data.requestValid.value;
-    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.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;
-    return data;
-}
-