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

@@ -43,7 +43,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEsmCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
ngldb
NGLLogger
)
@@ -68,7 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEsmClient
NGL_TARGET_LINK_LIBRARIES(svcEsmClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcEsmCommon
ddsftc
@@ -139,7 +139,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEsmServer
NGL_TARGET_LINK_LIBRARIES(svcEsmServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
LtsCoordTrans
ngldb
@@ -155,7 +155,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEsmServer
svcPdmClient
PUBLIC
Qt6::Core
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
NGLLogger
)
NGL_INSTALL_TARGET(svcEsmServer)
@@ -7,7 +7,7 @@
#include "effect_show_effect_cluster.h"
#include <QJsonDocument>
#include <QObject>
#include <QtCore/QObject>
#include "settings.h"
const static int DEFAULT_EFFECT_DURATION = 777777;
@@ -7,7 +7,7 @@
#include "effect_show_mine_area.h"
#include <QLineF>
#include <QtCore/QLineF>
namespace EffectShowManagement
{
@@ -11,7 +11,7 @@
#include <AreaEffectSimulation/aes_dtc.h>
#include <EffectShowManagement/esm_db.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QPointF>
#include <QtCore/QPointF>
namespace EffectShowManagement
{
@@ -10,7 +10,7 @@
#pragma once
#include <TrainingAreaBase/tab_dtc.h>
#include <EffectShowManagement/esm_db.h>
#include <QString>
#include <QtCore/QString>
namespace EffectShowManagement
{
@@ -10,7 +10,7 @@
#include "esm_convert_to_tab.h"
#include <LtsUtilsCore/qbytearray_byteaccess.h>
#include <LtsUtilsCore/dds_vector.h>
#include <QByteArray>
#include <QtCore/QByteArray>
namespace EffectShowManagement
{
@@ -10,7 +10,7 @@
#pragma once
#include <TrainingAreaBase/tab_dtc.h>
#include <MeteoDataManagement/mdm_dtc.h>
#include <QString>
#include <QtCore/QString>
namespace EffectShowManagement
{
@@ -4,7 +4,7 @@
* $HeadURL$
* $Author$
*/
#include <QVector>
#include <QtCore/QVector>
#include "handler_aes_data.h"
#include "object_aes_data.h"
#include "handler_effect_show_vehicle_status.h"
@@ -11,7 +11,7 @@
#include "logger.h"
#include "handler_effect_show.h"
#include <AreaEffectSimulation/aes_dtc.h>
#include <QMap>
#include <QtCore/QMap>
namespace EffectShowManagement
{
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QHash>
#include <QTimer>
#include <QtCore/QHash>
#include <QtCore/QTimer>
#include "dds_handler.h"
#include "initialization.h"
@@ -13,8 +13,8 @@
#include "esm_db.h"
#include "initialization.h"
#include <QTimer>
#include <QCoreApplication>
#include <QtCore/QTimer>
#include <QtCore/QCoreApplication>
namespace EffectShowManagement
{
@@ -7,9 +7,9 @@
*/
#pragma once
#include <QMap>
#include <QQueue>
#include <QObject>
#include <QtCore/QMap>
#include <QtCore/QQueue>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "esm_convert_from_tab.h"
@@ -14,7 +14,7 @@
#include "esm_db.h"
#include "initialization.h"
#include <QCoreApplication>
#include <QtCore/QCoreApplication>
namespace EffectShowManagement
{
@@ -7,9 +7,9 @@
*/
#pragma once
#include <QMap>
#include <QTimer>
#include <QObject>
#include <QtCore/QMap>
#include <QtCore/QTimer>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "esm_convert_from_tab.h"
@@ -8,7 +8,7 @@
#include "dds_handler.h"
#include "logger.h"
#include <QHash>
#include <QtCore/QHash>
#include <MeteoDataManagement/mdm_dtc.h>
namespace EffectShowManagement
@@ -10,7 +10,7 @@
#include "dds_handler.h"
#include "logger.h"
#include <QHash>
#include <QtCore/QHash>
#include <ProjectDataManagement/pdm_dtc.h>
// Project Data Management - Handling for Effect Show Actors
@@ -10,7 +10,7 @@
#include "initialization.h"
#include "logger.h"
#include <QMap>
#include <QtCore/QMap>
#include <ParticipantManagement/ppm_dtc.h>
// Participand Management-Handling for Effect Show Actors
@@ -5,7 +5,7 @@
* $Author$
* Created by hjl, SLSE, 2017-02-20
*/
#include <QVector>
#include <QtCore/QVector>
#include <LtsUtilsCore/dds_vector.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include "initialization.h"
@@ -9,7 +9,7 @@
#include "effect_show_mine_area.h"
#include "initialization.h"
#include <QLineF>
#include <QtCore/QLineF>
namespace EffectShowManagement
{
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "logger.h"
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "esm_convert_to_tab.h"
#include "esm_convert_from_tab.h"
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{