Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) @@ -54,12 +54,9 @@ eInitiate = 1, }; Options requestedState = eUnknown; - // 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({requestedState}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("InitTreatment", vParameters); } @@ -115,8 +112,6 @@ float mHeparinBolusVolume = 0; // mL float mDialysateTemp = 0; // Celsius - // 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({ mBloodFlowRate , @@ -138,7 +133,6 @@ mDialysateTemp , }); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("ValidateParameters", vParameters); } @@ -164,12 +158,10 @@ eConfirm = 1 }; Options requestedState = eConfirm; - // 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({requestedState}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("ConfirmParameters", vParameters); } @@ -195,12 +187,10 @@ eStart = 1, }; Options requestedState = eStop; - // 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({requestedState}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("WaterSample", vParameters); } @@ -227,12 +217,10 @@ ePassed = 1, }; Options requestedState = eUnknown; - // 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({requestedState}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("WaterSampleResult", vParameters); } @@ -253,12 +241,10 @@ */ class MAdjustConsumablesConfirmReq : public MModel { 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({}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("ConsumablesConfirm", vParameters); } @@ -279,12 +265,10 @@ */ class MAdjustDisposablesConfirmReq : public MModel { 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({}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("DisposablesConfirm", vParameters); } @@ -305,12 +289,10 @@ */ class MAdjustDisposablesPrimeReq : public MModel { 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({}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("DisposablesPrime", vParameters); } @@ -331,12 +313,10 @@ */ class MAdjustPatientConnectionBeginReq : public MModel { 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({}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("PatientConnectionBegin", vParameters); } @@ -358,12 +338,10 @@ class MAdjustUltrafiltrationInitReq : public MModel { public: float volume = 0; - // 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({volume}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFInit", vParameters); } @@ -384,12 +362,10 @@ */ class MAdjustPatientConnectionConfirmReq : public MModel { 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({}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("PatientConnectionConfirm", vParameters); } @@ -410,12 +386,10 @@ */ class MAdjustStartTreatmentReq : public MModel { 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({}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("StartTreatment", vParameters); }