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

@@ -18,6 +18,7 @@ SET(SRCS
logger.h
)
set(CMAKE_AUTOMOC ON)
NGL_ADD_LIBRARY(AAR SV cesPluginTargetAreas MODULE ${SRCS})
NGL_INSTALL_TARGET(cesPluginTargetAreas)
NGL_TARGET_LINK_LIBRARIES(cesPluginTargetAreas
@@ -27,8 +28,8 @@ NGL_TARGET_LINK_LIBRARIES(cesPluginTargetAreas
cesPluginInterface
svcPpmClient
svcTabClient
ddsconnector
ddscore
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
LtsCoordTrans
svcCoreClient
)
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/core_dtc.h>
#include <DDS/Core/topic_lock_master.h>
@@ -11,8 +11,8 @@
#include <ParticipantManagement/ppm_common.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QLineF>
#include <QDateTime>
#include <QtCore/QLineF>
#include <QtCore/QDateTime>
namespace TargetAreas
@@ -8,7 +8,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
//#include <CentralEffectSimulation/dds_handler.h>
#include "logger.h"
@@ -8,7 +8,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <DDS/DDSConnector/dds_connector.h>
#include <CentralEffectSimulation/ces_plugin_interface.h>
#include <NGLLogger/INGLLogger.h>
@@ -19,8 +19,7 @@ namespace TargetAreas
class TargetAreasPlugin : public QObject, public CentralEffectSimulation::Plugin::Plugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "special:3:ces.TargetAreasPlugin")
Q_INTERFACES(CentralEffectSimulation::Plugin::Plugin)
Q_PLUGIN_METADATA(IID "special:3:ces")
public:
TargetAreasPlugin() = default;
@@ -11,8 +11,8 @@
#define TARGETTIMER_H
#include <QObject>
#include <QTimer>
#include <QtCore/QObject>
#include <QtCore/QTimer>
class TargetTimer: public QObject
{