Index: sources/model/MModel.h =================================================================== diff -u -rddc4d403774f54b87ad5518c3b4ad877e5fb3707 -r8be0073f796109578435eaa14edc7d3b9a2352da --- sources/model/MModel.h (.../MModel.h) (revision ddc4d403774f54b87ad5518c3b4ad877e5fb3707) +++ sources/model/MModel.h (.../MModel.h) (revision 8be0073f796109578435eaa14edc7d3b9a2352da) @@ -135,7 +135,7 @@ #include "MTreatmentLogEventData.h" // Disinfection -#include "MDisinfectAdjustRequests.h" +#include "MDisinfectAdjustStartRequests.h" #include "MDisinfectAdjustResponse.h" /*! @@ -351,7 +351,7 @@ REGISTER_METATYPE( AdjustPatientConnectionConfirmRequestData ) \ REGISTER_METATYPE( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - REGISTER_METATYPE( AdjustDisinfectRequestData ) \ + REGISTER_METATYPE( AdjustDisinfectStartRequestData ) \ \ /* Alarms */ \ REGISTER_METATYPE( AlarmSilenceRequestData ) \ @@ -585,7 +585,7 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectStartRequestData ) \ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmUserActionRequestData ) \ @@ -740,7 +740,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectStartRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationRequestData ) \ @@ -790,7 +790,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectStartRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationRequestData ) \ @@ -840,7 +840,7 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectStartRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationRequestData ) \