From d245e3a7883ccb2c8beabbca5094de54ec963644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 3 Jun 2021 15:51:07 +0200 Subject: [PATCH] QNetworkInformation: Rename the plugins and type To better match other plugins in Qt Pick-to: 6.2 Change-Id: I6ab19603f13c80a8afe4fe69f64669559a0eea15 Reviewed-by: Qt CI Bot Reviewed-by: Edward Welbourne Reviewed-by: Yuhang Zhao <2546789017@qq.com> --- src/network/CMakeLists.txt | 2 +- src/network/kernel/qnetworkinformation.cpp | 2 +- src/plugins/CMakeLists.txt | 2 +- .../CMakeLists.txt | 0 .../android/CMakeLists.txt | 10 +++++----- .../QtAndroidNetworkInformation.java | 0 .../android/qandroidnetworkinformationbackend.cpp | 0 .../android/wrapper/androidconnectivitymanager.cpp | 0 .../android/wrapper/androidconnectivitymanager.h | 0 .../networklistmanager/CMakeLists.txt | 2 +- .../qnetworklistmanagernetworkinformationbackend.cpp | 0 .../networkmanager/CMakeLists.txt | 6 +++--- .../qnetworkmanagernetworkinformationbackend.cpp | 0 .../networkmanager/qnetworkmanagerservice.cpp | 0 .../networkmanager/qnetworkmanagerservice.h | 0 .../scnetworkreachability/CMakeLists.txt | 6 +++--- .../qscnetworkreachabilitynetworkinformationbackend.mm | 0 17 files changed, 15 insertions(+), 15 deletions(-) rename src/plugins/{networkinformationbackends => networkinformation}/CMakeLists.txt (100%) rename src/plugins/{networkinformationbackends => networkinformation}/android/CMakeLists.txt (80%) rename src/plugins/{networkinformationbackends => networkinformation}/android/jar/src/org/qtproject/qt/android/networkinformation/QtAndroidNetworkInformation.java (100%) rename src/plugins/{networkinformationbackends => networkinformation}/android/qandroidnetworkinformationbackend.cpp (100%) rename src/plugins/{networkinformationbackends => networkinformation}/android/wrapper/androidconnectivitymanager.cpp (100%) rename src/plugins/{networkinformationbackends => networkinformation}/android/wrapper/androidconnectivitymanager.h (100%) rename src/plugins/{networkinformationbackends => networkinformation}/networklistmanager/CMakeLists.txt (93%) rename src/plugins/{networkinformationbackends => networkinformation}/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp (100%) rename src/plugins/{networkinformationbackends => networkinformation}/networkmanager/CMakeLists.txt (63%) rename src/plugins/{networkinformationbackends => networkinformation}/networkmanager/qnetworkmanagernetworkinformationbackend.cpp (100%) rename src/plugins/{networkinformationbackends => networkinformation}/networkmanager/qnetworkmanagerservice.cpp (100%) rename src/plugins/{networkinformationbackends => networkinformation}/networkmanager/qnetworkmanagerservice.h (100%) rename src/plugins/{networkinformationbackends => networkinformation}/scnetworkreachability/CMakeLists.txt (58%) rename src/plugins/{networkinformationbackends => networkinformation}/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm (100%) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 9cdfa729a7..4260a4ec68 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_internal_add_module(Network - PLUGIN_TYPES networkaccessbackends networkinformationbackends tls + PLUGIN_TYPES networkaccessbackends networkinformation tls SOURCES access/qabstractnetworkcache.cpp access/qabstractnetworkcache.h access/qabstractnetworkcache_p.h access/qhsts.cpp access/qhsts_p.h diff --git a/src/network/kernel/qnetworkinformation.cpp b/src/network/kernel/qnetworkinformation.cpp index 42eb6cbb23..0dcbfde22b 100644 --- a/src/network/kernel/qnetworkinformation.cpp +++ b/src/network/kernel/qnetworkinformation.cpp @@ -64,7 +64,7 @@ struct QNetworkInformationDeleter Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QNetworkInformationBackendFactory_iid, - QStringLiteral("/networkinformationbackends"))) + QStringLiteral("/networkinformation"))) struct QStaticNetworkInformationDataHolder { diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 92aeafb768..4c3b3a39b4 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -21,6 +21,6 @@ if(TARGET Qt::PrintSupport) add_subdirectory(printsupport) endif() if (TARGET Qt::Network) - add_subdirectory(networkinformationbackends) + add_subdirectory(networkinformation) add_subdirectory(tls) endif() diff --git a/src/plugins/networkinformationbackends/CMakeLists.txt b/src/plugins/networkinformation/CMakeLists.txt similarity index 100% rename from src/plugins/networkinformationbackends/CMakeLists.txt rename to src/plugins/networkinformation/CMakeLists.txt diff --git a/src/plugins/networkinformationbackends/android/CMakeLists.txt b/src/plugins/networkinformation/android/CMakeLists.txt similarity index 80% rename from src/plugins/networkinformationbackends/android/CMakeLists.txt rename to src/plugins/networkinformation/android/CMakeLists.txt index 6c48b3ff49..f1d260547a 100644 --- a/src/plugins/networkinformationbackends/android/CMakeLists.txt +++ b/src/plugins/networkinformation/android/CMakeLists.txt @@ -14,10 +14,10 @@ install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend COMPONENT Devel ) -qt_internal_add_plugin(QAndroidNetworkInformationBackendPlugin - OUTPUT_NAME androidnetworkinformationbackend +qt_internal_add_plugin(QAndroidNetworkInformationPlugin + OUTPUT_NAME androidnetworkinformation CLASS_NAME QAndroidNetworkInformationBackendFactory - TYPE networkinformationbackends + TYPE networkinformation DEFAULT_IF ANDROID SOURCES qandroidnetworkinformationbackend.cpp @@ -30,14 +30,14 @@ qt_internal_add_plugin(QAndroidNetworkInformationBackendPlugin set_property( TARGET - QAndroidNetworkInformationBackendPlugin + QAndroidNetworkInformationPlugin APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES jar/Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend.jar ) set_property( TARGET - QAndroidNetworkInformationBackendPlugin + QAndroidNetworkInformationPlugin APPEND PROPERTY QT_ANDROID_PERMISSIONS android.permission.ACCESS_NETWORK_STATE ) diff --git a/src/plugins/networkinformationbackends/android/jar/src/org/qtproject/qt/android/networkinformation/QtAndroidNetworkInformation.java b/src/plugins/networkinformation/android/jar/src/org/qtproject/qt/android/networkinformation/QtAndroidNetworkInformation.java similarity index 100% rename from src/plugins/networkinformationbackends/android/jar/src/org/qtproject/qt/android/networkinformation/QtAndroidNetworkInformation.java rename to src/plugins/networkinformation/android/jar/src/org/qtproject/qt/android/networkinformation/QtAndroidNetworkInformation.java diff --git a/src/plugins/networkinformationbackends/android/qandroidnetworkinformationbackend.cpp b/src/plugins/networkinformation/android/qandroidnetworkinformationbackend.cpp similarity index 100% rename from src/plugins/networkinformationbackends/android/qandroidnetworkinformationbackend.cpp rename to src/plugins/networkinformation/android/qandroidnetworkinformationbackend.cpp diff --git a/src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.cpp b/src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.cpp similarity index 100% rename from src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.cpp rename to src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.cpp diff --git a/src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.h b/src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.h similarity index 100% rename from src/plugins/networkinformationbackends/android/wrapper/androidconnectivitymanager.h rename to src/plugins/networkinformation/android/wrapper/androidconnectivitymanager.h diff --git a/src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt similarity index 93% rename from src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt rename to src/plugins/networkinformation/networklistmanager/CMakeLists.txt index 862ee67fa2..52f19aefa9 100644 --- a/src/plugins/networkinformationbackends/networklistmanager/CMakeLists.txt +++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt @@ -1,7 +1,7 @@ qt_internal_add_plugin(QNLMNIPlugin OUTPUT_NAME networklistmanager CLASS_NAME QNetworkListManagerNetworkInformationBackendFactory - TYPE networkinformationbackends + TYPE networkinformation DEFAULT_IF WINDOWS AND QT_FEATURE_networklistmanager SOURCES qnetworklistmanagernetworkinformationbackend.cpp PUBLIC_LIBRARIES diff --git a/src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp b/src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp similarity index 100% rename from src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp rename to src/plugins/networkinformation/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp diff --git a/src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt b/src/plugins/networkinformation/networkmanager/CMakeLists.txt similarity index 63% rename from src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt rename to src/plugins/networkinformation/networkmanager/CMakeLists.txt index 2f5b5e9d4f..900364c32f 100644 --- a/src/plugins/networkinformationbackends/networkmanager/CMakeLists.txt +++ b/src/plugins/networkinformation/networkmanager/CMakeLists.txt @@ -1,7 +1,7 @@ -qt_internal_add_plugin(QNetworkManagerNetworkInformationBackendPlugin - OUTPUT_NAME networkmanagernetworkinformationbackend +qt_internal_add_plugin(QNetworkManagerNetworkInformationPlugin + OUTPUT_NAME networkmanager CLASS_NAME QNetworkManagerNetworkInformationBackendFactory - TYPE networkinformationbackends + TYPE networkinformation DEFAULT_IF LINUX SOURCES qnetworkmanagernetworkinformationbackend.cpp diff --git a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp b/src/plugins/networkinformation/networkmanager/qnetworkmanagernetworkinformationbackend.cpp similarity index 100% rename from src/plugins/networkinformationbackends/networkmanager/qnetworkmanagernetworkinformationbackend.cpp rename to src/plugins/networkinformation/networkmanager/qnetworkmanagernetworkinformationbackend.cpp diff --git a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.cpp b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp similarity index 100% rename from src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.cpp rename to src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.cpp diff --git a/src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.h b/src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h similarity index 100% rename from src/plugins/networkinformationbackends/networkmanager/qnetworkmanagerservice.h rename to src/plugins/networkinformation/networkmanager/qnetworkmanagerservice.h diff --git a/src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt b/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt similarity index 58% rename from src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt rename to src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt index 9f8b9846b5..87ca1f0a6d 100644 --- a/src/plugins/networkinformationbackends/scnetworkreachability/CMakeLists.txt +++ b/src/plugins/networkinformation/scnetworkreachability/CMakeLists.txt @@ -1,7 +1,7 @@ -qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationBackendPlugin - OUTPUT_NAME scnetworkreachabilitynetworkinformationbackend +qt_internal_add_plugin(QSCNetworkReachabilityNetworkInformationPlugin + OUTPUT_NAME scnetworkreachability CLASS_NAME QSCNetworkReachabilityNetworkInformationBackendFactory - TYPE networkinformationbackends + TYPE networkinformation DEFAULT_IF APPLE SOURCES qscnetworkreachabilitynetworkinformationbackend.mm diff --git a/src/plugins/networkinformationbackends/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm b/src/plugins/networkinformation/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm similarity index 100% rename from src/plugins/networkinformationbackends/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm rename to src/plugins/networkinformation/scnetworkreachability/qscnetworkreachabilitynetworkinformationbackend.mm