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

 #include "damage_model.h"

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

 namespace HighLevelArchitecture
 {
@@ -5,8 +5,8 @@

 #include <Common/identifierstruct.h>

-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <TacticalStatusStruct.h>
 #include <EntityIdentifierStruct.h>
 #include <DamageStatusEnum32.h>
@@ -6,8 +6,8 @@
 #include "web_socket_interface.h"
 #include "Common/identifierstruct.h"

-#include <QCoreApplication>
-#include <QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTimer>
 #include <Common/settings.h>
 #include <Common/logger.h>
 #include <DDS/Core/pacemaker.h>
@@ -2,7 +2,7 @@

 #pragma once

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

 #include <Common/logger.h>
@@ -29,10 +29,10 @@

 #include <NGSException.h>

-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QPolygonF>
 #include <QTransform>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <LtsCoordTrans/lts_coord_trans.h>
 #include <AreaEffectSimulation/aes_enums.hpp>

@@ -5,10 +5,10 @@
 #include "ws_telegrams.h"
 #include <Common/participantposition.h>

-#include <QObject>
+#include <QtCore/QObject>
 #include <IObserver.h>
-#include <QMap>
-#include <QSet>
+#include <QtCore/QMap>
+#include <QtCore/QSet>
 #include <QTransform>

 #include <ProjectDataManagement/pdm_enums.hpp>
@@ -6,13 +6,13 @@
 #include <Common/logger.h>
 #include <Common/settings.h>

-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QHostInfo>


 #include "RTIVector.h"

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

 namespace HighLevelArchitecture
 {
@@ -2,7 +2,7 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>
 #include "ngs_handler.h"
 #include <Common/logger.h>
@@ -7,11 +7,11 @@
 #include "web_socket_interface.h"
 #include "ws_telegrams.h"

-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>

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

 namespace HighLevelArchitecture
 {
@@ -3,7 +3,7 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <QtWebSockets/QWebSocket>
 #include <QtWebSockets/QWebSocketServer>

@@ -3,8 +3,8 @@

 #include "ws_telegrams.h"

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

 namespace HighLevelArchitecture
 {
@@ -5,8 +5,8 @@

 #include <cstdint>
 #include <exception>
-#include <QJsonObject>
-#include <QString>
+#include <QtCore/QJsonObject>
+#include <QtCore/QString>

 namespace HighLevelArchitecture
 {