lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/CMakeLists.txt
+4 -4
View File
@@ -44,7 +44,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEscCommon
PUBLIC
Qt6::Core
svcEsmCommon
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
ngldb
NGLLogger
)
@@ -69,7 +69,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEscClient
NGL_TARGET_LINK_LIBRARIES(svcEscClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcEscCommon
ddsftc
@@ -95,7 +95,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcEscServer
NGL_TARGET_LINK_LIBRARIES(svcEscServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
ngldb
PUBLIC
@@ -165,7 +165,7 @@ NGL_TARGET_LINK_LIBRARIES(svcEffectShowClient
svcAsmClient
svcNomClient
svcEsmServer
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include "connection_handler_serial.h"
#include <LtsUtilsCore/sfm_bytemessage_converter.h>
#include <QTimer>
#include <QtCore/QTimer>
namespace EffectShowClient
{
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_serial.h
+2 -2
View File
@@ -11,8 +11,8 @@
#include "logger.h"
#include <LtsSerialPortQuerry/lts_serial_port_querry.h>
#include <QObject>
#include <QTimer>
#include <QtCore/QObject>
#include <QtCore/QTimer>
#include <QSerialPort>
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include "settings.h"
#include <LtsUtilsCore/sfm_bytemessage_converter.h>
#include <QTimer>
#include <QtCore/QTimer>
namespace EffectShowClient
{
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/connection_handler_tcp.h
+1 -1
View File
@@ -8,7 +8,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <QTcpSocket>
#include <LtsUtilsCore/sfm_bytemessage_converter.h>
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/control_unit_handler.h
+2 -2
View File
@@ -11,8 +11,8 @@
#include "logger.h"
#include "handler_vehicle.h"
#include "esc_helper.h"
#include <QObject>
#include <QTimer>
#include <QtCore/QObject>
#include <QtCore/QTimer>
namespace EffectShowClient
{
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_from_tab.h
+1 -1
View File
@@ -10,7 +10,7 @@
#pragma once
#include <TrainingAreaBase/tab_dtc.h>
#include <EffectShowClient/esc_dts.h>
#include <QString>
#include <QtCore/QString>
namespace EffectShowClient
{
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.cpp
+1 -1
View File
@@ -10,7 +10,7 @@
#include "esc_convert_to_tab.h"
#include <LtsUtilsCore/qbytearray_byteaccess.h>
#include <LtsUtilsCore/dds_vector.h>
#include <QByteArray>
#include <QtCore/QByteArray>
namespace EffectShowClient
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_convert_to_tab.h
+1 -1
View File
@@ -10,7 +10,7 @@
#pragma once
#include <TrainingAreaBase/tab_dtc.h>
#include <EffectShowManagement/esm_dtc.h>
#include <QString>
#include <QtCore/QString>
namespace EffectShowClient
{
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/esc_helper.h
+1 -1
View File
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
namespace EffectShowClient
{
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.cpp
+2 -2
View File
@@ -13,8 +13,8 @@
#include "handler_order.h"
#include "handler_vehicle.h"
#include "control_unit_handler.h"
#include <QTimer>
#include <QCoreApplication>
#include <QtCore/QTimer>
#include <QtCore/QCoreApplication>
#include <NGLLogger/NGLLoggerBootstrap.h>
namespace EffectShowClient
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_explosion.h
+2 -2
View File
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QObject>
#include <QMap>
#include <QtCore/QObject>
#include <QtCore/QMap>
#include <EffectShowClient/esc_db.h>
#include "handler_vehicle.h"
#include "dds_handler.h"
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.cpp
+2 -2
View File
@@ -14,8 +14,8 @@
#include "handler_tab_data.h"
#include "handler_order.h"
#include "handler_vehicle.h"
#include <QTimer>
#include <QCoreApplication>
#include <QtCore/QTimer>
#include <QtCore/QCoreApplication>
#include <NGLLogger/NGLLoggerBootstrap.h>
namespace EffectShowClient
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_firing_smoke.h
+2 -2
View File
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QObject>
#include <QMap>
#include <QtCore/QObject>
#include <QtCore/QMap>
#include <EffectShowClient/esc_db.h>
#include "handler_vehicle.h"
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
#include "handler_tab_data.h"
#include <QCoreApplication>
#include <QtCore/QCoreApplication>
#include <NGLLogger/NGLLoggerBootstrap.h>
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_operating_condition.h
+2 -2
View File
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QObject>
#include <QMap>
#include <QtCore/QObject>
#include <QtCore/QMap>
#include "handler_vehicle.h"
#include "dds_handler.h"
#include "control_unit_handler.h"
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
#include "handler_tab_data.h"
#include "handler_vehicle.h"
#include <QCoreApplication>
#include <QtCore/QCoreApplication>
#include <NGLLogger/NGLLoggerBootstrap.h>
namespace EffectShowClient
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_order.h
+2 -2
View File
@@ -7,8 +7,8 @@
*/
#pragma once
#include <QObject>
#include <QMap>
#include <QtCore/QObject>
#include <QtCore/QMap>
#include <EffectShowClient/esc_db.h>
#include "dds_handler.h"
#include "esc_convert_from_tab.h"
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_tab_data.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
* $Author$
* Created by hjl, SLSE, 2017-02-20
*/
#include <QVector>
#include <QtCore/QVector>
#include "main_handler.h"
#include "handler_tab_data.h"
#include "handler_order.h"
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.cpp
+2 -2
View File
@@ -11,9 +11,9 @@
#include "esc_helper.h"
#include "control_unit_handler.h"
#include <QCoreApplication>
#include <QtCore/QCoreApplication>
#include <NGLLogger/NGLLoggerBootstrap.h>
#include <QTimer>
#include <QtCore/QTimer>
namespace EffectShowClient
{
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/handler_vehicle.h
+3 -3
View File
@@ -12,9 +12,9 @@
#include "esc_convert_to_tab.h"
#include "logger.h"
#include "esc_helper.h"
#include <QObject>
#include <QTimer>
#include <QMap>
#include <QtCore/QObject>
#include <QtCore/QTimer>
#include <QtCore/QMap>
namespace EffectShowClient
{
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/main_handler.h
+1 -1
View File
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <memory>
#include "dds_handler.h"
#include <ngldb/db_service_handler.h>
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/object_order.h
+1 -1
View File
@@ -8,7 +8,7 @@
#include "dds_handler.h"
#include "logger.h"
#include <QObject>
#include <QtCore/QObject>
#include <NotificationManagement/nom_ftc.h>
#include <DDS/Core/function_reply_object.h>
qt6-after/qt6-migrated-legatus/Lts/Services/EffectShowClient/settings.h
+1 -1
View File
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{