From 1c7bb289a97b8a33a87f15b5e7246bd4069618f0 Mon Sep 17 00:00:00 2001 From: Qv2ray-dev <59914293+Qv2ray-dev@users.noreply.github.com> Date: Sun, 1 Mar 2020 17:30:41 +0800 Subject: [PATCH] fix: use c++11 initializer list of QStringList --- makespec/BUILDVERSION | 2 +- src/base/models/QvConfigModel.hpp | 4 +--- src/common/QvHelpers.cpp | 4 +--- src/components/proxy/QvProxyConfigurator.cpp | 2 +- src/core/connection/Generation.cpp | 13 +++++++++---- src/core/connection/Generation.hpp | 1 + src/core/kernel/KernelInteractions.cpp | 7 ++----- src/ui/w_MainWindow.cpp | 4 ++-- src/ui/w_SubscriptionManager.cpp | 6 ++---- 9 files changed, 20 insertions(+), 23 deletions(-) diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index a6c9dc98..e1c3d7b5 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -4215 +4216 diff --git a/src/base/models/QvConfigModel.hpp b/src/base/models/QvConfigModel.hpp index 521fc4f1..ae545130 100644 --- a/src/base/models/QvConfigModel.hpp +++ b/src/base/models/QvConfigModel.hpp @@ -118,9 +118,7 @@ namespace Qv2ray::base::config bool withLocalDNS; QList dnsList; Qv2rayForwardProxyConfig forwardProxyConfig; - Qv2rayConnectionConfig() - : bypassCN(true), enableProxy(true), withLocalDNS(false), dnsList(QStringList() << "8.8.4.4" - << "1.1.1.1") + Qv2rayConnectionConfig() : bypassCN(true), enableProxy(true), withLocalDNS(false), dnsList(QStringList{ "8.8.4.4", "1.1.1.1" }) { } XTOSTRUCT(O(bypassCN, enableProxy, withLocalDNS, dnsList, forwardProxyConfig)) diff --git a/src/common/QvHelpers.cpp b/src/common/QvHelpers.cpp index dee61789..a539ff9e 100644 --- a/src/common/QvHelpers.cpp +++ b/src/common/QvHelpers.cpp @@ -128,9 +128,7 @@ namespace Qv2ray::common QStringList GetFileList(QDir dir) { - return dir.entryList(QStringList() << "*" - << "*.*", - QDir::Hidden | QDir::Files); + return dir.entryList(QStringList{ "*", "*.*" }, QDir::Hidden | QDir::Files); } bool FileExistsIn(QDir dir, QString fileName) diff --git a/src/components/proxy/QvProxyConfigurator.cpp b/src/components/proxy/QvProxyConfigurator.cpp index 59f4a722..4cc274bc 100644 --- a/src/components/proxy/QvProxyConfigurator.cpp +++ b/src/components/proxy/QvProxyConfigurator.cpp @@ -15,7 +15,7 @@ namespace Qv2ray::components::proxy { QProcess p; p.setProgram("/usr/sbin/networksetup"); - p.setArguments(QStringList() << "-listallnetworkservices"); + p.setArguments(QStringList{ "-listallnetworkservices" }); p.start(); p.waitForStarted(); p.waitForFinished(); diff --git a/src/core/connection/Generation.cpp b/src/core/connection/Generation.cpp index acb003fd..f65ff1a2 100644 --- a/src/core/connection/Generation.cpp +++ b/src/core/connection/Generation.cpp @@ -21,15 +21,15 @@ namespace Qv2ray::core::connection { // This is added to disable all proxies, as a alternative // influence of #64 - rulesList.append(GenerateSingleRouteRule(QStringList() << "regexp:.*", true, OUTBOUND_TAG_DIRECT)); + rulesList.append(GenerateSingleRouteRule("regexp:.*", true, OUTBOUND_TAG_DIRECT)); } // Private IPs should always NOT TO PROXY! - rulesList.append(GenerateSingleRouteRule(QStringList() << "geoip:private", false, OUTBOUND_TAG_DIRECT)); + rulesList.append(GenerateSingleRouteRule("geoip:private", false, OUTBOUND_TAG_DIRECT)); // // Check if CN needs proxy, or direct. - rulesList.append(GenerateSingleRouteRule(QStringList() << "geoip:cn", false, proxyCN ? OUTBOUND_TAG_DIRECT : OUTBOUND_TAG_PROXY)); - rulesList.append(GenerateSingleRouteRule(QStringList() << "geosite:cn", true, proxyCN ? OUTBOUND_TAG_DIRECT : OUTBOUND_TAG_PROXY)); + rulesList.append(GenerateSingleRouteRule("geoip:cn", false, proxyCN ? OUTBOUND_TAG_DIRECT : OUTBOUND_TAG_PROXY)); + rulesList.append(GenerateSingleRouteRule("geosite:cn", true, proxyCN ? OUTBOUND_TAG_DIRECT : OUTBOUND_TAG_PROXY)); // // As a bug fix of #64, this default rule has been disabled. // rulesList.append(GenerateSingleRouteRule(QStringList({"regexp:.*"}), @@ -38,6 +38,11 @@ namespace Qv2ray::core::connection RROOT } + ROUTERULE GenerateSingleRouteRule(QString str, bool isDomain, QString outboundTag, QString type) + { + return GenerateSingleRouteRule(QStringList{ str }, isDomain, outboundTag, type); + } + ROUTERULE GenerateSingleRouteRule(QStringList list, bool isDomain, QString outboundTag, QString type) { ROUTERULE root; diff --git a/src/core/connection/Generation.hpp b/src/core/connection/Generation.hpp index 3fc7ebb8..c40b32d3 100644 --- a/src/core/connection/Generation.hpp +++ b/src/core/connection/Generation.hpp @@ -7,6 +7,7 @@ namespace Qv2ray::core::connection // Important config generation algorithms. const QStringList vLogLevels = { "none", "debug", "info", "warning", "error" }; ROUTING GenerateRoutes(bool enableProxy, bool cnProxy); + ROUTERULE GenerateSingleRouteRule(QString str, bool isDomain, QString outboundTag, QString type = "field"); ROUTERULE GenerateSingleRouteRule(QStringList list, bool isDomain, QString outboundTag, QString type = "field"); QJsonObject GenerateDNS(bool withLocalhost, QStringList dnsServers); QJsonObject GenerateAPIEntry(QString tag, bool withHandler = true, bool withLogger = true, bool withStats = true); diff --git a/src/core/kernel/KernelInteractions.cpp b/src/core/kernel/KernelInteractions.cpp index 8337ae0e..10cd59dc 100644 --- a/src/core/kernel/KernelInteractions.cpp +++ b/src/core/kernel/KernelInteractions.cpp @@ -109,10 +109,7 @@ namespace Qv2ray::core::kernel QProcess process; process.setProcessEnvironment(env); DEBUG(MODULE_VCORE, "Starting V2ray core with test options") - process.start(GlobalConfig.v2CorePath, - QStringList() << "-test" - << "-config" << path, - QIODevice::ReadWrite | QIODevice::Text); + process.start(GlobalConfig.v2CorePath, QStringList{ "-test", "-config", path }, QIODevice::ReadWrite | QIODevice::Text); process.waitForFinished(); if (process.exitCode() != 0) @@ -175,7 +172,7 @@ namespace Qv2ray::core::kernel QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); env.insert("V2RAY_LOCATION_ASSET", GlobalConfig.v2AssetsPath); vProcess->setProcessEnvironment(env); - vProcess->start(GlobalConfig.v2CorePath, QStringList() << "-config" << filePath, QIODevice::ReadWrite | QIODevice::Text); + vProcess->start(GlobalConfig.v2CorePath, QStringList{ "-config", filePath }, QIODevice::ReadWrite | QIODevice::Text); vProcess->waitForStarted(); DEBUG(MODULE_VCORE, "V2ray core started.") KernelStarted = true; diff --git a/src/ui/w_MainWindow.cpp b/src/ui/w_MainWindow.cpp index e19e9353..7514961a 100644 --- a/src/ui/w_MainWindow.cpp +++ b/src/ui/w_MainWindow.cpp @@ -51,7 +51,7 @@ void MainWindow::MWAddConnectionItem_p(const ConnectionId &connection, const Gro MWAddGroupItem_p(groupId); } auto groupItem = groupNodes[groupId]; - auto connectionItem = make_shared(QStringList() << "" << ConnectionManager->GetDisplayName(connection)); + auto connectionItem = make_shared(QStringList{ "", ConnectionManager->GetDisplayName(connection) }); connectionNodes[connection] = connectionItem; groupItem->addChild(connectionItem.get()); auto widget = new ConnectionItemWidget(connection, connectionListWidget); @@ -61,7 +61,7 @@ void MainWindow::MWAddConnectionItem_p(const ConnectionId &connection, const Gro void MainWindow::MWAddGroupItem_p(const GroupId &groupId) { - auto groupItem = make_shared(QStringList() << "" << ConnectionManager->GetDisplayName(groupId)); + auto groupItem = make_shared(QStringList{ "", ConnectionManager->GetDisplayName(groupId) }); groupNodes[groupId] = groupItem; connectionListWidget->addTopLevelItem(groupItem.get()); connectionListWidget->setItemWidget(groupItem.get(), 0, new ConnectionItemWidget(groupId, connectionListWidget)); diff --git a/src/ui/w_SubscriptionManager.cpp b/src/ui/w_SubscriptionManager.cpp index 543365d3..7606a9ad 100644 --- a/src/ui/w_SubscriptionManager.cpp +++ b/src/ui/w_SubscriptionManager.cpp @@ -13,7 +13,7 @@ SubscribeEditor::SubscribeEditor(QWidget *parent) : QDialog(parent) for (auto subs : ConnectionManager->Subscriptions()) { - subscriptionList->addTopLevelItem(new QTreeWidgetItem(QStringList{ ConnectionManager->GetDisplayName(subs), subs.toString() })); // + subscriptionList->addTopLevelItem(new QTreeWidgetItem(QStringList{ ConnectionManager->GetDisplayName(subs), subs.toString() })); } } @@ -39,9 +39,7 @@ void SubscribeEditor::on_addSubsButton_clicked() auto const key = QSTRN(QTime::currentTime().msecsSinceStartOfDay()); auto id = ConnectionManager->CreateGroup(key, true); // - subscriptionList->addTopLevelItem(new QTreeWidgetItem(QStringList() // - << key // - << id.toString())); // + subscriptionList->addTopLevelItem(new QTreeWidgetItem(QStringList{ key, id.toString() })); } void SubscribeEditor::on_updateButton_clicked()