mirror of
https://github.com/Qv2ray/Qv2ray.git
synced 2025-05-20 02:40:20 +08:00
fix: use c++11 initializer list of QStringList
This commit is contained in:
parent
46c13543a4
commit
1c7bb289a9
@ -1 +1 @@
|
|||||||
4215
|
4216
|
||||||
|
@ -118,9 +118,7 @@ namespace Qv2ray::base::config
|
|||||||
bool withLocalDNS;
|
bool withLocalDNS;
|
||||||
QList<QString> dnsList;
|
QList<QString> dnsList;
|
||||||
Qv2rayForwardProxyConfig forwardProxyConfig;
|
Qv2rayForwardProxyConfig forwardProxyConfig;
|
||||||
Qv2rayConnectionConfig()
|
Qv2rayConnectionConfig() : bypassCN(true), enableProxy(true), withLocalDNS(false), dnsList(QStringList{ "8.8.4.4", "1.1.1.1" })
|
||||||
: bypassCN(true), enableProxy(true), withLocalDNS(false), dnsList(QStringList() << "8.8.4.4"
|
|
||||||
<< "1.1.1.1")
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
XTOSTRUCT(O(bypassCN, enableProxy, withLocalDNS, dnsList, forwardProxyConfig))
|
XTOSTRUCT(O(bypassCN, enableProxy, withLocalDNS, dnsList, forwardProxyConfig))
|
||||||
|
@ -128,9 +128,7 @@ namespace Qv2ray::common
|
|||||||
|
|
||||||
QStringList GetFileList(QDir dir)
|
QStringList GetFileList(QDir dir)
|
||||||
{
|
{
|
||||||
return dir.entryList(QStringList() << "*"
|
return dir.entryList(QStringList{ "*", "*.*" }, QDir::Hidden | QDir::Files);
|
||||||
<< "*.*",
|
|
||||||
QDir::Hidden | QDir::Files);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FileExistsIn(QDir dir, QString fileName)
|
bool FileExistsIn(QDir dir, QString fileName)
|
||||||
|
@ -15,7 +15,7 @@ namespace Qv2ray::components::proxy
|
|||||||
{
|
{
|
||||||
QProcess p;
|
QProcess p;
|
||||||
p.setProgram("/usr/sbin/networksetup");
|
p.setProgram("/usr/sbin/networksetup");
|
||||||
p.setArguments(QStringList() << "-listallnetworkservices");
|
p.setArguments(QStringList{ "-listallnetworkservices" });
|
||||||
p.start();
|
p.start();
|
||||||
p.waitForStarted();
|
p.waitForStarted();
|
||||||
p.waitForFinished();
|
p.waitForFinished();
|
||||||
|
@ -21,15 +21,15 @@ namespace Qv2ray::core::connection
|
|||||||
{
|
{
|
||||||
// This is added to disable all proxies, as a alternative
|
// This is added to disable all proxies, as a alternative
|
||||||
// influence of #64
|
// 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!
|
// 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.
|
// Check if CN needs proxy, or direct.
|
||||||
rulesList.append(GenerateSingleRouteRule(QStringList() << "geoip:cn", false, proxyCN ? OUTBOUND_TAG_DIRECT : OUTBOUND_TAG_PROXY));
|
rulesList.append(GenerateSingleRouteRule("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("geosite:cn", true, proxyCN ? OUTBOUND_TAG_DIRECT : OUTBOUND_TAG_PROXY));
|
||||||
//
|
//
|
||||||
// As a bug fix of #64, this default rule has been disabled.
|
// As a bug fix of #64, this default rule has been disabled.
|
||||||
// rulesList.append(GenerateSingleRouteRule(QStringList({"regexp:.*"}),
|
// rulesList.append(GenerateSingleRouteRule(QStringList({"regexp:.*"}),
|
||||||
@ -38,6 +38,11 @@ namespace Qv2ray::core::connection
|
|||||||
RROOT
|
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 GenerateSingleRouteRule(QStringList list, bool isDomain, QString outboundTag, QString type)
|
||||||
{
|
{
|
||||||
ROUTERULE root;
|
ROUTERULE root;
|
||||||
|
@ -7,6 +7,7 @@ namespace Qv2ray::core::connection
|
|||||||
// Important config generation algorithms.
|
// Important config generation algorithms.
|
||||||
const QStringList vLogLevels = { "none", "debug", "info", "warning", "error" };
|
const QStringList vLogLevels = { "none", "debug", "info", "warning", "error" };
|
||||||
ROUTING GenerateRoutes(bool enableProxy, bool cnProxy);
|
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");
|
ROUTERULE GenerateSingleRouteRule(QStringList list, bool isDomain, QString outboundTag, QString type = "field");
|
||||||
QJsonObject GenerateDNS(bool withLocalhost, QStringList dnsServers);
|
QJsonObject GenerateDNS(bool withLocalhost, QStringList dnsServers);
|
||||||
QJsonObject GenerateAPIEntry(QString tag, bool withHandler = true, bool withLogger = true, bool withStats = true);
|
QJsonObject GenerateAPIEntry(QString tag, bool withHandler = true, bool withLogger = true, bool withStats = true);
|
||||||
|
@ -109,10 +109,7 @@ namespace Qv2ray::core::kernel
|
|||||||
QProcess process;
|
QProcess process;
|
||||||
process.setProcessEnvironment(env);
|
process.setProcessEnvironment(env);
|
||||||
DEBUG(MODULE_VCORE, "Starting V2ray core with test options")
|
DEBUG(MODULE_VCORE, "Starting V2ray core with test options")
|
||||||
process.start(GlobalConfig.v2CorePath,
|
process.start(GlobalConfig.v2CorePath, QStringList{ "-test", "-config", path }, QIODevice::ReadWrite | QIODevice::Text);
|
||||||
QStringList() << "-test"
|
|
||||||
<< "-config" << path,
|
|
||||||
QIODevice::ReadWrite | QIODevice::Text);
|
|
||||||
process.waitForFinished();
|
process.waitForFinished();
|
||||||
|
|
||||||
if (process.exitCode() != 0)
|
if (process.exitCode() != 0)
|
||||||
@ -175,7 +172,7 @@ namespace Qv2ray::core::kernel
|
|||||||
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
|
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
|
||||||
env.insert("V2RAY_LOCATION_ASSET", GlobalConfig.v2AssetsPath);
|
env.insert("V2RAY_LOCATION_ASSET", GlobalConfig.v2AssetsPath);
|
||||||
vProcess->setProcessEnvironment(env);
|
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();
|
vProcess->waitForStarted();
|
||||||
DEBUG(MODULE_VCORE, "V2ray core started.")
|
DEBUG(MODULE_VCORE, "V2ray core started.")
|
||||||
KernelStarted = true;
|
KernelStarted = true;
|
||||||
|
@ -51,7 +51,7 @@ void MainWindow::MWAddConnectionItem_p(const ConnectionId &connection, const Gro
|
|||||||
MWAddGroupItem_p(groupId);
|
MWAddGroupItem_p(groupId);
|
||||||
}
|
}
|
||||||
auto groupItem = groupNodes[groupId];
|
auto groupItem = groupNodes[groupId];
|
||||||
auto connectionItem = make_shared<QTreeWidgetItem>(QStringList() << "" << ConnectionManager->GetDisplayName(connection));
|
auto connectionItem = make_shared<QTreeWidgetItem>(QStringList{ "", ConnectionManager->GetDisplayName(connection) });
|
||||||
connectionNodes[connection] = connectionItem;
|
connectionNodes[connection] = connectionItem;
|
||||||
groupItem->addChild(connectionItem.get());
|
groupItem->addChild(connectionItem.get());
|
||||||
auto widget = new ConnectionItemWidget(connection, connectionListWidget);
|
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)
|
void MainWindow::MWAddGroupItem_p(const GroupId &groupId)
|
||||||
{
|
{
|
||||||
auto groupItem = make_shared<QTreeWidgetItem>(QStringList() << "" << ConnectionManager->GetDisplayName(groupId));
|
auto groupItem = make_shared<QTreeWidgetItem>(QStringList{ "", ConnectionManager->GetDisplayName(groupId) });
|
||||||
groupNodes[groupId] = groupItem;
|
groupNodes[groupId] = groupItem;
|
||||||
connectionListWidget->addTopLevelItem(groupItem.get());
|
connectionListWidget->addTopLevelItem(groupItem.get());
|
||||||
connectionListWidget->setItemWidget(groupItem.get(), 0, new ConnectionItemWidget(groupId, connectionListWidget));
|
connectionListWidget->setItemWidget(groupItem.get(), 0, new ConnectionItemWidget(groupId, connectionListWidget));
|
||||||
|
@ -13,7 +13,7 @@ SubscribeEditor::SubscribeEditor(QWidget *parent) : QDialog(parent)
|
|||||||
|
|
||||||
for (auto subs : ConnectionManager->Subscriptions())
|
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 const key = QSTRN(QTime::currentTime().msecsSinceStartOfDay());
|
||||||
auto id = ConnectionManager->CreateGroup(key, true);
|
auto id = ConnectionManager->CreateGroup(key, true);
|
||||||
//
|
//
|
||||||
subscriptionList->addTopLevelItem(new QTreeWidgetItem(QStringList() //
|
subscriptionList->addTopLevelItem(new QTreeWidgetItem(QStringList{ key, id.toString() }));
|
||||||
<< key //
|
|
||||||
<< id.toString())); //
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void SubscribeEditor::on_updateButton_clicked()
|
void SubscribeEditor::on_updateButton_clicked()
|
||||||
|
Loading…
Reference in New Issue
Block a user