lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

Browse Source
This commit is contained in:
torsten committed 2026-08-27 09:02:26 +02:00
1 parent 8050bca545
commit bb1447c858
18635 files changed
+2466913 -906310
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/CMakeLists.txt
+7 -7
View File
@@ -46,11 +46,11 @@ NGL_TARGET_LINK_LIBRARIES(svcEemCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
LtsCommandLineParser
NGLLogger
ngldb
svcPdmCommon
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
)
NGL_INSTALL_TARGET(svcEemCommon)
@@ -73,7 +73,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEemClient
NGL_TARGET_LINK_LIBRARIES(svcEemClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcEemCommon
ddsftc
@@ -99,7 +99,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEemServer
NGL_TARGET_LINK_LIBRARIES(svcEemServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcEemCommon
@@ -157,11 +157,11 @@ NGL_TARGET_LINK_LIBRARIES(svcExerciseEventManagement
svcOssClient
svcPpmClient
svcAvmClient
svcIsmCommon
svcIsmClient
$<IF:$<TARGET_EXISTS:svcIsmCommon>,svcIsmCommon,>
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
svcPdmClient
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/CMakeLists.txt
+1 -1
View File
@@ -33,7 +33,7 @@ IF(BUILD_TESTING AND BUILD_SV)
svcGimServer
svcCoreClient
LtsCommandLineParser
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
)
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/ModuleTests/eem_tests.cpp
+2 -2
View File
@@ -9,8 +9,8 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QTimer>
#include <QDateTime>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QTest>
#include <QJsonObject>
#include <QJsonDocument>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/WebSocketServer/web_socket_handler.h
+3 -3
View File
@@ -8,11 +8,11 @@
#pragma once
#include <QObject>
#include <QQueue>
#include <QtCore/QObject>
#include <QtCore/QQueue>
#include <QWebSocketServer>
#include <memory>
#include <QTimer>
#include <QtCore/QTimer>
#include "../logger.h"
namespace ExerciseEventManagement
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/dds_handler.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "dds_handler.h"
#include <QTimer>
#include <QtCore/QTimer>
namespace ExerciseEventManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_dynamic_participant_data.cpp
+2 -2
View File
@@ -14,14 +14,14 @@
#include "web_socket_server.h"
#include "settings.h"
#include <QSet>
#include <QtCore/QSet>
#include <QtCore/QThread>
#include <QJsonArray>
#include <QJsonObject>
#include <QJsonDocument>
#include <LtsUtilsCore/json_object.h>
#include <QTimer>
#include <QtCore/QTimer>
using namespace ExerciseEventManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_equipment_error_registration.cpp
+2 -2
View File
@@ -15,13 +15,13 @@
#include <ProjectDataManagement/pdm_enums.hpp>
#include <QSet>
#include <QtCore/QSet>
#include <QtCore/QThread>
#include <QJsonArray>
#include <QJsonObject>
#include <QJsonDocument>
#include <QTimer>
#include <QtCore/QTimer>
using namespace ExerciseEventManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/handler_participant_event.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
#include <QJsonObject>
#include <QJsonDocument>
#include <QTimer>
#include <QtCore/QTimer>
using namespace ExerciseEventManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/settings.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "settings.h"
#include <QtCore/QSettings>
#include <QPoint>
#include <QtCore/QPoint>
#include <nglsettings/nglsettings_settings.h>
#include <ngltools/ngltools_filesystem.h>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/settings.h
+2 -2
View File
@@ -6,8 +6,8 @@
*/
#pragma once
#include <QString>
#include <QPair>
#include <QtCore/QString>
#include <QtCore/QPair>
namespace NGL
{
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include <ExerciseEventManagement/eem_db.h>
#include <QTimer>
#include <QtCore/QTimer>
#include <QWebSocket>
#include <QJsonDocument>
#include <QJsonObject>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_avs.h
+3 -3
View File
@@ -9,9 +9,9 @@
#pragma once
#include <QAbstractSocket>
#include <QTimer>
#include <QVector>
#include <QSharedPointer>
#include <QtCore/QTimer>
#include <QtCore/QVector>
#include <QtCore/QSharedPointer>
#include "logger.h"
#include "dds_handler.h"
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include <QJsonDocument>
#include <QJsonObject>
#include <QSqlError>
#include <QTimer>
#include <QtCore/QTimer>
#include <QUrlQuery>
#include <QWebSocket>
#include <QWebSocketServer>
qt6-after/qt6-migrated-legatus/Lts/Services/ExerciseEventManagement/web_socket_server.h
+4 -4
View File
@@ -8,11 +8,11 @@
#pragma once
#include <QMap>
#include <QObject>
#include <QSet>
#include <QtCore/QMap>
#include <QtCore/QObject>
#include <QtCore/QSet>
#include <QSqlDatabase>
#include <QVector>
#include <QtCore/QVector>
#include <ExerciseEventManagement/eem_db_structs.h>
#include "logger.h"