Index: sources/model/hd/data/MTreatmentStatesData.cpp
===================================================================
diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r30f83b2813e68ae3c2806399bf808b642c215b67
--- sources/model/hd/data/MTreatmentStatesData.cpp	(.../MTreatmentStatesData.cpp)	(revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5)
+++ sources/model/hd/data/MTreatmentStatesData.cpp	(.../MTreatmentStatesData.cpp)	(revision 30f83b2813e68ae3c2806399bf808b642c215b67)
@@ -15,20 +15,15 @@
 
 using namespace Model;
 
-QString MTreatmentState::toString() const {
-    return QString(stringPrefix + ",%1,%2,%3")
-        .arg(_data.mSubMode    .value)
-        .arg(_data.mUFState    .value)
-        .arg(_data.mSalineState.value);
+QVariantList MTreatmentStates::parameters() const {
+    return {
+        _data.mSubMode    .value,
+        _data.mUFState    .value,
+        _data.mSalineState.value
+    };
 }
 
-void MTreatmentState::toVariantList(QVariantList &vData) const {
-    vData += _data.mSubMode    .value;
-    vData += _data.mUFState    .value;
-    vData += _data.mSalineState.value;
-}
-
-bool MTreatmentState::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+bool MTreatmentStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
     if (GetValue(vByteArray, index, _data.mSubMode    ))
     if (GetValue(vByteArray, index, _data.mUFState    ))
@@ -39,7 +34,7 @@
     else { if(vIndex) *vIndex = index; return false; }
 }
 
-MTreatmentState::Data MTreatmentState::data() const {
+MTreatmentStates::Data MTreatmentStates::data() const {
     Data data;
     data.mSubMode     = _data.mSubMode    .value;
     data.mUFState     = _data.mUFState    .value;