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

@@ -45,7 +45,7 @@ NGL_TARGET_LINK_LIBRARIES(svcFlmCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
ngldb
LtsUtilsCore
NGLLogger
@@ -73,7 +73,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcFlmClient
NGL_TARGET_LINK_LIBRARIES(svcFlmClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcFlmCommon
ddsftc
@@ -101,7 +101,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcFlmServer
NGL_TARGET_LINK_LIBRARIES(svcFlmServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcFlmCommon
@@ -179,7 +179,7 @@ NGL_TARGET_LINK_LIBRARIES(svcFileManagement
svcFlmCommon
svcFlmServer
svcFlmClient
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser
@@ -24,7 +24,7 @@ IF(TARGET svcFlmClient AND TARGET svcFlmServer)
Qt6::Test
Qt6::Gui
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
ngldb
nglsettings
@@ -15,19 +15,19 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QTimer>
#include <QDateTime>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QTest>
#include <QSet>
#include <QVector>
#include <QtCore/QSet>
#include <QtCore/QVector>
#include <QJsonObject>
#include <QJsonDocument>
#include <LtsUtilsCore/pgarray.h>
#include <LtsUtilsCore/dds_vector.h>
#include <FileManagement/flm_ftc.h>
#include <FileManagement/flm_dtc.h>
#include <FileManagement/settings.h>
#include <Lts/Services/FileManagement/flm_ftc.h>
#include <include/FileManagement/flm_dtc.h>
#include <Lts/Services/FileManagement/settings.h>
/* ----------------------------------------------------------------------------------
* HOW TO RUN THE TESTS (for example)
@@ -12,16 +12,16 @@
#pragma once
#include <FileManagement/flm_ftc.h>
#include <FileManagement/flm_dtc.h>
#include <FileManagement/flm_db.h>
#include <FileManagement/flm_db_impl_custom.h>
#include <Lts/Services/FileManagement/flm_ftc.h>
#include <include/FileManagement/flm_dtc.h>
#include <Lts/Services/FileManagement/flm_db.h>
#include <Lts/Services/FileManagement/flm_db_impl_custom.h>
#include <FileManagement/flm_ftc_types.h>
#include <DDS/DDSConnector/dds_connector.h>
#include <FileManagement/logger.h>
#include <QPixmap>
#include <Lts/Services/FileManagement/logger.h>
#include <QtGui/QPixmap>
#include <ngldb/db_service_handler.h>
namespace FileManagement
@@ -11,7 +11,7 @@
#include <LtsWebSocket/reply_message.h>
#include <QJsonArray>
#include <QString>
#include <QtCore/QString>
namespace FileManagement
{
@@ -9,7 +9,7 @@
#pragma once
#include <LtsWebSocket/data_manager_base_dl.h>
#include <FileManagement/flm_db.h>
#include <Lts/Services/FileManagement/flm_db.h>
#include "logger.h"
namespace FileManagement
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
#include <OcBaseDownload/WebSocketInterface/json_keys.h>
@@ -10,14 +10,17 @@
#pragma once
#include <FileManagement/flm_db.h>
#include <FileManagement/flm_dts.h>
#include <FileManagement/flm_dtc.h>
#include <FileManagement/flm_fts.h>
#include "logger.h"
namespace FileManagement
{
class MainHandler;
namespace Interface
{
class Dts;
class Fts;
}
class Base : public QObject
{
Q_OBJECT
@@ -7,8 +7,8 @@
*/
#pragma once
#include <FileManagement/flm_db.h>
#include <FileManagement/flm.hpp>
#include <Lts/Services/FileManagement/flm_db.h>
#include <Lts/Services/FileManagement/flm.hpp>
#include <LtsUtilsCore/dds_vector.h>
@@ -9,7 +9,7 @@
#include "flm_db_impl_custom.h"
#include <ngldb/nsqlquery.h>
#include <ngldb/sql_query_janitor.h>
#include <QRegularExpression>
#include <QtCore/QRegularExpression>
namespace FileManagement
{
@@ -7,7 +7,7 @@
*/
#pragma once
#include <FileManagement/flm_db_impl.h>
#include <Lts/Services/FileManagement/flm_db_impl.h>
namespace FileManagement
{
@@ -12,8 +12,8 @@
#include <DDS/DTC/generic_dtc.h>
#include <DDS/Generic/generic_data_reader.h>
#include <QSet>
#include <QVector>
#include <QtCore/QSet>
#include <QtCore/QVector>
#include <unordered_map>
//---------------------------------------------------------------------------------------------------------------------------------------------
@@ -8,7 +8,7 @@
*/
#pragma once
#include <FileManagement/flm_dtc_impl.h>
#include <Lts/Services/FileManagement/flm_dtc_impl.h>
#include <functional>
//-------------------------------------------------------------------------------------------------------------
@@ -14,8 +14,8 @@
#include "flm_db.h"
#include "convert_db_to_dds.h"
#include <QDir>
#include <QFile>
#include <QtCore/QDir>
#include <QtCore/QFile>
//----------------------------------------------------------------------------------------------------------------------------
namespace FileManagement
@@ -9,8 +9,8 @@
#pragma once
#include <QMap>
#include <QVariant>
#include <QtCore/QMap>
#include <QtCore/QVariant>
#include "base.h"
@@ -9,7 +9,7 @@
#pragma once
#include <QMap>
#include <QtCore/QMap>
#include "base.h"
@@ -9,7 +9,7 @@
#pragma once
#include <QMap>
#include <QtCore/QMap>
#include "base.h"
@@ -9,7 +9,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "flm_db.h"
#include "logger.h"
@@ -14,7 +14,7 @@
#include <DDS/Core/function_reply_object.h>
// Generated
#include <FileManagement/flm_db.h>
#include <Lts/Services/FileManagement/flm_db.h>
namespace FileManagement
{
@@ -14,7 +14,7 @@
#include <DDS/Core/function_reply_object.h>
// Generated
#include <FileManagement/flm_db.h>
#include <Lts/Services/FileManagement/flm_db.h>
namespace FileManagement
{
@@ -14,7 +14,7 @@
#include <DDS/Core/function_reply_object.h>
// Generated
#include <FileManagement/flm_db.h>
#include <Lts/Services/FileManagement/flm_db.h>
namespace FileManagement
{
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <tcpserver/tcpserver.h>
#include "logger.h"
@@ -8,8 +8,8 @@
*/
#pragma once
#include <QString>
#include <QPair>
#include <QtCore/QString>
#include <QtCore/QPair>
namespace NGL
{
@@ -11,16 +11,16 @@
#include <QWebSocket>
#include <QWebSocketServer>
#include <QFile>
#include <QtCore/QFile>
#include <QJsonParseError>
#include <QJsonDocument>
#include <QJsonArray>
#include <QJsonObject>
#include <QTemporaryFile>
//#include <QSaveFile>
#include <QDateTime>
#include <QFileInfo>
#include <QDir>
#include <QtCore/QDateTime>
#include <QtCore/QFileInfo>
#include <QtCore/QDir>
#include <QUrlQuery>
#include <QDebug>