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

6
client/ui/pages_logic/NetworkSettingsLogic.cpp
View file

@ -1,7 +1,7 @@
#include "NetworkSettingsLogic.h"
#include "defines.h"
#include "utils.h"
#include "utilities.h"
NetworkSettingsLogic::NetworkSettingsLogic(UiLogic *logic, QObject *parent):
PageLogicBase(logic, parent),
@ -21,14 +21,14 @@ void NetworkSettingsLogic::onUpdatePage()
void NetworkSettingsLogic::onLineEditDns1EditFinished(const QString &text)
{
if (ipAddressRegex().exactMatch(text)) {
if (ipAddressRegex().match(text).hasMatch()) {
m_settings.setPrimaryDns(text);
}
}
void NetworkSettingsLogic::onLineEditDns2EditFinished(const QString &text)
{
if (ipAddressRegex().exactMatch(text)) {
if (ipAddressRegex().match(text).hasMatch()) {
m_settings.setSecondaryDns(text);
}
}

2
client/ui/pages_logic/NetworkSettingsLogic.h
View file

@ -13,7 +13,7 @@ class NetworkSettingsLogic : public PageLogicBase
AUTO_PROPERTY(QString, lineEditDns1Text)
AUTO_PROPERTY(QString, lineEditDns2Text)
READONLY_PROPERTY(QRegExp, ipAddressRegex)
READONLY_PROPERTY(QRegularExpression, ipAddressRegex)
public:
Q_INVOKABLE void onUpdatePage() override;

2
client/ui/pages_logic/ShareConnectionLogic.cpp
View file

@ -6,7 +6,7 @@
#include "QZXing.h"
#include "QZXingImageProvider.h"
#include "QZXingFilter.h"
//#include "QZXingFilter.h"
#include "ShareConnectionLogic.h"

4
client/ui/pages_logic/SitesLogic.cpp
View file

@ -5,7 +5,7 @@
#include "SitesLogic.h"
#include "VpnLogic.h"
#include "utils.h"
#include "utilities.h"
#include "vpnconnection.h"
#include <functional>
@ -56,7 +56,7 @@ void SitesLogic::onPushButtonAddCustomSitesClicked()
newSite.replace("http://", "");
newSite.replace("ftp://", "");
newSite = newSite.split("/", QString::SkipEmptyParts).first();
newSite = newSite.split("/", Qt::SkipEmptyParts).first();
}
const auto &cbProcess = [this, mode](const QString &newSite, const QString &ip) {

4
client/ui/pages_logic/StartPageLogic.cpp
View file

@ -2,7 +2,7 @@
#include "core/errorstrings.h"
#include "configurators/ssh_configurator.h"
#include "../uilogic.h"
#include "utils.h"
#include "utilities.h"
#include <QFileDialog>
#include <QStandardPaths>
@ -200,7 +200,7 @@ bool StartPageLogic::importConnectionFromCode(QString code)
return importConnection(o);
}
o = QJsonDocument::fromBinaryData(ba).object();
o = QJsonDocument::fromJson(ba).object();
if (!o.isEmpty()) {
return importConnection(o);
}

4
client/ui/pages_logic/StartPageLogic.h
View file

@ -3,6 +3,8 @@
#include "PageLogicBase.h"
#include <QRegExp>
class UiLogic;
class StartPageLogic : public PageLogicBase
@ -22,7 +24,7 @@ class StartPageLogic : public PageLogicBase
AUTO_PROPERTY(bool, pushButtonBackFromStartVisible)
AUTO_PROPERTY(bool, pushButtonConnectVisible)
READONLY_PROPERTY(QRegExp, ipAddressPortRegex)
READONLY_PROPERTY(QRegularExpression, ipAddressPortRegex)
public:
Q_INVOKABLE void onUpdatePage() override;

4
client/ui/pages_logic/protocols/OtherProtocolsLogic.cpp
View file

@ -8,7 +8,7 @@
#include "core/servercontroller.h"
#include <functional>
#include "../../uilogic.h"
#include "utils.h"
#include "utilities.h"
#ifdef Q_OS_WINDOWS
#include <Windows.h>
@ -147,7 +147,7 @@ void OtherProtocolsLogic::onPushButtonSftpMountDriveClicked()
//#ifndef Q_OS_WIN
// args.replace("reconnect-orellinks", "");
//#endif
p->setArguments(args.split(" ", QString::SkipEmptyParts));
p->setArguments(args.split(" ", Qt::SkipEmptyParts));
p->start();
p->waitForStarted(50);
if (p->state() != QProcess::Running) {