From 8367be8ede233245f1c11ed1291c02afcdb0750e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Thu, 3 Feb 2022 13:31:54 +0100
Subject: QNetworkInformation: Deprecate vague load functions

And replace them with more descriptive versions

Change-Id: I3d5256072a5bbe0919a08b800877aa9b6a305a0b
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
---
 src/network/kernel/qnetworkinformation.cpp | 28 +++++++++++++++++++++++++---
 src/network/kernel/qnetworkinformation.h   |  8 ++++++--
 2 files changed, 31 insertions(+), 5 deletions(-)

(limited to 'src/network/kernel')

diff --git a/src/network/kernel/qnetworkinformation.cpp b/src/network/kernel/qnetworkinformation.cpp
index 626439572a..bd67e51795 100644
--- a/src/network/kernel/qnetworkinformation.cpp
+++ b/src/network/kernel/qnetworkinformation.cpp
@@ -678,10 +678,12 @@ bool QNetworkInformation::loadDefaultBackend()
 #endif
     if (index == -1)
         return false;
-    return load(QNetworkInformationBackend::PluginNames[index]);
+    return loadBackendByName(QNetworkInformationBackend::PluginNames[index]);
 }
 
 /*!
+    \since 6.4
+
     Attempts to load a backend whose name matches \a backend
     (case insensitively).
 
@@ -690,12 +692,22 @@ bool QNetworkInformation::loadDefaultBackend()
 
     \sa instance
 */
-bool QNetworkInformation::load(QStringView backend)
+bool QNetworkInformation::loadBackendByName(QStringView backend)
 {
     auto loadedBackend = QNetworkInformationPrivate::create(backend);
     return loadedBackend && loadedBackend->backendName().compare(backend, Qt::CaseInsensitive) == 0;
 }
 
+/*!
+    \deprecated [6.4] Use loadBackendByName() instead.
+
+    \sa loadBackendByName(), loadDefaultBackend(), loadBackendByFeatures()
+*/
+bool QNetworkInformation::load(QStringView backend)
+{
+    return loadBackendByName(backend);
+}
+
 /*!
     Load a backend which supports \a features.
 
@@ -704,12 +716,22 @@ bool QNetworkInformation::load(QStringView backend)
 
     \sa instance
 */
-bool QNetworkInformation::load(Features features)
+bool QNetworkInformation::loadBackendByFeatures(Features features)
 {
     auto loadedBackend = QNetworkInformationPrivate::create(features);
     return loadedBackend && loadedBackend->supports(features);
 }
 
+/*!
+    \deprecated [6.4] Use loadBackendByFeatures() instead.
+
+    \sa loadBackendByName(), loadDefaultBackend(), loadBackendByFeatures()
+*/
+bool QNetworkInformation::load(Features features)
+{
+    return loadBackendByFeatures(features);
+}
+
 /*!
     Returns a list of the names of all currently available backends.
 */
diff --git a/src/network/kernel/qnetworkinformation.h b/src/network/kernel/qnetworkinformation.h
index 0c8093ed1c..c21871eb29 100644
--- a/src/network/kernel/qnetworkinformation.h
+++ b/src/network/kernel/qnetworkinformation.h
@@ -101,8 +101,12 @@ public:
     Features supportedFeatures() const;
 
     static bool loadDefaultBackend();
-    static bool load(QStringView backend);
-    static bool load(Features features);
+    static bool loadBackendByName(QStringView backend);
+    static bool loadBackendByFeatures(Features features);
+#if QT_DEPRECATED_SINCE(6,4)
+    QT_DEPRECATED_VERSION_X_6_4("Use loadBackendByName") static bool load(QStringView backend);
+    QT_DEPRECATED_VERSION_X_6_4("Use loadBackendByFeatures") static bool load(Features features);
+#endif
     static QStringList availableBackends();
     static QNetworkInformation *instance();
 
-- 
cgit v1.2.3