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

 #include "aes_convert_mine_area.h"

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

@@ -17,7 +17,7 @@
 #include <ngldb/dbconnection.h>
 #include <ngldb/sql_query_janitor.h>
 #include <QtSql/QSqlError>
-#include <QVariant>
+#include <QtCore/QVariant>


 #include <AreaEffectSimulation/aes_db_structs.h>
@@ -9,8 +9,8 @@

 #include "aes_test_base.h"

-#include <QSqlDriver>
-#include <QSqlDatabase>
+#include <QtSql/QSqlDriver>
+#include <QtSql/QSqlDatabase>
 #include <QtSql/QSqlError>

 #include <AreaEffectSimulation/aes_enums.hpp>
@@ -6,9 +6,9 @@
  */

 #include "aes_test_air_support_impact.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>

 namespace AreaEffectSimulation
 {
@@ -8,7 +8,7 @@
 #include "aes_test_base.h"
 #include <nglapplication/nglcoreapplication.h>
 #include <LtsCommandLineParser/LtsCommandLineParser.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QtTest/QTest>

 namespace AreaEffectSimulation
@@ -10,7 +10,7 @@
 #include <AreaEffectSimulation/aes_ftc.h>
 #include <AreaEffectSimulation/aes_dtc.h>
 #include <AreaEffectSimulation/logger.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <DDS/DDSConnector/dds_connector.h>
 #include <memory>

@@ -6,9 +6,9 @@
  */

 #include "aes_test_bccontamination.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
  */

 #include "aes_test_booby_trap.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
 */

 #include "aes_test_charge_administration.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
  */

 #include "aes_test_danger_area.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
  */

 #include "aes_test_explosion_area.h"
-#include <QCoreApplication>
-#include <QTimer>
-#include <QTest>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>

 namespace AreaEffectSimulation
 {
@@ -7,9 +7,9 @@
  */

 #include "aes_test_explosion_area_bulk.h"
-#include <QCoreApplication>
-#include <QTimer>
-#include <QTest>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>

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

 #include "aes_test_explosion_cluster.h"
 #include <ProjectDataManagement/pdm.hpp>
-#include <QCoreApplication>
-#include <QTimer>
-#include <QTest>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
  */

 #include "aes_test_explosion_single.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
  */

 #include "aes_test_gas_pipe.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>

 namespace AreaEffectSimulation
 {
@@ -9,7 +9,7 @@

 #include "aes_test_base.h"
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
+#include <QtCore/QPointF>

 namespace AreaEffectSimulation
 {
@@ -8,10 +8,10 @@
 #include "aes_test_mine_area.h"
 #include "Utils/polygons.h"
 #include "qjsonobject.h"
-#include <QCoreApplication>
-#include <QJsonDocument>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QJsonDocument>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>
 #include <LtsCoordTrans/lts_coord_trans.h>

 namespace AreaEffectSimulation
@@ -6,9 +6,9 @@
  */

 #include "aes_test_ncontamination.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>

 namespace AreaEffectSimulation
 {
@@ -6,9 +6,9 @@
  */

 #include "aes_test_off_route_mine.h"
-#include <QCoreApplication>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>

 namespace AreaEffectSimulation
 {