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

@@ -60,7 +60,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOssCommon
Qt6::Core
svcMsgCommon
ngldb
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
)
NGL_INSTALL_TARGET(svcOssCommon)
@@ -84,7 +84,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOssClient
NGL_TARGET_LINK_LIBRARIES(svcOssClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcOssCommon
ddsftc
@@ -110,7 +110,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcOssServer
NGL_TARGET_LINK_LIBRARIES(svcOssServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcOssCommon
@@ -176,7 +176,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOcSituationServer
svcMsgClient
svcPpmClient
svcTabClient
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser
@@ -7,11 +7,11 @@
*/
#pragma once
#include <QQueue>
#include <QtCore/QQueue>
#include "oc_situation.h"
#include <QObject>
#include <QtCore/QObject>
#include "logger.h"
#include <QMutex>
#include <QtCore/QMutex>
#include <QMutexLocker>
#include "central_aes_data_builder.h"
@@ -9,7 +9,7 @@
#include "handler_oc_aes_data.h"
#include <functional>
#include <QByteArray>
#include <QtCore/QByteArray>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsUtilsCore/qbytearray_byteaccess.h>
@@ -7,10 +7,10 @@
*/
#pragma once
#include <QObject>
#include <QTimer>
#include <QMap>
#include <QSet>
#include <QtCore/QObject>
#include <QtCore/QTimer>
#include <QtCore/QMap>
#include <QtCore/QSet>
#include <functional>
#include "main_handler.h"
@@ -14,9 +14,9 @@
#include <LtsUtilsCore/outdated_position.h>
#include <ParticipantManagement/ppm_common.h>
#include "settings.h"
#include <QLineF>
#include <QtCore/QLineF>
#include "central_aes_data_queue.h"
#include <QMultiMap>
#include <QtCore/QMultiMap>
namespace OcSituationServer
{
@@ -7,13 +7,13 @@
*/
#pragma once
#include <QMutex>
#include <QObject>
#include <QTimer>
#include <QThread>
#include <QVector>
#include <QPolygonF>
#include <QSet>
#include <QtCore/QMutex>
#include <QtCore/QObject>
#include <QtCore/QTimer>
#include <QtCore/QThread>
#include <QtCore/QVector>
#include <QtGui/QPolygonF>
#include <QtCore/QSet>
#include <AreaEffectSimulation/aes_dtc.h>
#include <ParticipantManagement/ppm_dtc.h>
@@ -10,9 +10,9 @@
#include "main_handler.h"
#include "logger.h"
#include <QMap>
#include <QMutex>
#include <QTimer>
#include <QtCore/QMap>
#include <QtCore/QMutex>
#include <QtCore/QTimer>
namespace OcSituationServer
{
@@ -7,14 +7,14 @@
*/
#pragma once
#include <QMap>
#include <QMutex>
#include <QObject>
#include <QPair>
#include <QSet>
#include <QTimer>
#include <QThread>
#include <QVector>
#include <QtCore/QMap>
#include <QtCore/QMutex>
#include <QtCore/QObject>
#include <QtCore/QPair>
#include <QtCore/QSet>
#include <QtCore/QTimer>
#include <QtCore/QThread>
#include <QtCore/QVector>
#include <AreaEffectSimulation/aes_dtc.h>
#include <ParticipantManagement/ppm_dtc.h>
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <memory>
#include <AreaEffectSimulation/aes_dtc.h>
@@ -10,7 +10,7 @@
#include <AssetManagement/asm_dtc.h>
#include <ExerciseManagement/exm_dtc.h>
#include <QMutex>
#include <QtCore/QMutex>
namespace OcSituationServer
{
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{