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
@@ -12,7 +12,7 @@

 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
+#include <QtCore/QTimer>

 #include <SituationReplay/srp_dtc.h>

@@ -12,7 +12,7 @@

 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
+#include <QtCore/QTimer>

 #include <SituationReplay/srp_ftc.h>

@@ -10,7 +10,7 @@

 #include <DDS/DTS/generic_dts_impl.h>
 #include <DDS/QosProfile/DDS_DefaultQos.h>
-#include <QVector>
+#include <QtCore/QVector>

 namespace SituationReplay
 {
@@ -13,7 +13,7 @@
 #include <SituationReplay/srp_db.h>

 #include <ngldb/nsqlquery.h>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <NGLLogger/NGLLoggerBootstrap.h>

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

-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include <SituationReplay/srp_fts.h>

@@ -11,7 +11,7 @@
 #include "situationreplaysqlite_export.h"
 #include <SituationReplay/srp_enums.hpp>

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

 #include "logger.h"
@@ -16,12 +16,12 @@
 #include <ngldb/db_service_handler.h>
 #include <ngldb/nsqlquery.h>
 #include <LtsScriptTimeline/track_entry.h>
-#include <QFile>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QFile>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QSet>
-#include <QSqlError>
+#include <QtCore/QSet>
+#include <QtSql/QSqlError>

 namespace SituationReplay
 {
@@ -7,9 +7,9 @@
  */
 #pragma once

-#include <QJsonObject>
-#include <QObject>
-#include <QSqlDatabase>
+#include <QtCore/QJsonObject>
+#include <QtCore/QObject>
+#include <QtSql/QSqlDatabase>
 #include <memory>

 #include "dds_handler.h"
@@ -11,8 +11,8 @@
 #include "db_reader.h"
 #include "logger.h"

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

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

-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include "dds_handler.h"
 #include "db_reader.h"
 #include <Core/core_types.h>
@@ -7,7 +7,7 @@
  */

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

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

 #include "static_publisher.h"
 #include <utility>
-#include <QCryptographicHash>
-#include <QJsonDocument>
-#include <QTimer>
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QTimer>

 #include <DDS/DTS/generic_dts_impl.h>

@@ -8,8 +8,8 @@
 #pragma once

 #include "dds_handler.h"
-#include <QSqlDatabase>
-#include <QObject>
+#include <QtSql/QSqlDatabase>
+#include <QtCore/QObject>
 #include <AssetManagement/asm_dts_types.h>
 #include <ExerciseManagement/exm_dts_types.h>
 #include <FileManagement/flm_dts_types.h>