Qt6 migration: Fix BUILD_RTI=OFF build errors in TrainingAreaBase

- training_area_telegrams.cpp: Fixed QJsonObject initializer syntax (Qt6 requires {{}} not ({})) - training_area_telegrams.cpp: Fixed fromJson() methods to access m_* members directly - training_area_telegrams.cpp: Fixed brace mismatches in multiple toJson() methods - training_area_telegrams.h: Changed Header struct to public members for consistency - tx_mixin.cpp: Fixed getEquipmentNumber() template for direct member access - lts_coordinate.cpp: Added missing #include <iomanip> - MIGRATION_STATUS.md: Added migration progress tracking document C++17 constraint enforced due to RTI Connext DDS 7.7.0 incompatibility with C++20+ Build status: BUILD_RTI=OFF successful (0 errors, warnings only) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2026-08-23 20:49:23 +02:00
1 parent 3d3c3b48fe
commit 7a6be7474e
@@ -6,9 +6,9 @@
 #include <DDS/DTS/generic_dts.h>
 #include <DDS/DTS/generic_dts_impl.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QCoreApplication>
-#include <QThread>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QThread>
+#include <QtCore/QTimer>

 namespace Core
 {
@@ -2,8 +2,8 @@

 #include <Core/core_dtc.h>

-#include <QSet>
-#include <QString>
+#include <QtCore/QSet>
+#include <QtCore/QString>


 namespace DDSConnector
@@ -10,7 +10,7 @@
 #include <DDS/Generic/wait_set_handler.h>
 #include <DDS/QosProfile/DDS_DefaultQos.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>

 namespace DDSConnector
 {
@@ -4,7 +4,7 @@

 #include <DDS/Generic/generic_base.h>
 #include <Lts/Common/ProjectConfig/project_defines.h>
-#include <QUrl>
+#include <QtCore/QUrl>
 #include <QtCore/QStringList>
 #include <ddsconnector_export.h>

@@ -6,7 +6,7 @@

 #include <DDS/Generic/generic_data_reader.h>
 #include <DDS/Generic/subscriber_listener.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <dds/core/cond/StatusCondition.hpp>
 #include <dds/core/cond/WaitSet.hpp>

@@ -7,8 +7,8 @@
 #include <DDS/QosProfile/DDS_DefaultQos.h>
 #include <Lts/Common/ProjectConfig/project_defines.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QThread>
-#include <QVariant>
+#include <QtCore/QThread>
+#include <QtCore/QVariant>
 #include <QtTest/QTest>

 DataTopicTests::DataTopicTests() : m_domainParticipantPub(nullptr)
@@ -5,7 +5,7 @@
 #include <DDS/Generic/subscriber_listener.h>
 #include <DdsUnitTests/ddsut_dtc_types.h>
 #include <DdsUnitTests/ddsut_dts_types.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace NGL
 {
@@ -3,7 +3,7 @@
 #pragma once

 #include <DdsUnitTests/ddsut_dtc_types.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <QSignalSpy>

 namespace NGL
@@ -8,9 +8,9 @@
 #include <DdsUnitTests/ddsut.hpp>
 #include <DdsUnitTests/ddsut_ftc_types.h>
 #include <DdsUnitTests/ddsut_fts_types.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <QSignalSpy>
-#include <QThread>
+#include <QtCore/QThread>

 namespace NGL
 {
@@ -8,7 +8,7 @@
 #include <DdsUnitTests/ddsut_dtc_types.h>
 #include <DdsUnitTests/ddsut_dts_types.h>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace NGL
 {
@@ -1,5 +1,5 @@
-#include <QObject>
-#include <QtTest>
+#include <QtCore/QObject>
+#include <QtTest/QtTest>

 class DataTopicSmokeTest : public QObject {
  Q_OBJECT
@@ -1,5 +1,5 @@
-#include <QObject>
-#include <QtTest>
+#include <QtCore/QObject>
+#include <QtTest/QtTest>

 class FunctionTopicSmokeTest : public QObject {
  Q_OBJECT
@@ -1,5 +1,5 @@
-#include <QObject>
-#include <QtTest>
+#include <QtCore/QObject>
+#include <QtTest/QtTest>

 class GenericSmokeTest : public QObject {
  Q_OBJECT
@@ -2,7 +2,7 @@

 #include <ddsftccore_export.h>

-#include <QObject>
+#include <QtCore/QObject>


 class DDSFTCCORE_EXPORT Request2 : public QObject
@@ -10,8 +10,8 @@
 #include <DDS/Generic/generic_logger.h>
 #include <DDS/QosProfile/DDS_DefaultQos.h>
 #include <QMetaMethod>
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include <future>
 #include <queue>

@@ -1,9 +1,9 @@
 #include "generic_ftc_threading.h"

-#include <QAtomicInt>
-#include <QTimer>
+#include <QtCore/QAtomicInt>
+#include <QtCore/QTimer>

-#include <QRegularExpression>
+#include <QtCore/QRegularExpression>

 #include <chrono>
 #include <future>
@@ -2,9 +2,9 @@



-#include <QObject>
-#include <QAtomicInt>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QAtomicInt>
+#include <QtCore/QTimer>

 #include <thread>
 #include <exception>
@@ -6,7 +6,7 @@
 #if BUILD_RTI
 #include <rti/core/SampleIdentity.hpp>
 #endif
-#include <QVector>
+#include <QtCore/QVector>



@@ -12,7 +12,7 @@
 #include <dds/pub/qos/DataWriterQos.hpp>
 #endif

-#include <QObject>
+#include <QtCore/QObject>

 namespace FTS
 {
@@ -4,7 +4,7 @@
 #include "generic_base.h"

 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QMetaMethod>

 namespace DDS
@@ -3,8 +3,8 @@
 #pragma once

 #include <QMetaMethod>
-#include <QObject>
-#include <QReadWriteLock>
+#include <QtCore/QObject>
+#include <QtCore/QReadWriteLock>
 #include <dds/sub/AnyDataReader.hpp>
 #include <dds/sub/SubscriberListener.hpp>
 #include <dds/topic/Topic.hpp>
@@ -3,9 +3,9 @@

 #pragma once

-#include <QObject>
-#include <QMap>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
+#include <QtCore/QString>

 #include <DDS/Generic/topic_description.h>
 #include <Lts/Common/ProjectConfig/project_defines.h>
@@ -3,7 +3,7 @@

 #include "DDS_DefaultQos.h"

-#include <QUrl>
+#include <QtCore/QUrl>

 #include <ngltools/ngltools_filesystem.h>
 #include <NGLLogger/NGLLoggerBootstrap.h>
@@ -3,8 +3,8 @@

 #pragma once

-#include <QStringList>
-#include <QUrl>
+#include <QtCore/QStringList>
+#include <QtCore/QUrl>
 #include <dds/core/QosProvider.hpp>
 #include "ddsqos_export.h"