Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h
===================================================================
diff -u -re5ae6f8513673d1c09bd04ec3da08e71bfded5e2 -r656a6e14a253c7125fa8408ae2aa0c1223009565
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h	(.../MPreTreatmentAdjustRequests.h)	(revision e5ae6f8513673d1c09bd04ec3da08e71bfded5e2)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h	(.../MPreTreatmentAdjustRequests.h)	(revision 656a6e14a253c7125fa8408ae2aa0c1223009565)
@@ -66,8 +66,8 @@
 };
 
 /*!
- * \brief   The MParameters class
- * \details The base model class to hold the treatment parameters
+ * \brief   The MAdjustParametersValidationReq class
+ * \details The model used to request treatment parameters validation
  *
  * | MSG  | CAN ID | M.Box | Type | Ack | Src | Dest | Description                               |
  * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------------------------------------:|
@@ -94,8 +94,9 @@
  * | #17:(F32) | \ref mDialysateTemp                |
  *
  */
-class MParameters : public MModel {
+class MAdjustParametersValidationReq : public MModel {
 public:
+
     quint32 mBloodFlowRate                    = 0; // mL/min
     quint32 mDialysateFlowRate                = 0; // mL/min
     quint32 mTreatmentDuration                = 0; // minutes
@@ -114,61 +115,28 @@
     float   mHeparinBolusVolume               = 0; // mL
     float   mDialysateTemp                    = 0; // Celsius
 
-    QVariantList getParametersList() {
-        return(QVariantList({
-            mBloodFlowRate                   ,
-            mDialysateFlowRate               ,
-            mTreatmentDuration               ,
-            mHeparinStopTime                 ,
-            mSalineBolus                     ,
-            mAcidConcentrate                 ,
-            mBicarbonateConcentrate          ,
-            mDialyzerType                    ,
-            mHeparinType                     ,  //FIXME: DEN-15377: to set the heparintype to not selected (-1) is used which is incorrect, since the type is unsigned. (No issue for now but is not correct.)
-            mBloodPressureMeasureInterval    ,
-            mRinsebackFlowRate               ,
-            mArterialPressureLimitWindow     ,
-            mVenousPressureLimitWindow       ,
-            mVenousPressureLimitAsymtrc      ,
-            mHeparinDispensingRate           ,
-            mHeparinBolusVolume              ,
-            mDialysateTemp                   ,
-        }));
-    }
-
-    void copy(const MParameters &vParams) {
-        //DEBUG: qDebug()<< Q_FUNC_INFO;
-
-        mBloodFlowRate                   = vParams.mBloodFlowRate;
-        mDialysateFlowRate               = vParams.mDialysateFlowRate;
-        mTreatmentDuration               = vParams.mTreatmentDuration;
-        mHeparinStopTime                 = vParams.mHeparinStopTime;
-        mSalineBolus                     = vParams.mSalineBolus;
-        mAcidConcentrate                 = vParams.mAcidConcentrate;
-        mBicarbonateConcentrate          = vParams.mBicarbonateConcentrate;
-        mDialyzerType                    = vParams.mDialyzerType;
-        mHeparinType                     = vParams.mHeparinType;
-        mBloodPressureMeasureInterval    = vParams.mBloodPressureMeasureInterval;
-        mRinsebackFlowRate               = vParams.mRinsebackFlowRate;
-        mArterialPressureLimitWindow     = vParams.mArterialPressureLimitWindow;
-        mVenousPressureLimitWindow       = vParams.mVenousPressureLimitWindow;
-        mVenousPressureLimitAsymtrc      = vParams.mVenousPressureLimitAsymtrc;
-        mHeparinDispensingRate           = vParams.mHeparinDispensingRate;
-        mHeparinBolusVolume              = vParams.mHeparinBolusVolume;
-        mDialysateTemp                   = vParams.mDialysateTemp;
-    }
-};
-
-/*!
- * \brief   The MAdjustParametersValidationReq class
- * \details The model used to request treatment parameters validation
- */
-class MAdjustParametersValidationReq : public MParameters {
-public:
     // disabled coco begin validated : Has been validated manually.
     // This object is used statically for now, kept the logic for later usage.
     QString toString() {
-        return toString(getParametersList());
+        return toString({
+                mBloodFlowRate                   ,
+                mDialysateFlowRate               ,
+                mTreatmentDuration               ,
+                mHeparinStopTime                 ,
+                mSalineBolus                     ,
+                mAcidConcentrate                 ,
+                mBicarbonateConcentrate          ,
+                mDialyzerType                    ,
+                mHeparinType                     ,  //FIXME: DEN-15377: to set the heparintype to not selected (-1) is used which is incorrect, since the type is unsigned. (No issue for now but is not correct.)
+                mBloodPressureMeasureInterval    ,
+                mRinsebackFlowRate               ,
+                mArterialPressureLimitWindow     ,
+                mVenousPressureLimitWindow       ,
+                mVenousPressureLimitAsymtrc      ,
+                mHeparinDispensingRate           ,
+                mHeparinBolusVolume              ,
+                mDialysateTemp                   ,
+        });
     }
     // disabled coco end
     static QString toString(const QVariantList &vParameters) {
@@ -177,23 +145,6 @@
 };
 
 /*!
- * \brief   The MAdjustParametersStored class
- * \details The model used to store the unconfirmed treatement parameters for pre-populating
- */
-class MAdjustParametersStored: public MParameters {
-public:
-    // disabled coco begin validated : Has been validated manually.
-    // This object is used statically for now, kept the logic for later usage.
-    QString toString() {
-        return toString(getParametersList());
-    }
-    // disabled coco end
-    static QString toString(const QVariantList &vParameters) {
-        return MModel::toString("PrepopulateParameters", vParameters);
-    }
-};
-
-/*!
  * \brief   The MAdjustParametersConfirmReq class
  * \details The model to tell HD treatment parameters have been confirmed
  *
@@ -484,4 +435,3 @@
 typedef Model::      MAdjustUltrafiltrationInitReq       AdjustUltrafiltrationInitRequestData;
 typedef Model:: MAdjustPatientConnectionConfirmReq  AdjustPatientConnectionConfirmRequestData;
 typedef Model::           MAdjustStartTreatmentReq            AdjustStartTreatmentRequestData;
-typedef Model::            MAdjustParametersStored                 AdjustParametersStoredData;