QNetworkInformation: Remove the default argument

And the code for loading whatever backend is sorted first.
Though, looking at the code it would've never returned 'true' anyway.

Pick-to: 6.1 6.1.0
Change-Id: I7bc2c740e8cb5343e5843cb1d65715d236b92a25
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

2 files changed, 23 insertions, 30 deletions

diff --git a/src/network/kernel/qnetworkinformation.cpp b/src/network/kernel/qnetworkinformation.cpp
index d10024bf05..7f496ea9a8 100644
--- a/src/network/kernel/qnetworkinformation.cpp
+++ b/src/network/kernel/qnetworkinformation.cpp
@@ -166,6 +166,8 @@ QStringList QNetworkInformationPrivate::backendNames()
 
 QNetworkInformation *QNetworkInformationPrivate::create(QStringView name)
 {
+    if (name.isEmpty())
+        return nullptr;
     if (!dataHolder())
         return nullptr;
 #ifdef DEBUG_LOADING
@@ -184,40 +186,31 @@ QNetworkInformation *QNetworkInformationPrivate::create(QStringView name)
         return dataHolder->instanceHolder.get();
 
 
-    QNetworkInformationBackend *backend = nullptr;
-    if (!name.isEmpty()) {
-        const auto nameMatches = [name](QNetworkInformationBackendFactory *factory) {
-            return factory->name().compare(name, Qt::CaseInsensitive) == 0;
-        };
-        auto it = std::find_if(dataHolder->factories.cbegin(), dataHolder->factories.cend(),
-                               nameMatches);
-        if (it == dataHolder->factories.cend()) {
+    const auto nameMatches = [name](QNetworkInformationBackendFactory *factory) {
+        return factory->name().compare(name, Qt::CaseInsensitive) == 0;
+    };
+    auto it = std::find_if(dataHolder->factories.cbegin(), dataHolder->factories.cend(),
+                            nameMatches);
+    if (it == dataHolder->factories.cend()) {
 #ifdef DEBUG_LOADING
-            if (dataHolder->factories.isEmpty()) {
-                qDebug("No plugins available");
-            } else {
-                QString listNames;
-                listNames.reserve(8 * dataHolder->factories.count());
-                for (const auto *factory : qAsConst(dataHolder->factories))
-                    listNames += factory->name() + QStringLiteral(", ");
-                listNames.chop(2);
-                qDebug().nospace() << "Couldn't find " << name << " in list with names: { "
-                                   << listNames << " }";
-            }
-#endif
-            return nullptr;
+        if (dataHolder->factories.isEmpty()) {
+            qDebug("No plugins available");
+        } else {
+            QString listNames;
+            listNames.reserve(8 * dataHolder->factories.count());
+            for (const auto *factory : qAsConst(dataHolder->factories))
+                listNames += factory->name() + QStringLiteral(", ");
+            listNames.chop(2);
+            qDebug().nospace() << "Couldn't find " << name << " in list with names: { "
+                                << listNames << " }";
         }
-#ifdef DEBUG_LOADING
-        qDebug() << "Creating instance using loader named " << (*it)->name();
 #endif
-        backend = (*it)->create({});
-    } else {
+        return nullptr;
+    }
 #ifdef DEBUG_LOADING
-        qDebug() << "Creating instance using loader named" << dataHolder->factories.front()->name();
+    qDebug() << "Creating instance using loader named " << (*it)->name();
 #endif
-        if (!dataHolder->factories.isEmpty())
-            backend = dataHolder->factories.front()->create({});
-    }
+    QNetworkInformationBackend *backend = (*it)->create({});
     if (!backend)
         return nullptr;
     dataHolder->instanceHolder.reset(new QNetworkInformation(backend));
diff --git a/src/network/kernel/qnetworkinformation.h b/src/network/kernel/qnetworkinformation.h
index bc71b37c64..15f9b8e1af 100644
--- a/src/network/kernel/qnetworkinformation.h
+++ b/src/network/kernel/qnetworkinformation.h
@@ -78,7 +78,7 @@ public:
 
     virtual bool supports(Features features) const;
 
-    static bool load(QStringView backend = {});
+    static bool load(QStringView backend);
     static bool load(Features features);
     static QStringList availableBackends();
     static QNetworkInformation *instance();