From 32b44d1237196310f631741a45569bc062b8efda Mon Sep 17 00:00:00 2001 From: QxQ <59914293+U-v-U@users.noreply.github.com> Date: Sun, 13 Dec 2020 18:09:31 +0800 Subject: [PATCH] fix, Qt6: replacing QPair with std::pair --- makespec/BUILDVERSION | 2 +- src/components/port/QvPortDetector.hpp | 3 +-- src/core/connection/Serialization.cpp | 13 +++++++------ src/core/connection/Serialization.hpp | 6 +++--- src/core/connection/serialization/ssd.cpp | 4 ++-- src/core/handler/ConfigHandler.cpp | 2 +- src/core/handler/RouteHandler.hpp | 4 ++-- src/ui/widgets/windows/w_MainWindow_extra.cpp | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index a687ce85..6cee8451 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -6086 +6087 diff --git a/src/components/port/QvPortDetector.hpp b/src/components/port/QvPortDetector.hpp index 0091970e..37658864 100644 --- a/src/components/port/QvPortDetector.hpp +++ b/src/components/port/QvPortDetector.hpp @@ -1,10 +1,9 @@ #pragma once -#include #include namespace Qv2ray::components::port { bool CheckTCPPortStatus(const QString &addr, int port); - inline bool CheckTCPPortStatus(QPair config) + inline bool CheckTCPPortStatus(std::pair config) { return CheckTCPPortStatus(config.first, config.second); } diff --git a/src/core/connection/Serialization.cpp b/src/core/connection/Serialization.cpp index 2ed97342..7cbdab0e 100644 --- a/src/core/connection/Serialization.cpp +++ b/src/core/connection/Serialization.cpp @@ -7,7 +7,8 @@ namespace Qv2ray::core::connection { namespace serialization { - QList> ConvertConfigFromString(const QString &link, QString *aliasPrefix, QString *errMessage, QString *newGroup) + QList> ConvertConfigFromString(const QString &link, QString *aliasPrefix, QString *errMessage, + QString *newGroup) { const auto TLSOptionsFilter = [](QJsonObject &conf) { const auto allowInsecure = GlobalConfig.advancedConfig.setAllowInsecure; @@ -21,23 +22,23 @@ namespace Qv2ray::core::connection } }; - QList> connectionConf; + QList> connectionConf; if (link.startsWith("vmess://") && link.contains("@")) { auto conf = vmess_new::Deserialize(link, aliasPrefix, errMessage); TLSOptionsFilter(conf); - connectionConf << QPair{ *aliasPrefix, conf }; + connectionConf << std::pair{ *aliasPrefix, conf }; } else if (link.startsWith("vmess://")) { auto conf = vmess::Deserialize(link, aliasPrefix, errMessage); TLSOptionsFilter(conf); - connectionConf << QPair{ *aliasPrefix, conf }; + connectionConf << std::pair{ *aliasPrefix, conf }; } else if (link.startsWith("ss://") && !link.contains("plugin=")) { auto conf = ss::Deserialize(link, aliasPrefix, errMessage); - connectionConf << QPair{ *aliasPrefix, conf }; + connectionConf << std::pair{ *aliasPrefix, conf }; } else if (link.startsWith("ssd://")) { @@ -57,7 +58,7 @@ namespace Qv2ray::core::connection CONFIGROOT root; auto outbound = GenerateOutboundEntry(OUTBOUND_TAG_PROXY, _protocol, OUTBOUNDSETTING(_outbound), {}); QJsonIO::SetValue(root, outbound, "outbounds", 0); - connectionConf << QPair{ _alias, root }; + connectionConf << std::pair{ _alias, root }; } } else if (errMessage->isEmpty()) diff --git a/src/core/connection/Serialization.hpp b/src/core/connection/Serialization.hpp index 37ac578b..bf296aeb 100644 --- a/src/core/connection/Serialization.hpp +++ b/src/core/connection/Serialization.hpp @@ -12,8 +12,8 @@ namespace Qv2ray::core::connection::serialization * %3: rate */ const inline QString QV2RAY_SSD_DEFAULT_NAME_PATTERN = "%1 - %2 (rate %3)"; - QList> ConvertConfigFromString(const QString &link, QString *aliasPrefix, QString *errMessage, - QString *newGroupName = nullptr); + QList> ConvertConfigFromString(const QString &link, QString *aliasPrefix, QString *errMessage, + QString *newGroupName = nullptr); const QString ConvertConfigToString(const ConnectionGroupPair &id, bool isSip002 = true); const QString ConvertConfigToString(const QString &alias, const QString &groupName, const CONFIGROOT &server, bool isSip002 = true); @@ -37,7 +37,7 @@ namespace Qv2ray::core::connection::serialization namespace ssd { - QList> Deserialize(const QString &uri, QString *groupName, QStringList *logList); + QList> Deserialize(const QString &uri, QString *groupName, QStringList *logList); } // namespace ssd } // namespace Qv2ray::core::connection::serialization diff --git a/src/core/connection/serialization/ssd.cpp b/src/core/connection/serialization/ssd.cpp index 8898792b..c3f6b6a4 100644 --- a/src/core/connection/serialization/ssd.cpp +++ b/src/core/connection/serialization/ssd.cpp @@ -66,7 +66,7 @@ namespace Qv2ray::core::connection::serialization continue; \ } - QList> Deserialize(const QString &uri, QString *groupName, QStringList *logList) + QList> Deserialize(const QString &uri, QString *groupName, QStringList *logList) { LOG("SSD Link format is now deprecated."); // ssd links should begin with "ssd://" @@ -122,7 +122,7 @@ namespace Qv2ray::core::connection::serialization // obj.servers MUST_ARRAY("servers"); // - QList> serverList; + QList> serverList; // // iterate through the servers diff --git a/src/core/handler/ConfigHandler.cpp b/src/core/handler/ConfigHandler.cpp index 568536f8..85bbb44c 100644 --- a/src/core/handler/ConfigHandler.cpp +++ b/src/core/handler/ConfigHandler.cpp @@ -540,7 +540,7 @@ namespace Qv2ray::core::handler const auto groupName = groups[id].displayName; const auto result = decoder->DecodeData(data); - QList> _newConnections; + QList> _newConnections; for (const auto &[name, json] : result.connections) { diff --git a/src/core/handler/RouteHandler.hpp b/src/core/handler/RouteHandler.hpp index d6a71eb6..8c35317c 100644 --- a/src/core/handler/RouteHandler.hpp +++ b/src/core/handler/RouteHandler.hpp @@ -13,11 +13,11 @@ namespace Qv2ray::core::handler ~RouteHandler(); void SaveRoutes() const; // - QPair GetDNSSettings(const GroupRoutingId &id) const + std::pair GetDNSSettings(const GroupRoutingId &id) const { return { configs[id].overrideDNS, configs[id].dnsConfig }; } - QPair GetAdvancedRoutingSettings(const GroupRoutingId &id) const + std::pair GetAdvancedRoutingSettings(const GroupRoutingId &id) const { return { configs[id].overrideRoute, configs[id].routeConfig }; } diff --git a/src/ui/widgets/windows/w_MainWindow_extra.cpp b/src/ui/widgets/windows/w_MainWindow_extra.cpp index ae7950df..e641c7f5 100644 --- a/src/ui/widgets/windows/w_MainWindow_extra.cpp +++ b/src/ui/widgets/windows/w_MainWindow_extra.cpp @@ -114,7 +114,7 @@ bool MainWindow::StartAutoConnectionEntry() void MainWindow::CheckSubscriptionsUpdate() { - QList> updateList; + QList> updateList; QStringList updateNamesList; for (const auto &entry : ConnectionManager->Subscriptions()) @@ -130,7 +130,7 @@ void MainWindow::CheckSubscriptionsUpdate() if (renewTime <= QDateTime::currentDateTime()) { - updateList << QPair{ info.displayName, entry }; + updateList << std::pair{ info.displayName, entry }; updateNamesList << info.displayName; LOG(QString("Subscription update \"%1\": L=%2 R=%3 I=%4") .arg(info.displayName)