Index: sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -r34861b44547037950fcf398accc7649f7fac4529 --- sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp (.../MAdjustHDVersionsResponse.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp (.../MAdjustHDVersionsResponse.cpp) (revision 34861b44547037950fcf398accc7649f7fac4529) @@ -18,27 +18,29 @@ QVariantList MAdjustVersionsHDResponse::parameters() const { return { - _data.mMajor .value, - _data.mMinor .value, - _data.mMicro .value, - _data.mBuild .value, - _data.mFPGAId .value, - _data.mFPGAMajor .value, - _data.mFPGAMinor .value, - _data.mFPGALab .value, + _data.mMajor .value, + _data.mMinor .value, + _data.mMicro .value, + _data.mBuild .value, + _data.mFPGAId .value, + _data.mFPGAMajor .value, + _data.mFPGAMinor .value, + _data.mFPGALab .value, + _data.mCompatibilityRev .value, }; } bool MAdjustVersionsHDResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mMajor )) - if (GetValue(vByteArray, index, _data.mMinor )) - if (GetValue(vByteArray, index, _data.mMicro )) - if (GetValue(vByteArray, index, _data.mBuild )) - if (GetValue(vByteArray, index, _data.mFPGAId )) - if (GetValue(vByteArray, index, _data.mFPGAMajor )) - if (GetValue(vByteArray, index, _data.mFPGAMinor )) - if (GetValue(vByteArray, index, _data.mFPGALab )) + if (GetValue(vByteArray, index, _data.mMajor )) + if (GetValue(vByteArray, index, _data.mMinor )) + if (GetValue(vByteArray, index, _data.mMicro )) + if (GetValue(vByteArray, index, _data.mBuild )) + if (GetValue(vByteArray, index, _data.mFPGAId )) + if (GetValue(vByteArray, index, _data.mFPGAMajor )) + if (GetValue(vByteArray, index, _data.mFPGAMinor )) + if (GetValue(vByteArray, index, _data.mFPGALab )) + if (GetValue(vByteArray, index, _data.mCompatibilityRev )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -48,17 +50,19 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } AdjustVersionsHDResponseData MAdjustVersionsHDResponse::data() const { Data data; - data.mMajor = _data.mMajor .value; - data.mMinor = _data.mMinor .value; - data.mMicro = _data.mMicro .value; - data.mBuild = _data.mBuild .value; - data.mFPGAId = _data.mFPGAId .value; - data.mFPGAMajor = _data.mFPGAMajor.value; - data.mFPGAMinor = _data.mFPGAMinor.value; - data.mFPGALab = _data.mFPGALab .value; + data.mMajor = _data.mMajor .value; + data.mMinor = _data.mMinor .value; + data.mMicro = _data.mMicro .value; + data.mBuild = _data.mBuild .value; + data.mFPGAId = _data.mFPGAId .value; + data.mFPGAMajor = _data.mFPGAMajor .value; + data.mFPGAMinor = _data.mFPGAMinor .value; + data.mFPGALab = _data.mFPGALab .value; + data.mCompatibilityRev = _data.mCompatibilityRev .value; return data; }