From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Mon, 15 May 2023 12:00:28 +0000 (+0800)
Subject: Modernise and improve readability of BandwidthManager::relativeUploadDelayTimerExpired
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~10^2~51^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=350fa7247814ae7d4a107d96d962b316dc9453f6;p=nextcloud-desktop.git

Modernise and improve readability of BandwidthManager::relativeUploadDelayTimerExpired

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/libsync/bandwidthmanager.cpp b/src/libsync/bandwidthmanager.cpp
index fbf601c29..8845f506b 100644
--- a/src/libsync/bandwidthmanager.cpp
+++ b/src/libsync/bandwidthmanager.cpp
@@ -220,18 +220,21 @@ void BandwidthManager::relativeUploadDelayTimerExpired()
     _relativeUploadDeviceList.pop_front();
     _relativeUploadDeviceList.push_back(_relativeLimitCurrentMeasuredDevice);
 
-    _relativeUploadLimitProgressAtMeasuringRestart = (_relativeLimitCurrentMeasuredDevice->_readWithProgress
-                                                         + _relativeLimitCurrentMeasuredDevice->_read)
-        / 2;
+    const auto currentReadWithProgress = _relativeLimitCurrentMeasuredDevice->_readWithProgress;
+    const auto currentRead =  _relativeLimitCurrentMeasuredDevice->_read;
+    _relativeUploadLimitProgressAtMeasuringRestart = (currentReadWithProgress + currentRead) / 2;
+
     _relativeLimitCurrentMeasuredDevice->setBandwidthLimited(false);
     _relativeLimitCurrentMeasuredDevice->setChoked(false);
 
     // choke all other UploadDevices
-    Q_FOREACH (UploadDevice *ud, _relativeUploadDeviceList) {
-        if (ud != _relativeLimitCurrentMeasuredDevice) {
-            ud->setBandwidthLimited(true);
-            ud->setChoked(true);
+    for (const auto uploadDevice : _relativeUploadDeviceList) {
+        if (uploadDevice == _relativeLimitCurrentMeasuredDevice) {
+            continue;
         }
+
+        uploadDevice->setBandwidthLimited(true);
+        uploadDevice->setChoked(true);
     }
 
     // now we're in measuring state