Index: sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp =================================================================== diff -u -r80a8c26d9ac3ee0b11fb18873b5f912cd9d2ae75 -rdd02afaf66a118eb50deb9313e6a809dd17b5864 --- sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp (.../MTreatmentAdjustDurationEditResponse.cpp) (revision 80a8c26d9ac3ee0b11fb18873b5f912cd9d2ae75) +++ sources/model/td/adjustment/treatment/MTreatmentAdjustDurationEditResponse.cpp (.../MTreatmentAdjustDurationEditResponse.cpp) (revision dd02afaf66a118eb50deb9313e6a809dd17b5864) @@ -18,26 +18,26 @@ QVariantList MAdjustDurationEditResponse::parameters() const { return { - _data.mAccepted .value, - _data.mReason .value, - _data.mDuration .value, - _data.mUFVolumeRemoved .value, - _data.mUFSetVolume .value + _data.mAccepted .value, + _data.mReason .value, + _data.mDuration .value, + _data.mUFVolumeGoal .value, + _data.mUFRate .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.mUFVolumeRemoved )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUFSetVolume )) 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.mUFVolumeGoal )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFRate )) goto lError; return true ; lError: - if(vIndex) { *vIndex = index; } + if (vIndex) { *vIndex = index; } return false ; } @@ -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.mUFVolumeRemoved = _data.mUFVolumeRemoved.value; - data.mUFSetVolume = _data.mUFSetVolume .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mDuration = _data.mDuration .value; + data.mUFVolumeGoal = _data.mUFVolumeGoal .value; + data.mUFRate = _data.mUFRate .value; return data; }