1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QBearerEngine: fix const-correctness of a loop with const-propagating QESDP

Browse Source 
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>
This commit is contained in:
Marc Mutz 2019-06-15 17:49:21 +02:00
parent 8da3eea4fb
commit e36e32c213
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/bearer/qbearerengine.cpp
View File

@ -46,11 +46,10 @@ QT_BEGIN_NAMESPACE
static void cleanUpConfigurations(QHash<QString, QNetworkConfigurationPrivatePointer> &configurations) static void cleanUpConfigurations(QHash<QString, QNetworkConfigurationPrivatePointer> &configurations)
{ {
for (const auto &ptr : qAsConst(configurations)) { for (auto &ptr : qExchange(configurations, {})) {
ptr->isValid = false; ptr->isValid = false;
ptr->id.clear(); ptr->id.clear();
} }
configurations.clear();
} }
static bool hasUsedConfiguration(const QHash<QString, QNetworkConfigurationPrivatePointer> &configurations) static bool hasUsedConfiguration(const QHash<QString, QNetworkConfigurationPrivatePointer> &configurations)