summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMårten Nordheim <[email protected]>2022-02-02 15:27:08 +0100
committerMårten Nordheim <[email protected]>2022-02-09 15:17:54 +0100
commit9ec94f31b0ffa64f2c331cd8459dfe5253f96a6b (patch)
tree9d108c0da69646e51257846f5a2ed1a34caf44e0
parentaf7e5c78d99826e5af04beed1c611495ca29a82f (diff)
QNetworkInformation: Rename parameter-less load() to loadDefaultBackend
To clarify its purpose and separate it from the others Pick-to: 6.3 Change-Id: Id9efcf474ac0cd8777393380bb85c83780454005 Reviewed-by: Qt CI Bot <[email protected]> Reviewed-by: Giuseppe D'Angelo <[email protected]> Reviewed-by: Timur Pocheptsov <[email protected]>
-rw-r--r--src/network/kernel/qnetworkinformation.cpp4
-rw-r--r--src/network/kernel/qnetworkinformation.h2
-rw-r--r--tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp2
-rw-r--r--tests/manual/qnetworkinformation/tst_qnetworkinformation.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/network/kernel/qnetworkinformation.cpp b/src/network/kernel/qnetworkinformation.cpp
index a9a875ec1a7..836b63bd4bc 100644
--- a/src/network/kernel/qnetworkinformation.cpp
+++ b/src/network/kernel/qnetworkinformation.cpp
@@ -662,9 +662,9 @@ QNetworkInformation::Features QNetworkInformation::supportedFeatures() const
Returns \c true if it managed to load the backend or if it was already
loaded. Returns \c false otherwise.
- \sa instance
+ \sa instance(), load()
*/
-bool QNetworkInformation::load()
+bool QNetworkInformation::loadDefaultBackend()
{
int index = -1;
#ifdef Q_OS_WIN
diff --git a/src/network/kernel/qnetworkinformation.h b/src/network/kernel/qnetworkinformation.h
index 9b09fcee982..0c8093ed1cd 100644
--- a/src/network/kernel/qnetworkinformation.h
+++ b/src/network/kernel/qnetworkinformation.h
@@ -100,7 +100,7 @@ public:
bool supports(Features features) const;
Features supportedFeatures() const;
- static bool load();
+ static bool loadDefaultBackend();
static bool load(QStringView backend);
static bool load(Features features);
static QStringList availableBackends();
diff --git a/tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp b/tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp
index 1909b684e9a..15309a353a1 100644
--- a/tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp
+++ b/tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp
@@ -105,7 +105,7 @@ void testDetectRouteDisrupted()
QTextStream writer(stdout);
{
- if (!QNetworkInformation::load()) {
+ if (!QNetworkInformation::loadDefaultBackend()) {
writer << "Error: Failed to start";
return;
}
diff --git a/tests/manual/qnetworkinformation/tst_qnetworkinformation.cpp b/tests/manual/qnetworkinformation/tst_qnetworkinformation.cpp
index 32cb84fcf26..34e2f1e428b 100644
--- a/tests/manual/qnetworkinformation/tst_qnetworkinformation.cpp
+++ b/tests/manual/qnetworkinformation/tst_qnetworkinformation.cpp
@@ -47,7 +47,7 @@ int main(int argc, char **argv)
#endif
// Use the platform-default:
- if (!QNetworkInformation::load()) {
+ if (!QNetworkInformation::loadDefaultBackend()) {
qWarning("Failed to load any backend");
qDebug() << "Backends available:" << QNetworkInformation::availableBackends().join(", ");
return -1;