diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-06-15 17:49:21 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-06-27 20:00:21 +0200 |
| commit | e36e32c21312eee42194815da82203648023a67b (patch) | |
| tree | 6076697b35bf6fb9ab6f199430dc2bab785c02fa /src/network | |
| parent | 8da3eea4fb702c2dc369c1628e91a034569aa9f0 (diff) | |
QBearerEngine: fix const-correctness of a loop with const-propagating QESDP
The loop iterates over a collection of QExplicitSharedDataPointer, which
traditionally doesn't propagate const. In Qt 6, it will, so prepare the
code for this change, by taking the loop variable by non-const reference.
Since the loop is followed by container.clear(), make it a consume-loop
by looping over qExchange(container, {}).
Change-Id: If12ab005544183598fd76a0c486b2df1582710d5
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/bearer/qbearerengine.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/network/bearer/qbearerengine.cpp b/src/network/bearer/qbearerengine.cpp index c06adb202f..dbcf1e530e 100644 --- a/src/network/bearer/qbearerengine.cpp +++ b/src/network/bearer/qbearerengine.cpp @@ -46,11 +46,10 @@ QT_BEGIN_NAMESPACE static void cleanUpConfigurations(QHash<QString, QNetworkConfigurationPrivatePointer> &configurations) { - for (const auto &ptr : qAsConst(configurations)) { + for (auto &ptr : qExchange(configurations, {})) { ptr->isValid = false; ptr->id.clear(); } - configurations.clear(); } static bool hasUsedConfiguration(const QHash<QString, QNetworkConfigurationPrivatePointer> &configurations) |