AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migrated the codebase to Qt6 and fixed some compatibility issues

Browse source 
* used a Qt6 ported version of SortFilterProxyModel
* used an updated Qt6 compatible version of QXZing
* added a flag to windows linker to avoid WinMain problem of MSVCRTD
* renamed utils.cpp to utilities.cpp for avoiding confusion with the same file name in SortFilterProxyModel
This commit is contained in:
Mortie 2022-08-29 12:21:09 +04:30
parent 050d987d3b
commit 8c20a67cfa
140 changed files with 5924 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/protocols/ikev2_vpn_protocol_windows.cpp
View file

@ -8,7 +8,7 @@
#include "debug.h"
#include "ikev2_vpn_protocol_windows.h"
#include "utils.h"
#include "utilities.h"
static Ikev2Protocol* self = nullptr;
static std::mutex rasDialFuncMutex;

2
client/protocols/openvpnovercloakprotocol.cpp
View file

@ -1,7 +1,7 @@
#include "openvpnovercloakprotocol.h"
#include "core/servercontroller.h"
#include "utils.h"
#include "utilities.h"
#include "containers/containers_defs.h"
#include <QCryptographicHash>

6
client/protocols/openvpnprotocol.cpp
View file

@ -6,7 +6,7 @@
#include "debug.h"
#include "defines.h"
#include "utils.h"
#include "utilities.h"
#include "openvpnprotocol.h"
@ -125,9 +125,9 @@ void OpenVpnProtocol::sendManagementCommand(const QString& command)
void OpenVpnProtocol::updateRouteGateway(QString line)
{
// TODO: fix for macos
line = line.split("ROUTE_GATEWAY", QString::SkipEmptyParts).at(1);
line = line.split("ROUTE_GATEWAY", Qt::SkipEmptyParts).at(1);
if (!line.contains("/")) return;
m_routeGateway = line.split("/", QString::SkipEmptyParts).first();
m_routeGateway = line.split("/", Qt::SkipEmptyParts).first();
m_routeGateway.replace(" ", "");
qDebug() << "Set VPN route gateway" << m_routeGateway;
}

2
client/protocols/shadowsocksvpnprotocol.cpp
View file

@ -2,7 +2,7 @@
#include "core/servercontroller.h"
#include "debug.h"
#include "utils.h"
#include "utilities.h"
#include "containers/containers_defs.h"
#include <QCryptographicHash>

6
client/protocols/wireguardprotocol.cpp
View file

@ -7,7 +7,7 @@
#include "debug.h"
#include "wireguardprotocol.h"
#include "utils.h"
#include "utilities.h"
WireguardProtocol::WireguardProtocol(const QJsonObject &configuration, QObject* parent) :
VpnProtocol(configuration, parent)
@ -110,9 +110,9 @@ QString WireguardProtocol::configPath() const
void WireguardProtocol::updateRouteGateway(QString line)
{
// TODO: fix for macos
line = line.split("ROUTE_GATEWAY", QString::SkipEmptyParts).at(1);
line = line.split("ROUTE_GATEWAY", Qt::SkipEmptyParts).at(1);
if (!line.contains("/")) return;
m_routeGateway = line.split("/", QString::SkipEmptyParts).first();
m_routeGateway = line.split("/", Qt::SkipEmptyParts).first();
m_routeGateway.replace(" ", "");
qDebug() << "Set VPN route gateway" << m_routeGateway;
}