Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r266c2f5a2566834a1384a936736d2f01d07e4e08 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp (.../MTreatmentAdjustDurationEditResponse.cpp) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp (.../MTreatmentAdjustDurationEditResponse.cpp) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) @@ -18,21 +18,21 @@ QVariantList MAdjustDurationEditResponse::parameters() const { return { - _data.mAccepted.value, - _data.mReason .value, - _data.mDuration.value, - _data.mUFVolume.value, - _data.mUFRate .value + _data.mAccepted .value, + _data.mReason .value, + _data.mDuration .value, + _data.mUFVolumeRemoved .value, + _data.mUFSetVolume .value }; } bool MAdjustDurationEditResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUFVolume )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUFRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFVolumeRemoved )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFSetVolume )) goto lError; return true ; @@ -49,10 +49,10 @@ */ AdjustDurationEditResponseData MAdjustDurationEditResponse::data() const { Data data; - data.mAccepted = _data.mAccepted.value; - data.mReason = _data.mReason .value; - data.mDuration = _data.mDuration.value; - data.mUFVolume = _data.mUFVolume.value; - data.mUFRate = _data.mUFRate .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mDuration = _data.mDuration .value; + data.mUFVolume = _data.mUFVolumeRemoved.value; + data.mUFRate = _data.mUFSetVolume .value; return data; }