From 9ec94f31b0ffa64f2c331cd8459dfe5253f96a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Wed, 2 Feb 2022 15:27:08 +0100 Subject: [PATCH] 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 Reviewed-by: Giuseppe D'Angelo Reviewed-by: Timur Pocheptsov --- src/network/kernel/qnetworkinformation.cpp | 4 ++-- src/network/kernel/qnetworkinformation.h | 2 +- tests/manual/qnetconmonitor/tst_qnetconmonitor.cpp | 2 +- tests/manual/qnetworkinformation/tst_qnetworkinformation.cpp | 2 +- 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;