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
@@ -17,8 +17,8 @@
 #include <DDS/DTC/generic_dtc_impl.h>

 #include <QtTest/QTest>
-#include <QVariant>
-#include <QThread>
+#include <QtCore/QVariant>
+#include <QtCore/QThread>



@@ -8,7 +8,7 @@
  */
 #pragma once

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

 // For Topic Exercise
 #include <ServiceManagement/scm_dtc_types.h>
@@ -8,7 +8,7 @@
  */
 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <QSignalSpy>
 #include <ServiceManagement/scm_dts_types.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>
@@ -11,10 +11,10 @@

 #include "main_handler.h"

-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QMap>
-#include <QVector>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QMap>
+#include <QtCore/QVector>

 namespace ServiceManagement
 {
@@ -8,9 +8,9 @@

 #pragma once

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

 #include "logger.h"
 #include "dds_handler.h"
@@ -9,7 +9,7 @@
 #include "licence_handler.h"
 #include <utility>
 #include "dds_handler.h"
-#include <QFile>
+#include <QtCore/QFile>
 #include <LtsLicence/aes_crypt.h>


@@ -10,9 +10,9 @@
 #include "licence_donator.h"
 #include "dds_handler.h"
 #include "logger.h"
-#include <QObject>
-#include <QString>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 #include <LtsLicence/lts_licence.h>


@@ -8,7 +8,7 @@

 #pragma once

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

 #include <ServiceManagement/scm.hpp>

@@ -9,9 +9,9 @@
 #include "service_handler.h"
 #include <utility>

-#include <QCoreApplication>
-#include <QDateTime>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDateTime>
+#include <QtCore/QTimer>

 #include "service.h"
 #include "service_process.h"
@@ -8,8 +8,8 @@

 #pragma once

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

 #include "logger.h"
 #include "service_donator.h"
@@ -6,7 +6,7 @@
  */

 #pragma once
-#include <QString>
+#include <QtCore/QString>

 namespace NGL
 {