Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) @@ -50,11 +50,9 @@ class MAdjustHDDateTimeReq : public MModel { public: quint32 mEpoch; - // disabled coco begin validated : Has been validated manually. QString toString() { return toString({mEpoch}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustHDDateTime", vParameters); } @@ -91,12 +89,9 @@ _volume = vVolume; } - // 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("AdjustHDAlarmVolume", vParameters); } @@ -128,8 +123,6 @@ quint16 ver_revis = QString("%1").arg(VER_REVIS ).toUInt(); quint32 ver_comp = QString("%1").arg(SW_COMPATIBILITY_REV).toUInt(); - // 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({ ver_major , ver_minor , @@ -138,7 +131,6 @@ ver_comp , }); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("POSTInfReq", vParameters); } @@ -169,7 +161,7 @@ static QString toString(const QVariantList &vParameters) { return MModel::toString("VersionRsp", vParameters); } - static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_HD; } + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_TD; } }; @@ -189,12 +181,9 @@ class MAdjustServiceDatesReq : 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("ServiceDates", vParameters); } @@ -219,17 +208,14 @@ class MAdjustServiceModeReq : 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("ServiceMode", vParameters); } - static Can::Can_Id canid () { return Can::eChlid_UI_HD; } + static Can::Can_Id canid () { return Can::eChlid_UI_TD; } }; @@ -251,12 +237,9 @@ quint32 mResult; - // 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( { mResult } ); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("UIPOSTDone", vParameters); } @@ -278,12 +261,9 @@ class MHDUsageInfoReq : 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("HDUsageInfoReq", vParameters); } @@ -307,17 +287,14 @@ class MAdjustInstitutionalRecordReq : 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("InstitutionalRecord", vParameters); } - static Can::Can_Id canid () { return Can::eChlid_UI_HD; } + static Can::Can_Id canid () { return Can::eChlid_UI_TD; } }; /*! @@ -336,17 +313,14 @@ class MAdjustHDResetInSrvceModeReq : 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("HDResetInServiceMode", vParameters); } - static Can::Can_Id canid () { return Can::eChlid_UI_HD; } + static Can::Can_Id canid () { return Can::eChlid_UI_TD; } }; }