Index: sources/view/dg/data/VDGTemperaturesData.h =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r00d9bb06ec2bad14f6dc2db678b750c244f694ef --- sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) @@ -18,7 +18,7 @@ // Project #include "MModel.h" -#include "vview.h" +#include "VView.h" // namespace namespace View { @@ -27,20 +27,19 @@ { Q_OBJECT - PROPERTY( float , inletPrimaryHeater , 0) - PROPERTY( float , outletPrimaryHeater , 0) - PROPERTY( float , conductivitySensor1 , 0) - PROPERTY( float , conductivitySensor2 , 0) - PROPERTY( float , outletRedundancy , 0) - PROPERTY( float , inletDialysate , 0) - PROPERTY( float , primaryHeaterThermoCouple , 0) - PROPERTY( float , trimmerHeaterThermoCouple , 0) - PROPERTY( float , primaryHeaterColdJunction , 0) - PROPERTY( float , trimmerHeaterColdJunction , 0) - PROPERTY( float , primaryHeaterInternal , 0) - PROPERTY( float , trimmerHeaterInternal , 0) + PROPERTY( float , inletPrimaryHeater , 0); + PROPERTY( float , outletPrimaryHeater , 0); + PROPERTY( float , conductivitySensor1 , 0); + PROPERTY( float , conductivitySensor2 , 0); + PROPERTY( float , outletRedundancy , 0); + PROPERTY( float , inletDialysate , 0); + PROPERTY( float , primaryHeaterThermoCouple , 0); + PROPERTY( float , trimmerHeaterThermoCouple , 0); + PROPERTY( float , primaryHeaterColdJunction , 0); + PROPERTY( float , trimmerHeaterColdJunction , 0); + PROPERTY( float , primaryHeaterInternal , 0); + PROPERTY( float , trimmerHeaterInternal , 0); VIEW_DEC(VDGTemperatures, DGTemperaturesData) - }; }