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

@@ -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
{