Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	configure
	mkspecs/common/wince/qplatformdefs.h
	src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
	src/plugins/platforms/xcb/qxcbbackingstore.cpp

Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c

1 files changed, 25 insertions, 45 deletions

diff --git a/src/network/bearer/qbearerengine.cpp b/src/network/bearer/qbearerengine.cpp
index dda1229a17..215cd3fddd 100644
--- a/src/network/bearer/qbearerengine.cpp
+++ b/src/network/bearer/qbearerengine.cpp
@@ -38,11 +38,30 @@
 ****************************************************************************/
 
 #include "qbearerengine_p.h"
+#include <algorithm>
 
 #ifndef QT_NO_BEARERMANAGEMENT
 
 QT_BEGIN_NAMESPACE
 
+static void cleanUpConfigurations(QHash<QString, QNetworkConfigurationPrivatePointer> &configurations)
+{
+    for (const auto &ptr : qAsConst(configurations)) {
+        ptr->isValid = false;
+        ptr->id.clear();
+    }
+    configurations.clear();
+}
+
+static bool hasUsedConfiguration(const QHash<QString, QNetworkConfigurationPrivatePointer> &configurations)
+{
+    auto isUsed = [](const QNetworkConfigurationPrivatePointer &ptr) {
+        return ptr->ref.load() > 1;
+    };
+    const auto end = configurations.end();
+    return std::find_if(configurations.begin(), end, isUsed) != end;
+}
+
 QBearerEngine::QBearerEngine(QObject *parent)
     : QObject(parent), mutex(QMutex::Recursive)
 {
@@ -50,28 +69,9 @@ QBearerEngine::QBearerEngine(QObject *parent)
 
 QBearerEngine::~QBearerEngine()
 {
-    QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator it;
-    QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator end;
-
-    for (it = snapConfigurations.begin(), end = snapConfigurations.end(); it != end; ++it) {
-        it.value()->isValid = false;
-        it.value()->id.clear();
-    }
-    snapConfigurations.clear();
-
-    for (it = accessPointConfigurations.begin(), end = accessPointConfigurations.end();
-         it != end; ++it) {
-        it.value()->isValid = false;
-        it.value()->id.clear();
-    }
-    accessPointConfigurations.clear();
-
-    for (it = userChoiceConfigurations.begin(), end = userChoiceConfigurations.end();
-         it != end; ++it) {
-        it.value()->isValid = false;
-        it.value()->id.clear();
-    }
-    userChoiceConfigurations.clear();
+    cleanUpConfigurations(snapConfigurations);
+    cleanUpConfigurations(accessPointConfigurations);
+    cleanUpConfigurations(userChoiceConfigurations);
 }
 
 bool QBearerEngine::requiresPolling() const
@@ -87,30 +87,10 @@ bool QBearerEngine::requiresPolling() const
 */
 bool QBearerEngine::configurationsInUse() const
 {
-    QHash<QString, QNetworkConfigurationPrivatePointer>::ConstIterator it;
-    QHash<QString, QNetworkConfigurationPrivatePointer>::ConstIterator end;
-
     QMutexLocker locker(&mutex);
-
-    for (it = accessPointConfigurations.constBegin(),
-         end = accessPointConfigurations.constEnd(); it != end; ++it) {
-        if (it.value()->ref.load() > 1)
-            return true;
-    }
-
-    for (it = snapConfigurations.constBegin(),
-         end = snapConfigurations.constEnd(); it != end; ++it) {
-        if (it.value()->ref.load() > 1)
-            return true;
-    }
-
-    for (it = userChoiceConfigurations.constBegin(),
-         end = userChoiceConfigurations.constEnd(); it != end; ++it) {
-        if (it.value()->ref.load() > 1)
-            return true;
-    }
-
-    return false;
+    return hasUsedConfiguration(accessPointConfigurations)
+        || hasUsedConfiguration(snapConfigurations)
+        || hasUsedConfiguration(userChoiceConfigurations);
 }
 
 #include "moc_qbearerengine_p.cpp"