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

@@ -44,7 +44,7 @@ NGL_TARGET_LINK_LIBRARIES(svcObdCommon
PUBLIC
Qt6::Core
ngldb
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
)
NGL_INSTALL_TARGET(svcObdCommon)
@@ -68,7 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcObdClient
NGL_TARGET_LINK_LIBRARIES(svcObdClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcObdCommon
ddsftc
@@ -94,7 +94,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcObdServer
NGL_TARGET_LINK_LIBRARIES(svcObdServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcObdCommon
@@ -158,7 +158,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOcBaseDownload
svcEvlServer
svcExmServer
svcFlmServer
svcIsmServer
$<IF:$<TARGET_EXISTS:svcIsmServer>,svcIsmServer,>
svcMsgServer
svcMrkServer
svcOpmServer
@@ -166,7 +166,7 @@ NGL_TARGET_LINK_LIBRARIES(svcOcBaseDownload
svcFltServer
svcAesServer
svcScmClient
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser
@@ -10,7 +10,7 @@
#include <AssetManagement/asm_db.h>
#include <ExerciseManagement/exm_db.h>
#include <FileManagement/flm_db.h>
#include <Lts/Services/FileManagement/flm_db.h>
#include <InfrastructureManagement/ism_db.h>
#include <ParticipantManagement/ppm_db.h>
#include <OperatorManagement/opm_db.h>
@@ -9,14 +9,14 @@
#pragma once
#include <QtCore/QJsonObject>
#include <QVector>
#include <QtCore/QVector>
#include <DDS/Core/core.hpp>
#include <LtsWebSocket/client_message_factory.h>
#include <LtsWebSocket/client_message.h>
#include <FileManagement/flm_enums.hpp>
#include <include/FileManagement/flm_enums.hpp>
#include "logger.h"
@@ -12,8 +12,8 @@
#include <DDS/Core/core.hpp>
#include <QString>
#include <QMap>
#include <QtCore/QString>
#include <QtCore/QMap>
#include <QtCore/QVector>
#include <QtCore/QJsonObject>
@@ -9,7 +9,7 @@
*/
#include "WebSocketInterface/data_manager.h"
#include <QVector>
#include <QtCore/QVector>
namespace OcBaseDownload
{
@@ -14,7 +14,7 @@
#include <AssetManagement/WebSocketInterface/json_keys.h>
#include <ExerciseManagement/WebSocketInterface/json_keys.h>
#include <FileManagement/WebSocketInterface/json_keys.h>
#include <Lts/Services/FileManagement/WebSocketInterface/json_keys.h>
#include <InfrastructureManagement/WebSocketInterface/json_keys.h>
#include <OperatorManagement/WebSocketInterface/json_keys.h>
#include <ParticipantManagement/WebSocketInterface/json_keys.h>
@@ -13,7 +13,7 @@
#include "data_manager.h"
#include "WebSocketInterface/Messages/client_message.h"
#include <QTimer>
#include <QtCore/QTimer>
namespace OcBaseDownload
{
@@ -8,8 +8,8 @@
*/
#pragma once
#include <QObject>
#include <QString>
#include <QtCore/QObject>
#include <QtCore/QString>
#include <LtsWebSocket/lts_web_socket_client.h>
#include "logger.h"
@@ -14,8 +14,8 @@
#include <ngldb/nsqlquery.h>
#include <ngltools/ngltools_filesystem.h>
#include <QDir>
#include <QFile>
#include <QtCore/QDir>
#include <QtCore/QFile>
#include <QProcess>
#include <QSettings>
@@ -9,7 +9,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <QProcess>
#include "logger.h"
@@ -8,7 +8,7 @@
#include "handler_base_download.h"
#include <QStringList>
#include <QtCore/QStringList>
#include <QSettings>
#include <QSqlDriver>
#include <QSqlField>
@@ -25,7 +25,7 @@
#include <ngltools/ngltools_filesystem.h>
#include <DDS/Core/pacemaker.h>
#include <QUuid>
#include <QDateTime>
#include <QtCore/QDateTime>
#include "copy_database.h"
#include "main_handler.h"
#include "settings.h"
@@ -8,15 +8,15 @@
#pragma once
#include <QElapsedTimer>
#include <QObject>
#include <QtCore/QObject>
#include <QSqlDatabase>
#include <QTimer>
#include <QtCore/QTimer>
// db
#include <AssetManagement/asm_db.h>
#include <Evaluations/evl_db.h>
#include <ExerciseManagement/exm_db.h>
#include <FileManagement/flm_db.h>
#include <Lts/Services/FileManagement/flm_db.h>
#include <InfrastructureManagement/ism_db.h>
#include <Messaging/msg_db.h>
#include <MarkerManagement/mrk_db.h>
@@ -21,8 +21,8 @@
#include <ngltools/ngltools_filesystem.h>
#include "main_handler.h"
#include "settings.h"
#include <QFileInfo>
#include <QDir>
#include <QtCore/QFileInfo>
#include <QtCore/QDir>
namespace OcBaseDownload
{
@@ -10,8 +10,8 @@
// dds
#include <OcBaseDownload/obd_fts.h>
#include <QSqlDatabase>
#include <FileManagement/flm_db.h>
#include <FileManagement/flm_db_impl_custom.h>
#include <Lts/Services/FileManagement/flm_db.h>
#include <Lts/Services/FileManagement/flm_db_impl_custom.h>
#include "WebSocketInterface/Messages/client_message.h"
#include "WebSocketInterface/websocket_interface_handler.h"
#include "pdf_download_socket.h"
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <memory>
#include <ServiceManagement/scm_dtc.h>
@@ -11,7 +11,7 @@
#include <nglsettings/nglsettings_connections.h>
#include <nglsettings/nglsettings_settings.h>
#include <QTimer>
#include <QtCore/QTimer>
namespace OcBaseDownload
{
@@ -9,9 +9,9 @@
#pragma once
#include "logger.h"
#include <QObject>
#include <QtCore/QObject>
#include <QTcpSocket>
#include <QString>
#include <QtCore/QString>
class QTimer;
namespace OcBaseDownload
@@ -8,13 +8,13 @@
#pragma once
#include <QObject>
#include <QString>
#include <QVector>
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QtCore/QVector>
#include <QSqlDatabase>
#include <DBAdministration/exercise_table_generator.h>
#include <FileManagement/flm_db.h>
#include <Lts/Services/FileManagement/flm_db.h>
#include "WebSocketInterface/Messages/client_message.h"
#include "settings.h"
#include "logger.h"
@@ -10,7 +10,7 @@
#include <QtCore/QSettings>
#include <nglsettings/nglsettings_settings.h>
#include <ngltools/ngltools_filesystem.h>
#include <QDir>
#include <QtCore/QDir>
namespace OcBaseDownload
{
class NGLSettingsClass : public NGL::Settings
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{