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

@@ -10,7 +10,7 @@
#include "ParticipantHandling/participant.h"
#include "ParticipantHandling/participant_donator.h"
#include "main_handler.h"
#include <QTimer>
#include <QtCore/QTimer>
namespace ParticipantManagement
{
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QSet>
#include <QMap>
#include <QtCore/QSet>
#include <QtCore/QMap>
#include "dds_handler.h"
#include "logger.h"
@@ -51,9 +51,9 @@ NGL_TARGET_LINK_LIBRARIES(svcPpmCommon
PUBLIC
Qt6::Core
Qt6::Gui
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
svcPdmCommon
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
LtsUtilsCore
LtsCoordTrans
ngldb
@@ -81,7 +81,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcPpmClient
NGL_TARGET_LINK_LIBRARIES(svcPpmClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcPpmCommon
ddsftc
@@ -110,7 +110,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcPpmServer
NGL_TARGET_LINK_LIBRARIES(svcPpmServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcPpmCommon
@@ -265,7 +265,7 @@ NGL_TARGET_LINK_LIBRARIES(svcParticipantManagement
Qt6::Core
Qt6::Concurrent
Qt6::WebSockets
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
LtsCommandLineParser
nglsettings
nglcoreapplication
@@ -11,7 +11,7 @@
#include "main_handler.h"
#include "ParticipantHandling/participant.h"
#include <QTimer>
#include <QtCore/QTimer>
#include <LtsUtilsCore/dds_vector.h>
ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::EquipmentEventHandler(MainHandler *mainHandler, QObject *parent)
@@ -12,7 +12,7 @@
#include <TrainingAreaBase/tab_dtc.h>
#include <QObject>
#include <QtCore/QObject>
#include <ngldb/nsqlquery.h>
namespace ParticipantManagement
@@ -21,7 +21,7 @@ IF(BUILD_TESTING AND TARGET svcPpmClient)
svcPpmClient
svcPpmCommon
LtsCommandLineParser
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
)
IF(NOT BUILD_RPM)
@@ -15,7 +15,7 @@
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QTest>
#include <QTimer>
#include <QtCore/QTimer>
//--------------------------------------------------------------------------------
ParticipantManagement::PpmTests::PpmTests(QObject *parent)
@@ -9,7 +9,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <memory>
#include <DDS/Core/function_reply_object.h>
@@ -13,7 +13,7 @@
#include <ParticipantManagement/web_socket_handler.h>
#include <QSet>
#include <QtCore/QSet>
namespace ParticipantManagement
{
@@ -12,7 +12,7 @@
#include <ParticipantManagement/ppm.hpp>
#include <TrainingAreaBase/tab.hpp>
#include <QMutex>
#include <QtCore/QMutex>
namespace ParticipantManagement
{
@@ -24,8 +24,8 @@
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QTimer>
#include <QVector>
#include <QtCore/QTimer>
#include <QtCore/QVector>
#include <QtGui/QTransform>
namespace ParticipantManagement
@@ -9,12 +9,12 @@
#include "unit_position_calculator.h"
#include "participant_handler.h"
#include <QTimer>
#include <QtCore/QTimer>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsUtilsCore/qpoint3d.h>
#include <LtsUtilsCore/outdated_position.h>
#include <QPointF>
#include <QDateTime>
#include <QtCore/QPointF>
#include <QtCore/QDateTime>
#include <QtConcurrent>
namespace ParticipantManagement
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QObject>
#include <QFutureWatcher>
#include <QtCore/QObject>
#include <QtCore/QFutureWatcher>
#include <Core/core.hpp>
#include <unordered_map>
#include "participant_handler.h"
@@ -11,7 +11,7 @@
#include <TrainingAreaBase/tab_record_replay_plugin_custom.h>
#include <ParticipantManagement/ppm_dts.h>
#include <ParticipantManagement/ParticipantHandling/participant_handler.h>
#include <QFuture>
#include <QtCore/QFuture>
namespace ParticipantManagement
{
@@ -8,7 +8,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include <ParticipantManagement/logger.h>
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "type_handler.h"
#include <ParticipantManagement/ppm.hpp>
@@ -15,7 +15,7 @@
#include <ParticipantManagement/dds_handler.h>
#include "logger.h"
#include <QObject>
#include <QtCore/QObject>
namespace ParticipantManagement
{
namespace UasHandling
@@ -11,7 +11,7 @@
#include <LtsWebSocket/reply_message.h>
#include <QJsonArray>
#include <QString>
#include <QtCore/QString>
namespace ParticipantManagement
{
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
#include <OcBaseDownload/WebSocketInterface/json_keys.h>
@@ -12,7 +12,7 @@
#include <DDS/Core/pacemaker.h>
#include <DDS/DTS/generic_dts_impl.h>
#include <QThread>
#include <QtCore/QThread>
namespace ParticipantManagement
{
@@ -15,7 +15,7 @@
#include <ProjectDataManagement/pdm_dtc.h>
#include "logger.h"
#include <QObject>
#include <QtCore/QObject>
namespace Core
{
@@ -9,7 +9,7 @@
#include "exercise_time.h"
#include "ppm_dts.h"
#include <QDateTime>
#include <QtCore/QDateTime>
#include <DDS/DTS/generic_dts_impl.h>
namespace ParticipantManagement
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QThread>
#include <QTimer>
#include <QtCore/QThread>
#include <QtCore/QTimer>
#include <DDS/Core/core_dts_types.h>
@@ -8,7 +8,7 @@
#include "ppm_common.h"
#include <QVector>
#include <QtCore/QVector>
#include <QDebug>
@@ -15,9 +15,9 @@
#include <QJsonObject>
#include <QJsonParseError>
#include <QPolygonF>
#include <QSet>
#include <QVector>
#include <QtGui/QPolygonF>
#include <QtCore/QSet>
#include <QtCore/QVector>
namespace ParticipantManagement
{
@@ -6,8 +6,8 @@
*/
#pragma once
#include <QString>
#include <QPair>
#include <QtCore/QString>
#include <QtCore/QPair>
namespace NGL
{
@@ -8,7 +8,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <QWebSocketServer>
#include <ParticipantManagement/ppm_common.h>
#include "logger.h"