Index: sources/canbus/messagedispatcher.cpp =================================================================== diff -u -rd8a212f19c4caecf2d488c918271b18fa59ade41 -rf8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee --- sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision d8a212f19c4caecf2d488c918271b18fa59ade41) +++ sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision f8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee) @@ -295,12 +295,12 @@ } /*! - * \brief MessageDispatcher::onHDVersions + * \brief MessageDispatcher::onAdjustment * \details This method transmits the HD Version Denali message. * \param vData - Data model contains HD Version state. * \return void */ -void MessageDispatcher::onAdjustment(const AdjustVersionsRequest &vData) +void MessageDispatcher::onAdjustment(const AdjustVersionsRequestData &vData) { Q_UNUSED(vData); QVariantList mData; Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -rae1f28a34d323bd6e301450f22525ca3545c9319 -rf8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision f8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee) @@ -248,7 +248,7 @@ case Gui::GuiActionType::ID_AdjustVersionsReq: if ( ! count ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); - LOG_EVENT(AdjustVersionsRequest::toString(vData)); + LOG_EVENT(AdjustVersionsRequestData::toString(vData)); break; default: Index: sources/model/MModel.h =================================================================== diff -u -r98650e7baf2fd556db914f32a49179a6d6a72917 -rf8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee --- sources/model/MModel.h (.../MModel.h) (revision 98650e7baf2fd556db914f32a49179a6d6a72917) +++ sources/model/MModel.h (.../MModel.h) (revision f8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee) @@ -157,15 +157,15 @@ REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ REGISTER_METATYPE( AdjustSalineRequestData ) \ - REGISTER_METATYPE( AdjustVersionsRequest ) \ + REGISTER_METATYPE( AdjustVersionsRequestData ) \ /* Response */ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ REGISTER_METATYPE( AdjustSalineResponseData ) \ - REGISTER_METATYPE( AdjustHDVersionsResponse ) + REGISTER_METATYPE( AdjustHDVersionsResponseData ) //===============================================================================// #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, BloodFlowData ) \ @@ -203,17 +203,16 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsResponse ) - /* Request */ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsResponseData ) +// /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDVersionsRequest ) + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVersionsRequestData ) //===============================================================================// #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ ACTION_RECEIVE_BRIDGE_DEFINITION( BloodFlowData ) \ @@ -251,7 +250,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDVersionsResponse ) + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDVersionsResponseData ) // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ @@ -260,7 +259,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequest ) + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) // /* Request */ ----------------------- NoEmit --------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ @@ -269,7 +268,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequest ) + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) // /* Request */ ----------------------- public --------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ @@ -278,7 +277,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequest ) + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) //===============================================================================// #define ACTION_RECEIVE_SIGNALS \ ACTION_RECEIVE_SIGNAL( BloodFlowData ) \ @@ -316,6 +315,6 @@ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustHDVersionsResponse ) + ACTION_RECEIVE_SIGNAL( AdjustHDVersionsResponseData ) //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// Index: sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp =================================================================== diff -u -rae1f28a34d323bd6e301450f22525ca3545c9319 -rf8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee --- sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp (.../MTreatmentAdjustHDVersionsResponse.cpp) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) +++ sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp (.../MTreatmentAdjustHDVersionsResponse.cpp) (revision f8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee) @@ -51,7 +51,7 @@ else { if(vIndex) *vIndex = index; return false; } } -AdjustHDVersionsResponse MAdjustHDVersionsResponse::data() const { +AdjustHDVersionsResponseData MAdjustHDVersionsResponse::data() const { Data data; data.mMajor = _data.mMajor .value; data.mMinor = _data.mMinor .value; Index: sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h =================================================================== diff -u -rae1f28a34d323bd6e301450f22525ca3545c9319 -rf8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee --- sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h (.../MTreatmentAdjustHDVersionsResponse.h) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) +++ sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h (.../MTreatmentAdjustHDVersionsResponse.h) (revision f8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee) @@ -68,4 +68,4 @@ }; } -typedef Model::MAdjustHDVersionsResponse::Data AdjustHDVersionsResponse; +typedef Model::MAdjustHDVersionsResponse::Data AdjustHDVersionsResponseData; Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -rae1f28a34d323bd6e301450f22525ca3545c9319 -rf8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision f8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee) @@ -190,5 +190,5 @@ typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; typedef Model:: MAdjustSalineReq AdjustSalineRequestData; -typedef Model:: MAdjustVersionsReq AdjustVersionsRequest; +typedef Model:: MAdjustVersionsReq AdjustVersionsRequestData; typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; Index: sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp =================================================================== diff -u -rd8a212f19c4caecf2d488c918271b18fa59ade41 -rf8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee --- sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp (.../VTreatmentAdjustmentHDVersions.cpp) (revision d8a212f19c4caecf2d488c918271b18fa59ade41) +++ sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp (.../VTreatmentAdjustmentHDVersions.cpp) (revision f8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee) @@ -21,10 +21,10 @@ void VTreatmentAdjustmentHDVersions::initConnections() { ACTION_VIEW_CONNECTION(AdjustHDVersionsResponseData); - ADJUST_VIEW_CONNECTION(AdjustHDVersionsRequestData ); + ADJUST_VIEW_CONNECTION( AdjustVersionsRequestData); } -void VTreatmentAdjustmentHDVersions::onActionReceive(const AdjustHDVersionsResponse &vData) +void VTreatmentAdjustmentHDVersions::onActionReceive(const AdjustHDVersionsResponseData &vData) { verMajor (vData.mMajor ); verMinor (vData.mMinor ); Index: sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.h =================================================================== diff -u -rae1f28a34d323bd6e301450f22525ca3545c9319 -rf8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee --- sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.h (.../VTreatmentAdjustmentHDVersions.h) (revision ae1f28a34d323bd6e301450f22525ca3545c9319) +++ sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.h (.../VTreatmentAdjustmentHDVersions.h) (revision f8e19bab7d503d2c9577df9f5b7d9a499ce9b7ee) @@ -27,7 +27,7 @@ // friends friend class ::tst_views; - AdjustVersionsRequest _data; + AdjustVersionsRequestData _data; // coco begin validated: // The property adjustment_Triggered has to be always true @@ -46,7 +46,7 @@ PROPERTY( qint8, verFPGAMinor, 0) PROPERTY( qint8, verFPGALab, 0) - VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentHDVersions, AdjustHDVersionsResponse) + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentHDVersions, AdjustHDVersionsResponseData) // ---------- HD Version public slots: