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

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

No files matched your search

@@ -4,7 +4,7 @@
#pragma once
#include <QtCore/QObject>
#include <QQueue>
#include <QtCore/QQueue>
#include <QtWebSockets/QWebSocketServer>
#include <memory>
#include <logger.h>
@@ -16,7 +16,7 @@
#include <QtCore/QStringList>
#include <QtCore/QFile>
#include <QPolygonF>
#include <QtGui/QPolygonF>
#include <QtXml/QDomDocument>
#include <QtCore/QDebug>
@@ -5,7 +5,7 @@
#include <QtCore/QString>
#include <QtCore/QMap>
#include <QPolygonF>
#include <QtGui/QPolygonF>
#include <QDomElement>
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
#include "buildingcontrolvwm_export.h"
@@ -4,7 +4,7 @@
#include <QtCore/QObject>
#include <QtNetwork/QNetworkRequest>
#include <QQueue>
#include <QtCore/QQueue>
#include <QtCore/QMap>
#include <QtCore/QSet>
#include <logger.h>
@@ -8,9 +8,9 @@
#include "BuildingControlUnit/ControlEffects/xmlreader.h"
#include <QStandardPaths>
#include <QFile>
#include <QtCore/QFile>
#include <QtCore/QTimer>
#include <QTransform>
#include <QtGui/QTransform>
#include <QtWebSockets/QWebSocket>
#include <QXmlStreamWriter>
#include <QtCore/QJsonArray>
@@ -6,7 +6,7 @@
#include <QAbstractSocket>
#include <QProcess>
#include <QtCore/QVector>
#include <QUrl>
#include <QtCore/QUrl>
#include "ism_handler.h"
#include "logger.h"
#include <bld.hpp>
@@ -2,7 +2,7 @@
#pragma once
#include <QQueue>
#include <QtCore/QQueue>
#include <QtNetwork/QHostAddress>
#include "WebSocketInterface/Messages/message_transmitter.h"
@@ -34,7 +34,7 @@ TARGET_LINK_LIBRARIES(feedGeoJson
svcPpmClient
svcAesServer
svcIsmServer
$<IF:$<TARGET_EXISTS:svcIsmServer>,svcIsmServer,>
svcPdmServer
svcPpmServer
svcBldServer
@@ -43,7 +43,7 @@ TARGET_LINK_LIBRARIES(feedGeoJson
svcCoreClient
LtsCommandLineParser
LtsCoordTrans
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
)
@@ -8,7 +8,7 @@
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QPolygonF>
#include <QtGui/QPolygonF>
#include <QtCore/QDateTime>
@@ -92,7 +92,7 @@ CODEGEN_HANDLE_SVC_XML(SRCS_exe ${xml_FILE})
NGL_ADD_EXECUTABLE(HLA svcHighLevelArchitecture ${SRCS_exe})
NGL_TARGET_LINK_LIBRARIES(svcHighLevelArchitecture
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
LtsCommandLineParser
LtsCoordTrans
nglcoreapplication
@@ -8,7 +8,7 @@
#include <QtCore/QPointF>
#include <QtCore/QMap>
#include <QtCore/QSet>
#include <QTransform>
#include <QtGui/QTransform>
#include <WorldLocationStruct.h>
#include <EntityTypeStruct.h>
@@ -4,7 +4,7 @@
#pragma once
#include <QtCore/QObject>
#include <QQueue>
#include <QtCore/QQueue>
#include <QtWebSockets/QWebSocketServer>
#include <memory>
#include <TrainingAreaBase/training_area_telegrams.h>
@@ -137,7 +137,7 @@ CODEGEN_HANDLE_SVC_XML(SRCS_exe ${xml_FILE})
NGL_ADD_SVC_ICON(SRCS_exe)
NGL_ADD_EXECUTABLE(HLA svcHighLevelArchitecture ${SRCS_exe})
NGL_TARGET_LINK_LIBRARIES(svcHighLevelArchitecture
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
LtsCommandLineParser
LtsCoordTrans
nglcoreapplication
@@ -31,8 +31,8 @@
#include <NGSException.h>
#include <QtCore/QTimer>
#include <QPolygonF>
#include <QTransform>
#include <QtGui/QPolygonF>
#include <QtGui/QTransform>
#include <QtCore/QDateTime>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <AreaEffectSimulation/aes_enums.hpp>
@@ -8,7 +8,7 @@
#include <IObserver.h>
#include <QtCore/QMap>
#include <QtCore/QSet>
#include <QTransform>
#include <QtGui/QTransform>
#include <ProjectDataManagement/pdm_enums.hpp>
@@ -4,7 +4,7 @@
#pragma once
#include <QtCore/QObject>
#include <QQueue>
#include <QtCore/QQueue>
#include <QtWebSockets/QWebSocketServer>
#include <memory>
#include <TrainingAreaBase/training_area_telegrams.h>
@@ -95,7 +95,7 @@ SET_SOURCE_FILES_PROPERTIES(ngs_connector.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUS
#NGL_ADD_SVC_ICON(SRCS_exe)
NGL_ADD_EXECUTABLE(HLA hlaTestTool ${SRCS_exe})
NGL_TARGET_LINK_LIBRARIES(hlaTestTool
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
LtsCommandLineParser
LtsCoordTrans
nglcoreapplication
@@ -30,8 +30,8 @@
#include <NGSException.h>
#include <QtCore/QTimer>
#include <QPolygonF>
#include <QTransform>
#include <QtGui/QPolygonF>
#include <QtGui/QTransform>
#include <QtCore/QDateTime>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <AreaEffectSimulation/aes_enums.hpp>
@@ -9,7 +9,7 @@
#include <IObserver.h>
#include <QtCore/QMap>
#include <QtCore/QSet>
#include <QTransform>
#include <QtGui/QTransform>
#include <ProjectDataManagement/pdm_enums.hpp>
@@ -117,7 +117,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTabCommon
Qt6::Network
NGLLogger
ngldb
svcPdmCommon
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
LtsUtilsCoreHeaderOnly
)
IF(BUILD_RTI)
@@ -295,10 +295,10 @@ NGL_TARGET_LINK_LIBRARIES(svcTrainingAreaBase
svcCoreClient
svcAsmClient
svcExmClient
svcIsmClient
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
svcPdmClient
svcPpmClient
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
NGLLogger
@@ -317,4 +317,4 @@ TARGET_SOURCES(tabPluginInterface INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/training_area_telegrams.h
)
TARGET_INCLUDE_DIRECTORIES(tabPluginInterface INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/../)
TARGET_LINK_LIBRARIES(tabPluginInterface INTERFACE Qt6::Core svcPdmCommon)
TARGET_LINK_LIBRARIES(tabPluginInterface INTERFACE Qt6::Core $<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>)
@@ -89,7 +89,7 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginAdler
svcCoreClient
svcNomClient
svcOpmClient
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
LtsUtilsDds
saaTelegrams
Trajectory
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -1,6 +1,6 @@
#pragma once
#include<QString>
#include <QtCore/QString>
#include <QtTest/QTest>
namespace AdlerJson {
@@ -11,7 +11,7 @@
#include <QtCore/QPointF>
#include <QtCore/QRectF>
#include <QtCore/QString>
#include <QTransform>
#include <QtGui/QTransform>
#include <QtCore/QVector>
#include <time.h>
@@ -5,10 +5,10 @@
#include "logger.h"
#include <QtCore/QObject>
#include <FileManagement/flm_ftc.h>
#include <Lts/Services/FileManagement/flm_ftc.h>
#include <NotificationManagement/nom_ftc.h>
#include <NotificationManagement/nom_ftc_types.h>
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
#include <OperatorManagement/opm_data_plugin_interface.h>
#include <TrainingAreaBase/dds_handler.h>
namespace FileManagement
@@ -5,7 +5,7 @@
#include <TrainingAreaBase/Plugins/AdlerJson/telegrams.h>
#include <TrainingAreaBase/training_area_telegrams.h>
#include <QTransform>
#include <QtGui/QTransform>
namespace AdlerJson
{
@@ -48,6 +48,6 @@ NGL_TARGET_LINK_LIBRARIES(tabPluginApHla
svcExmClient
svcAesClient
svcCoreClient
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
LtsUtilsDds
)
@@ -11,7 +11,7 @@
#include <QtCore/QObject>
#include <QtCore/QMutex>
#include <QQueue>
#include <QtCore/QQueue>
#include <QtCore/QVector>
#include <QtCore/QMetaObject>
#include <QEventLoop>
@@ -4,7 +4,7 @@
#pragma once
#include <QtCore/QObject>
#include <QQueue>
#include <QtCore/QQueue>
#include <QtCore/QMutex>
@@ -17,7 +17,7 @@
#include <vector>
#include <QQueue>
#include <QtCore/QQueue>
#include <QtCore/QPointer>
@@ -12,7 +12,7 @@
#include <ProjectDataManagement/pdm_dtc.h>
#include <ParticipantManagement/ppm.hpp>
#include <FileManagement/flm_dtc.h>
#include <FileManagement/flm_ftc.h>
#include <Lts/Services/FileManagement/flm_ftc.h>
#include <TmsIfAdapter/module_loader.h>
#include <TmsIfAdapter/tms_if_adapter.h>
@@ -7,8 +7,8 @@
#include <QtCore/QLineF>
#include <QtCore/QRectF>
#include <QtCore/QPointF>
#include <QPolygonF>
#include <QTransform>
#include <QtGui/QPolygonF>
#include <QtGui/QTransform>
#include <InfrastructureManagement/ism.hpp>
#include <InfrastructureManagement/ism_enums.hpp>
#include <InfrastructureManagement/ism_dtc.h>
@@ -9,7 +9,7 @@
#include <AreaEffectSimulation/aes_translation.h>
#include <ngldb/db_service_handler.h>
#include <TrainingAreaBase/tab_fts.h>
#include <QTransform>
#include <QtGui/QTransform>
namespace TrainingAreaBase
{
@@ -185,7 +185,7 @@ NGL_TARGET_LINK_LIBRARIES(svcTrainingAreaBaseOC
svcTabServer
svcAesClient
svcPdmClient
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
NGLLogger
@@ -48,7 +48,7 @@ NGL_TARGET_LINK_LIBRARIES(svcWarehouseManagement
svcCoreClient
svcExmClient # Read exercise topics
svcPpmClient
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsQoS
ddsdts
ProjectConfig
@@ -61,6 +61,9 @@ NGL_TARGET_LINK_LIBRARIES(svcWarehouseManagement
Qt6::WebSockets
wms_json_ds
)
target_include_directories(svcWarehouseManagement PRIVATE
${CMAKE_SOURCE_DIR}/Lts/DDS
)
NGL_INSTALL_TARGET(svcWarehouseManagement)
NGL_INSTALL(AAR SV FILES log4cxx_wms.props DESTINATION bin)
NGL_ADD_TARGET_LINK(svcWarehouseManagement pWMS)
@@ -43,8 +43,8 @@ NGL_TARGET_LINK_LIBRARIES(svcWirelessLocationSystem
Qt6::Network
Qt6::WebSockets
svcCoreClient
svcIsmClient
ddsconnector
$<IF:$<TARGET_EXISTS:svcIsmClient>,svcIsmClient,>
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
SfmConverter
LtsCommandLineParser
LtsCoordTrans
@@ -4,7 +4,7 @@
#pragma once
#include <QtCore/QObject>
#include <QQueue>
#include <QtCore/QQueue>
#include <QtWebSockets/QWebSocketServer>
#include <memory>
#include <TrainingAreaBase/training_area_telegrams.h>
@@ -5,7 +5,7 @@
#include <QtCore/QByteArray>
#include <QtCore/QObject>
#include <QQueue>
#include <QtCore/QQueue>
#include <QStringBuilder>
#include <QtCore/QTimer>