Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp =================================================================== diff -u -r914308e6f87b8074bff379371379d238e7781ed3 -r266c2f5a2566834a1384a936736d2f01d07e4e08 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp (.../MTreatmentAdjustDurationConfirmResponse.cpp) (revision 914308e6f87b8074bff379371379d238e7781ed3) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationConfirmResponse.cpp (.../MTreatmentAdjustDurationConfirmResponse.cpp) (revision 266c2f5a2566834a1384a936736d2f01d07e4e08) @@ -18,28 +18,28 @@ QString MAdjustDurationConfirmResponse::toString() const { return QString(stringPrefix + ",%1,%2,%3,%4,%5") - .arg(_data.mAccepted .value) - .arg(_data.mReason .value) - .arg(_data.mDuration .value) - .arg(_data.mUFVolume .value) - .arg(_data.mUFRate .value); + .arg(_data.mAccepted .value) + .arg(_data.mReason .value) + .arg(_data.mDuration .value) + .arg(_data.mUFVolumeRemoved .value) + .arg(_data.mUFSetVolume .value); } void MAdjustDurationConfirmResponse::toVariantList(QVariantList &vData) const { - vData += _data.mAccepted .value; - vData += _data.mReason .value; - vData += _data.mDuration .value; - vData += _data.mUFVolume .value; - vData += _data.mUFRate .value; + vData += _data.mAccepted .value; + vData += _data.mReason .value; + vData += _data.mDuration .value; + vData += _data.mUFVolumeRemoved .value; + vData += _data.mUFSetVolume .value; } bool MAdjustDurationConfirmResponse::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 ; @@ -57,10 +57,10 @@ */ AdjustDurationConfirmResponseData MAdjustDurationConfirmResponse::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.mUFVolumeRemoved = _data.mUFVolumeRemoved .value; + data.mUFSetVolume = _data.mUFSetVolume .value; return data; }