Index: sources/view/VView.h =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed --- sources/view/VView.h (.../VView.h) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/view/VView.h (.../VView.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) @@ -88,7 +88,7 @@ VIEW_DEC_CLASS(vCLASS) \ VIEW_DEC_SLOT(vDATATYPE) \ //--------------------------------------------------------------------------------// -#define VIEW_DEF_CLASS_ADJUSTMENT(vCLASS, vDATATYPE) \ +#define VIEW_DEF_CLASS_ADJUSTMENT(vCLASS) \ using namespace View; \ vCLASS::vCLASS(QObject *parent) : VTreatmentAdjustmentResponseBase(parent) { \ initConnections(); \ @@ -135,14 +135,22 @@ REGISTER_TYPE( VDGValvesStates ) \ REGISTER_TYPE( VDGAccelerometer ) \ /* Pre-Treatment */ \ + REGISTER_TYPE( VPreTreatmentAdjustmentInitTreatment ) \ REGISTER_TYPE( VDGFilterFlush ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentWaterSample ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentConsumablesConfirm ) \ REGISTER_TYPE( VPreTreatmentSelfTestNoCartridge ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentDisposablesConfirm ) \ REGISTER_TYPE( VPreTreatmentSelfTestDry ) \ - REGISTER_TYPE( VPreTreatmentDisposablePrime ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentDisposablesPrime ) \ + REGISTER_TYPE( VPreTreatmentDisposablesPrime ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentPatientConnectionBegin) \ + REGISTER_TYPE( VPreTreatmentAdjustmentUltrafiltrationInit ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentPatientConnectionConfirm ) \ + REGISTER_TYPE( VPreTreatmentAdjustmentStartTreatment ) \ /* In-Treatment */ \ REGISTER_TYPE( VTreatmentAdjustmentDuration ) \ REGISTER_TYPE( VTreatmentAdjustmentFlows ) \ - REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationInit ) \ REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationState ) \ REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit ) \ REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm ) \