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

@@ -21,8 +21,8 @@
#include <Proxies/Buildings/bld_dtc.h>
#include <Proxies/Buildings/bld.hpp>
#include <QObject>
#include <QMap>
#include <QtCore/QObject>
#include <QtCore/QMap>
namespace ReportManagement
{
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "handler_dynamic_participant_data.h"
@@ -41,10 +41,10 @@ NGL_TARGET_LINK_LIBRARIES(svcRepCommon
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
ngldb
svcPdmCommon
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,>
LtsUtilsCoreHeaderOnly
)
NGL_INSTALL_TARGET(svcRepCommon)
@@ -68,7 +68,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcRepClient
NGL_TARGET_LINK_LIBRARIES(svcRepClient
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
PUBLIC
svcRepCommon
ddsftc
@@ -94,7 +94,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcRepServer
NGL_TARGET_LINK_LIBRARIES(svcRepServer
PRIVATE
RTI::nddscpp2
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
ddsfts
PUBLIC
svcRepCommon
@@ -150,7 +150,7 @@ NGL_TARGET_LINK_LIBRARIES(svcReportAnalyzer
svcCoreClient
svcPdmClient
svcBldClient
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglsettings
ProjectConfig
LtsCommandLineParser
@@ -205,7 +205,7 @@ NGL_TARGET_LINK_LIBRARIES(svcReportGenerator
ngltools
nglsettings
NGLLogger
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
svcCoreClient
svcRepCommonExecutable
svcRepCommon
@@ -11,7 +11,7 @@
#include <ngldb/dbtransaction.h>
#include <ngldb/nsqlquery.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
@@ -12,7 +12,7 @@
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
@@ -11,8 +11,8 @@
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
#include <QVariant>
#include <QSet>
#include <QtCore/QVariant>
#include <QtCore/QSet>
using namespace ReportManagement;
@@ -15,7 +15,7 @@
#include <ProjectDataManagement/pdm.hpp>
#include <QSet>
#include <QtCore/QSet>
#include <QJsonArray>
#include <QJsonObject>
#include <QJsonDocument>
@@ -17,8 +17,8 @@
#include <ParticipantManagement/ppm_dtc.h>
#include <QElapsedTimer>
#include <QMap>
#include <QObject>
#include <QtCore/QMap>
#include <QtCore/QObject>
// ----------------------------------------------------------------------------------------------------------------------
namespace ReportManagement
@@ -17,7 +17,7 @@
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QSet>
#include <QtCore/QSet>
#include <ngldb/nsqlquery.h>
using namespace ReportManagement;
@@ -11,7 +11,7 @@
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
@@ -11,8 +11,8 @@
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
#include <QPair>
#include <QVariant>
#include <QtCore/QPair>
#include <QtCore/QVariant>
using namespace ReportManagement;
@@ -11,7 +11,7 @@
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
@@ -13,7 +13,7 @@
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QtCore/qmath.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
@@ -12,7 +12,7 @@
#include <ngldb/dbtransaction.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
@@ -12,7 +12,7 @@
#include <ngldb/dbtransaction.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QVariant>
#include <QtCore/QVariant>
#include <QJsonDocument>
using namespace ReportManagement;
@@ -12,9 +12,9 @@
#include <ProjectDataManagement/pdm.hpp>
#include <LtsUtilsCore/dds_vector.h>
#include <QSet>
#include <QVector>
#include <QVariant>
#include <QtCore/QSet>
#include <QtCore/QVector>
#include <QtCore/QVariant>
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
@@ -11,7 +11,7 @@
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "handler_report_data.h"
@@ -13,7 +13,7 @@
#include <QJsonObject>
#include <QJsonDocument>
#include <QJsonArray>
#include <QSet>
#include <QtCore/QSet>
//------------------------------------------------------------------------------
namespace ReportManagement
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include <DDS/Core/function_reply_object.h>
@@ -28,7 +28,7 @@ IF(BUILD_TESTING AND BUILD_SV)
svcRepCommon
svcRepServer
LtsCommandLineParser
ddsconnector
$<IF:$<TARGET_EXISTS:ddsconnector>,ddsconnector,>
nglcoreapplication
ngldb
nglsettings
@@ -13,7 +13,7 @@
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QTimer>
#include <QtCore/QTimer>
#include <QTest>
@@ -10,7 +10,7 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QTimer>
#include <QtCore/QTimer>
#include <QTest>
#include <ReportManagement/rep_dtc.h>
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
namespace NGL
{