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
service/server/localserver.cpp
View file

@ -5,7 +5,7 @@
#include "ipc.h"
#include "localserver.h"
#include "utils.h"
#include "utilities.h"
#include "router.h"

4
service/server/log.cpp
View file

@ -5,7 +5,7 @@
#include "log.h"
#include "defines.h"
#include "utils.h"
#include "utilities.h"
QFile Log::m_file;
QTextStream Log::m_textStream;
@ -17,7 +17,7 @@ void debugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons
return;
}
Log::m_textStream << qFormatLogMessage(type, context, msg) << endl << flush;
Log::m_textStream << qFormatLogMessage(type, context, msg) << Qt::endl << Qt::flush;
std::cout << qFormatLogMessage(type, context, msg).toStdString() << std::endl << std::flush;
}

2
service/server/main.cpp
View file

@ -4,7 +4,7 @@
#include "localserver.h"
#include "log.h"
#include "systemservice.h"
#include "utils.h"
#include "utilities.h"
int runApplication(int argc, char** argv)

2
service/server/router_linux.cpp
View file

@ -2,7 +2,7 @@
#include <QProcess>
#include <QThread>
#include <utils.h>
#include <utilities.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <net/route.h>

2
service/server/router_mac.cpp
View file

@ -3,7 +3,7 @@
#include <QProcess>
#include <QThread>
#include <utils.h>
#include <utilities.h>
RouterMac &RouterMac::Instance()
{

2
service/server/router_win.cpp
View file

@ -1,5 +1,5 @@
#include "router_win.h"
#include "../client/utils.h"
#include "../client/utilities.h"
#include <string>
#include <tlhelp32.h>

4
service/server/server.pro
View file

@ -5,7 +5,7 @@ QT += core network remoteobjects
equals(QT_MAJOR_VERSION, 6): QT += core5compat
HEADERS = \
../../client/utils.h \
../../client/utilities.h \
../../ipc/ipc.h \
../../ipc/ipcserver.h \
../../ipc/ipcserverprocess.h \
@ -15,7 +15,7 @@ HEADERS = \
systemservice.h
SOURCES = \
../../client/utils.cpp \
../../client/utilities.cpp \
../../ipc/ipcserver.cpp \
../../ipc/ipcserverprocess.cpp \
localserver.cpp \

4
service/server/tapcontroller_win.cpp
View file

@ -87,12 +87,12 @@ QStringList TapController::getTapList()
return QStringList();
}
QStringList l = output.split("\n", QString::SkipEmptyParts);
QStringList l = output.split("\n", Qt::SkipEmptyParts);
if (l.size() > 0) l.removeLast();
QStringList tapList;
for (QString s : l) {
if (s.contains(" ")) tapList.append(s.split(" ", QString::SkipEmptyParts).first());
if (s.contains(" ")) tapList.append(s.split(" ", Qt::SkipEmptyParts).first());
else tapList.append(s);
}