Index: sources/view/settings/VAdjustmentVersions.h =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -21,9 +21,9 @@ #include "VAdjustmentResponseBase.h" #include "MAdjustTDVersionsRequest.h" #include "MAdjustTDVersionsResponse.h" -#include "MAdjustDGVersionsResponse.h" +#include "MAdjustDDVersionsResponse.h" #include "MAdjustTDSerialNumberResponse.h" -#include "MAdjustDGSerialNumberResponse.h" +#include "MAdjustDDSerialNumberResponse.h" namespace View { @@ -44,15 +44,15 @@ const QString _tdVerDeviceFormat = "%1.%2.%3.%4.%5"; const QString _tdVerFPGAFormat = "%1.%2.%3.%4"; - const QString _dgVerDeviceFormat = "%1.%2.%3.%4.%5"; - const QString _dgVerFPGAFormat = "%1.%2.%3.%4"; + const QString _ddVerDeviceFormat = "%1.%2.%3.%4.%5"; + const QString _ddVerFPGAFormat = "%1.%2.%3.%4"; // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - TRIGGER( bool , adjustmentHD , 0) - TRIGGER( bool , adjustmentDG , 0) + TRIGGER( bool , adjustmentTD , 0) + TRIGGER( bool , adjustmentDD , 0) - // HD Versions data + // TD Versions data PROPERTY( quint8 , tdVerMajor , 0) PROPERTY( quint8 , tdVerMinor , 0) PROPERTY( quint8 , tdVerMicro , 0) @@ -63,30 +63,30 @@ PROPERTY( quint8 , tdVerFPGALab , 0) PROPERTY( quint32 , tdVerCompatibilityRev , 0) - // DG Versions data - PROPERTY( quint8 , dgVerMajor , 0) - PROPERTY( quint8 , dgVerMinor , 0) - PROPERTY( quint8 , dgVerMicro , 0) - PROPERTY( quint16 , dgVerBuild , 0) - PROPERTY( quint8 , dgVerFPGAId , 0) - PROPERTY( quint8 , dgVerFPGAMajor , 0) - PROPERTY( quint8 , dgVerFPGAMinor , 0) - PROPERTY( quint8 , dgVerFPGALab , 0) - PROPERTY( quint32 , dgVerCompatibilityRev , 0) + // DD Versions data + PROPERTY( quint8 , ddVerMajor , 0) + PROPERTY( quint8 , ddVerMinor , 0) + PROPERTY( quint8 , ddVerMicro , 0) + PROPERTY( quint16 , ddVerBuild , 0) + PROPERTY( quint8 , ddVerFPGAId , 0) + PROPERTY( quint8 , ddVerFPGAMajor , 0) + PROPERTY( quint8 , ddVerFPGAMinor , 0) + PROPERTY( quint8 , ddVerFPGALab , 0) + PROPERTY( quint32 , ddVerCompatibilityRev , 0) PROPERTY( QString , tdVerDevice ,"") PROPERTY( QString , tdVerFPGA ,"") PROPERTY( QString , tdSerial ,"") - PROPERTY( QString , dgVerDevice ,"") - PROPERTY( QString , dgVerFPGA ,"") - PROPERTY( QString , dgSerial ,"") + PROPERTY( QString , ddVerDevice ,"") + PROPERTY( QString , ddVerFPGA ,"") + PROPERTY( QString , ddSerial ,"") VIEW_DEC_CLASS(VAdjustmentVersions) VIEW_DEC_SLOT ( AdjustVersionsTDRequestData) VIEW_DEC_SLOT (AdjustVersionsTDResponseData) - VIEW_DEC_SLOT (AdjustVersionsDGResponseData) + VIEW_DEC_SLOT (AdjustVersionsDDResponseData) VIEW_DEC_SLOT (AdjustSerialNumberTDResponseData) - VIEW_DEC_SLOT (AdjustSerialNumberDGResponseData) + VIEW_DEC_SLOT (AdjustSerialNumberDDResponseData) // ---------- Version public slots: