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

 #include "aes_helper.h"

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


 namespace AreaEffectSimulation
@@ -11,11 +11,11 @@
 #include "svcaescommon_export.h"
 #include <math.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QPointF>
-#include <QString>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtCore/QPointF>
+#include <QtCore/QString>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <LtsUtils/dds_bitarray.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include "aes_db.h"
@@ -6,9 +6,9 @@
 */

 #include <QtGlobal>
-#include <QTimer>
-#include <QStringList>
-#include <QVector>
+#include <QtCore/QTimer>
+#include <QtCore/QStringList>
+#include <QtCore/QVector>

 #include <AreaEffectSimulation/logger.h>
 #include <AreaEffectSimulation/settings.h>
@@ -6,10 +6,10 @@
    */

 #include <QtCore>
-#include <QObject>
-#include <QTimer>
-#include <QString>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QString>
+#include <QtCore/QVector>

 #include "../logger.h"

@@ -12,11 +12,11 @@

 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>

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

 #include <iostream>
 #include <cmath>
@@ -12,8 +12,8 @@
 #include "svcaescommon_export.h"
 #include "../logger.h"

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

 #include <iosfwd>

@@ -11,10 +11,10 @@

 #include <AreaEffectSimulation/aes.hpp>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QGuiApplication>
-#include <QIcon>
-#include <QPainter>
-#include <QPixmap>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QIcon>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
 #include <QTransform>

 namespace AreaEffectSimulation
@@ -10,9 +10,9 @@
 #include <AreaEffectSimulation/aes_db_structs.h>
 #include <ProjectDataManagement/pdm_enums.hpp>

-#include <QColor>
+#include <QtGui/QColor>
 #include <QPolygonF>
-#include <QRectF>
+#include <QtCore/QRectF>

 class QPointF;

@@ -12,9 +12,9 @@
 #include "icons.h"
 #include "polygons.h"

-#include <QWidget>
-#include <QLabel>
-#include <QIcon>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QLabel>
+#include <QtGui/QIcon>

 #include <LtsCoordTrans/lts_coord_trans.h>

@@ -10,8 +10,8 @@

 #include "svcaescommon_export.h"

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


 namespace AreaEffectSimulation