Index: sources/view/settings/VAdjustmentVersions.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -ra245272e6d8eee5c3658245570b6d31bd039af74 --- sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision a245272e6d8eee5c3658245570b6d31bd039af74) @@ -19,8 +19,8 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" -#include "MAdjustHDVersionsRequest.h" -#include "MAdjustHDVersionsResponse.h" +#include "MAdjustTDVersionsRequest.h" +#include "MAdjustTDVersionsResponse.h" #include "MAdjustDGVersionsResponse.h" #include "MAdjustHDSerialNumberResponse.h" #include "MAdjustDGSerialNumberResponse.h" @@ -42,8 +42,8 @@ AdjustVersionsRequestData _data; - const QString _hdVerDeviceFormat = "%1.%2.%3.%4.%5"; - const QString _hdVerFPGAFormat = "%1.%2.%3.%4"; + 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"; @@ -53,15 +53,15 @@ TRIGGER( bool , adjustmentDG , 0) // HD Versions data - PROPERTY( quint8 , hdVerMajor , 0) - PROPERTY( quint8 , hdVerMinor , 0) - PROPERTY( quint8 , hdVerMicro , 0) - PROPERTY( quint16 , hdVerBuild , 0) - PROPERTY( quint8 , hdVerFPGAId , 0) - PROPERTY( quint8 , hdVerFPGAMajor , 0) - PROPERTY( quint8 , hdVerFPGAMinor , 0) - PROPERTY( quint8 , hdVerFPGALab , 0) - PROPERTY( quint32 , hdVerCompatibilityRev , 0) + PROPERTY( quint8 , tdVerMajor , 0) + PROPERTY( quint8 , tdVerMinor , 0) + PROPERTY( quint8 , tdVerMicro , 0) + PROPERTY( quint16 , tdVerBuild , 0) + PROPERTY( quint8 , tdVerFPGAId , 0) + PROPERTY( quint8 , tdVerFPGAMajor , 0) + PROPERTY( quint8 , tdVerFPGAMinor , 0) + PROPERTY( quint8 , tdVerFPGALab , 0) + PROPERTY( quint32 , tdVerCompatibilityRev , 0) // DG Versions data PROPERTY( quint8 , dgVerMajor , 0) @@ -74,16 +74,16 @@ PROPERTY( quint8 , dgVerFPGALab , 0) PROPERTY( quint32 , dgVerCompatibilityRev , 0) - PROPERTY( QString , hdVerDevice ,"") - PROPERTY( QString , hdVerFPGA ,"") + PROPERTY( QString , tdVerDevice ,"") + PROPERTY( QString , tdVerFPGA ,"") PROPERTY( QString , hdSerial ,"") PROPERTY( QString , dgVerDevice ,"") PROPERTY( QString , dgVerFPGA ,"") PROPERTY( QString , dgSerial ,"") VIEW_DEC_CLASS(VAdjustmentVersions) - VIEW_DEC_SLOT ( AdjustVersionsHDRequestData) - VIEW_DEC_SLOT (AdjustVersionsHDResponseData) + VIEW_DEC_SLOT ( AdjustVersionsTDRequestData) + VIEW_DEC_SLOT (AdjustVersionsTDResponseData) VIEW_DEC_SLOT (AdjustVersionsDGResponseData) VIEW_DEC_SLOT (AdjustSerialNumberHDResponseData) VIEW_DEC_SLOT (AdjustSerialNumberDGResponseData)