Index: sources/model/MModel.h =================================================================== diff -u -rc63c041f361045518ede1c8df212517159a662a5 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/model/MModel.h (.../MModel.h) (revision c63c041f361045518ede1c8df212517159a662a5) +++ sources/model/MModel.h (.../MModel.h) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -192,9 +192,7 @@ #include "MTreatmentLogEventData.h" // Disinfection -#include "MDisinfectAdjustModeRequests.h" #include "MDisinfectAdjustStartRequests.h" -#include "MDisinfectAdjustModeResponse.h" #include "MDisinfectAdjustStartResponse.h" #include "MAdjustDGCleaningUsageResponse.h" @@ -464,7 +462,6 @@ REGISTER_METATYPE( AdjustPatientConnectionConfirmRequestData ) \ REGISTER_METATYPE( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - REGISTER_METATYPE( AdjustDisinfectModeRequestData ) \ REGISTER_METATYPE( AdjustDisinfectStartRequestData ) \ /* DGCleaningUsage */ \ REGISTER_METATYPE( AdjustDGCleaningUsageRequestData ) \ @@ -526,7 +523,6 @@ REGISTER_METATYPE( AdjustPatientConnectionConfirmResponseData ) \ REGISTER_METATYPE( AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ - REGISTER_METATYPE( AdjustDisinfectModeResponseData ) \ REGISTER_METATYPE( AdjustDisinfectStartResponseData ) \ REGISTER_METATYPE( AdjustDGCleaningUsageResponseData ) \ \ @@ -710,7 +706,6 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectModeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectStartResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGCleaningUsageResponseData ) \ \ @@ -826,7 +821,6 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectStartRequestData ) \ /* DG Cleaning Usage */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGCleaningUsageRequestData ) \ @@ -972,7 +966,6 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisinfectModeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisinfectStartResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGCleaningUsageResponseData ) \ \ @@ -1052,7 +1045,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectStartRequestData ) \ /* DG Cleaning Usage */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGCleaningUsageRequestData ) \ @@ -1132,7 +1124,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectStartRequestData ) \ /* DG Cleaning Usage */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGCleaningUsageRequestData ) \ @@ -1212,7 +1203,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectStartRequestData ) \ /* DG Cleaning Usage */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGCleaningUsageRequestData ) \ @@ -1379,7 +1369,6 @@ ACTION_RECEIVE_SIGNAL( AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ - ACTION_RECEIVE_SIGNAL( AdjustDisinfectModeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDisinfectStartResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDGCleaningUsageResponseData ) \ \