Index: sources/model/hd/data/MTreatmentRangesData.cpp
===================================================================
diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r30f83b2813e68ae3c2806399bf808b642c215b67
--- sources/model/hd/data/MTreatmentRangesData.cpp	(.../MTreatmentRangesData.cpp)	(revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5)
+++ sources/model/hd/data/MTreatmentRangesData.cpp	(.../MTreatmentRangesData.cpp)	(revision 30f83b2813e68ae3c2806399bf808b642c215b67)
@@ -15,33 +15,25 @@
 
 using namespace Model;
 
-QString MTreatmentRanges::toString() const {
-    return QString(stringPrefix + ",%1,%2,%3,%4,%5,%6")
-            .arg(_data.mDuration_Min                .value)
-            .arg(_data.mDuration_Max                .value)
-            .arg(_data.mUltrafiltration_Volume_Min  .value)
-            .arg(_data.mUltrafiltration_Volume_Max  .value)
-            .arg(_data.mDialysate_Flow_Min          .value)
-            .arg(_data.mDialysate_Flow_Max          .value);
+QVariantList MTreatmentRanges::parameters() const {
+    return {
+        _data.mDuration_Min              .value,
+        _data.mDuration_Max              .value,
+        _data.mUltrafiltration_Volume_Min.value,
+        _data.mUltrafiltration_Volume_Max.value,
+        _data.mDialysate_Flow_Min        .value,
+        _data.mDialysate_Flow_Max        .value
+    };
 }
 
-void MTreatmentRanges::toVariantList(QVariantList &vData) const {
-    vData += _data.mDuration_Min                .value;
-    vData += _data.mDuration_Max                .value;
-    vData += _data.mUltrafiltration_Volume_Min  .value;
-    vData += _data.mUltrafiltration_Volume_Max  .value;
-    vData += _data.mDialysate_Flow_Min          .value;
-    vData += _data.mDialysate_Flow_Max          .value;
-}
-
 bool MTreatmentRanges::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
-    if (GetValue(vByteArray, index, _data.mDuration_Min                    ))
-    if (GetValue(vByteArray, index, _data.mDuration_Max                    ))
-    if (GetValue(vByteArray, index, _data.mUltrafiltration_Volume_Min      ))
-    if (GetValue(vByteArray, index, _data.mUltrafiltration_Volume_Max      ))
-    if (GetValue(vByteArray, index, _data.mDialysate_Flow_Min              ))
-    if (GetValue(vByteArray, index, _data.mDialysate_Flow_Max              ))
+    if (GetValue(vByteArray, index, _data.mDuration_Min              ))
+    if (GetValue(vByteArray, index, _data.mDuration_Max              ))
+    if (GetValue(vByteArray, index, _data.mUltrafiltration_Volume_Min))
+    if (GetValue(vByteArray, index, _data.mUltrafiltration_Volume_Max))
+    if (GetValue(vByteArray, index, _data.mDialysate_Flow_Min        ))
+    if (GetValue(vByteArray, index, _data.mDialysate_Flow_Max        ))
         return true ;
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
@@ -53,11 +45,11 @@
 
 MTreatmentRanges::Data MTreatmentRanges::data() const {
     Data data;
-    data.mDuration_Min                  = _data.mDuration_Min               .value;
-    data.mDuration_Max                  = _data.mDuration_Max               .value;
-    data.mUltrafiltration_Volume_Min    = _data.mUltrafiltration_Volume_Min .value;
-    data.mUltrafiltration_Volume_Max    = _data.mUltrafiltration_Volume_Max .value;
-    data.mDialysate_Flow_Min            = _data.mDialysate_Flow_Min         .value;
-    data.mDialysate_Flow_Max            = _data.mDialysate_Flow_Max         .value;
+    data.mDuration_Min               = _data.mDuration_Min              .value;
+    data.mDuration_Max               = _data.mDuration_Max              .value;
+    data.mUltrafiltration_Volume_Min = _data.mUltrafiltration_Volume_Min.value;
+    data.mUltrafiltration_Volume_Max = _data.mUltrafiltration_Volume_Max.value;
+    data.mDialysate_Flow_Min         = _data.mDialysate_Flow_Min        .value;
+    data.mDialysate_Flow_Max         = _data.mDialysate_Flow_Max        .value;
     return data;
 }