github/Qv2ray
5
0
Fork 0
mirror of https://github.com/Qv2ray/Qv2ray.git synced 2025-05-20 02:40:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix, Qt6: replacing QPair with std::pair

Browse Source
This commit is contained in:
QxQ 2020-12-13 18:09:31 +08:00
parent ec3f21d9c2
commit 32b44d1237
8 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makespec/BUILDVERSION
View File

@ -1 +1 @@
6086 6087

3
src/components/port/QvPortDetector.hpp
View File

@ -1,10 +1,9 @@
#pragma once #pragma once
#include <QPair>
#include <QString> #include <QString>
namespace Qv2ray::components::port namespace Qv2ray::components::port
{ {
bool CheckTCPPortStatus(const QString &addr, int port); bool CheckTCPPortStatus(const QString &addr, int port);
inline bool CheckTCPPortStatus(QPair<QString, int> config) inline bool CheckTCPPortStatus(std::pair<QString, int> config)
{ {
return CheckTCPPortStatus(config.first, config.second); return CheckTCPPortStatus(config.first, config.second);
} }

13
src/core/connection/Serialization.cpp
View File

@ -7,7 +7,8 @@ namespace Qv2ray::core::connection
{ {
namespace serialization namespace serialization
{ {
QList<QPair<QString, CONFIGROOT>> ConvertConfigFromString(const QString &link, QString *aliasPrefix, QString *errMessage, QString *newGroup) QList<std::pair<QString, CONFIGROOT>> ConvertConfigFromString(const QString &link, QString *aliasPrefix, QString *errMessage,
QString *newGroup)
{ {
const auto TLSOptionsFilter = [](QJsonObject &conf) { const auto TLSOptionsFilter = [](QJsonObject &conf) {
const auto allowInsecure = GlobalConfig.advancedConfig.setAllowInsecure; const auto allowInsecure = GlobalConfig.advancedConfig.setAllowInsecure;
@ -21,23 +22,23 @@ namespace Qv2ray::core::connection
} }
}; };
QList<QPair<QString, CONFIGROOT>> connectionConf; QList<std::pair<QString, CONFIGROOT>> connectionConf;
if (link.startsWith("vmess://") && link.contains("@")) if (link.startsWith("vmess://") && link.contains("@"))
{ {
auto conf = vmess_new::Deserialize(link, aliasPrefix, errMessage); auto conf = vmess_new::Deserialize(link, aliasPrefix, errMessage);
TLSOptionsFilter(conf); TLSOptionsFilter(conf);
connectionConf << QPair{ *aliasPrefix, conf }; connectionConf << std::pair{ *aliasPrefix, conf };
} }
else if (link.startsWith("vmess://")) else if (link.startsWith("vmess://"))
{ {
auto conf = vmess::Deserialize(link, aliasPrefix, errMessage); auto conf = vmess::Deserialize(link, aliasPrefix, errMessage);
TLSOptionsFilter(conf); TLSOptionsFilter(conf);
connectionConf << QPair{ *aliasPrefix, conf }; connectionConf << std::pair{ *aliasPrefix, conf };
} }
else if (link.startsWith("ss://") && !link.contains("plugin=")) else if (link.startsWith("ss://") && !link.contains("plugin="))
{ {
auto conf = ss::Deserialize(link, aliasPrefix, errMessage); auto conf = ss::Deserialize(link, aliasPrefix, errMessage);
connectionConf << QPair{ *aliasPrefix, conf }; connectionConf << std::pair{ *aliasPrefix, conf };
} }
else if (link.startsWith("ssd://")) else if (link.startsWith("ssd://"))
{ {
@ -57,7 +58,7 @@ namespace Qv2ray::core::connection
CONFIGROOT root; CONFIGROOT root;
auto outbound = GenerateOutboundEntry(OUTBOUND_TAG_PROXY, _protocol, OUTBOUNDSETTING(_outbound), {}); auto outbound = GenerateOutboundEntry(OUTBOUND_TAG_PROXY, _protocol, OUTBOUNDSETTING(_outbound), {});
QJsonIO::SetValue(root, outbound, "outbounds", 0); QJsonIO::SetValue(root, outbound, "outbounds", 0);
connectionConf << QPair{ _alias, root }; connectionConf << std::pair{ _alias, root };
} }
} }
else if (errMessage->isEmpty()) else if (errMessage->isEmpty())

6
src/core/connection/Serialization.hpp
View File

@ -12,8 +12,8 @@ namespace Qv2ray::core::connection::serialization
* %3: rate * %3: rate
*/ */
const inline QString QV2RAY_SSD_DEFAULT_NAME_PATTERN = "%1 - %2 (rate %3)"; const inline QString QV2RAY_SSD_DEFAULT_NAME_PATTERN = "%1 - %2 (rate %3)";
QList<QPair<QString, CONFIGROOT>> ConvertConfigFromString(const QString &link, QString *aliasPrefix, QString *errMessage, QList<std::pair<QString, CONFIGROOT>> ConvertConfigFromString(const QString &link, QString *aliasPrefix, QString *errMessage,
QString *newGroupName = nullptr); QString *newGroupName = nullptr);
const QString ConvertConfigToString(const ConnectionGroupPair &id, bool isSip002 = true); const QString ConvertConfigToString(const ConnectionGroupPair &id, bool isSip002 = true);
const QString ConvertConfigToString(const QString &alias, const QString &groupName, const CONFIGROOT &server, 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 namespace ssd
{ {
QList<QPair<QString, CONFIGROOT>> Deserialize(const QString &uri, QString *groupName, QStringList *logList); QList<std::pair<QString, CONFIGROOT>> Deserialize(const QString &uri, QString *groupName, QStringList *logList);
} // namespace ssd } // namespace ssd
} // namespace Qv2ray::core::connection::serialization } // namespace Qv2ray::core::connection::serialization

4
src/core/connection/serialization/ssd.cpp
View File

@ -66,7 +66,7 @@ namespace Qv2ray::core::connection::serialization
continue; \ continue; \
} }
QList<QPair<QString, CONFIGROOT>> Deserialize(const QString &uri, QString *groupName, QStringList *logList) QList<std::pair<QString, CONFIGROOT>> Deserialize(const QString &uri, QString *groupName, QStringList *logList)
{ {
LOG("SSD Link format is now deprecated."); LOG("SSD Link format is now deprecated.");
// ssd links should begin with "ssd://" // ssd links should begin with "ssd://"
@ -122,7 +122,7 @@ namespace Qv2ray::core::connection::serialization
// obj.servers // obj.servers
MUST_ARRAY("servers"); MUST_ARRAY("servers");
// //
QList<QPair<QString, CONFIGROOT>> serverList; QList<std::pair<QString, CONFIGROOT>> serverList;
// //
// iterate through the servers // iterate through the servers

2
src/core/handler/ConfigHandler.cpp
View File

@ -540,7 +540,7 @@ namespace Qv2ray::core::handler
const auto groupName = groups[id].displayName; const auto groupName = groups[id].displayName;
const auto result = decoder->DecodeData(data); const auto result = decoder->DecodeData(data);
QList<QPair<QString, CONFIGROOT>> _newConnections; QList<std::pair<QString, CONFIGROOT>> _newConnections;
for (const auto &[name, json] : result.connections) for (const auto &[name, json] : result.connections)
{ {

4
src/core/handler/RouteHandler.hpp
View File

@ -13,11 +13,11 @@ namespace Qv2ray::core::handler
~RouteHandler(); ~RouteHandler();
void SaveRoutes() const; void SaveRoutes() const;
// //
QPair<bool, QvConfig_DNS> GetDNSSettings(const GroupRoutingId &id) const std::pair<bool, QvConfig_DNS> GetDNSSettings(const GroupRoutingId &id) const
{ {
return { configs[id].overrideDNS, configs[id].dnsConfig }; return { configs[id].overrideDNS, configs[id].dnsConfig };
} }
QPair<bool, QvConfig_Route> GetAdvancedRoutingSettings(const GroupRoutingId &id) const std::pair<bool, QvConfig_Route> GetAdvancedRoutingSettings(const GroupRoutingId &id) const
{ {
return { configs[id].overrideRoute, configs[id].routeConfig }; return { configs[id].overrideRoute, configs[id].routeConfig };
} }

4
src/ui/widgets/windows/w_MainWindow_extra.cpp
View File

@ -114,7 +114,7 @@ bool MainWindow::StartAutoConnectionEntry()
void MainWindow::CheckSubscriptionsUpdate() void MainWindow::CheckSubscriptionsUpdate()
{ {
QList<QPair<QString, GroupId>> updateList; QList<std::pair<QString, GroupId>> updateList;
QStringList updateNamesList; QStringList updateNamesList;
for (const auto &entry : ConnectionManager->Subscriptions()) for (const auto &entry : ConnectionManager->Subscriptions())
@ -130,7 +130,7 @@ void MainWindow::CheckSubscriptionsUpdate()
if (renewTime <= QDateTime::currentDateTime()) if (renewTime <= QDateTime::currentDateTime())
{ {
updateList << QPair<QString, GroupId>{ info.displayName, entry }; updateList << std::pair{ info.displayName, entry };
updateNamesList << info.displayName; updateNamesList << info.displayName;
LOG(QString("Subscription update \"%1\": L=%2 R=%3 I=%4") LOG(QString("Subscription update \"%1\": L=%2 R=%3 I=%4")
.arg(info.displayName) .arg(info.displayName)