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
@@ -14,10 +14,10 @@
 #include <OperatorManagement/opm_dtc.h>
 #include <AreaEffectSimulation/aes_operator_rights.h>

-#include <QTimer>
-#include <QTest>
-#include <QCryptographicHash>
-#include <QVector>
+#include <QtCore/QTimer>
+#include <QtTest/QTest>
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QVector>

 using namespace OperatorManagement;

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

 #include <LtsWebSocket/reply_message.h>

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

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

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

 #include <OcBaseDownload/WebSocketInterface/json_keys.h>

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

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

 #include "main_handler.h"
 #include "logger.h"
@@ -9,7 +9,7 @@

 #pragma once

-#include <QHash>
+#include <QtCore/QHash>
 #include <OperatorManagement/opm_dts.h>
 #include <OperatorManagement/opm_fts.h>
 #include "logger.h"
@@ -7,7 +7,7 @@
  */
 #pragma once

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

 #include "main_handler.h"
 #include "logger.h"
@@ -7,7 +7,7 @@
  */
 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include "logger.h"
 #include "opm_db.h"

@@ -13,9 +13,9 @@
 #include "object_operator.h"
 #include "handler_group.h"
 #include "opm_db.h"
-#include <QCryptographicHash>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>

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

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

 #include "main_handler.h"
@@ -11,9 +11,9 @@
 #include "main_handler.h"
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
 #include <ngldb/dbtransaction.h>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>

 namespace OperatorManagement
 {
@@ -7,7 +7,7 @@
 #pragma once

 #include <Core/core_types.h>
-#include <QSet>
+#include <QtCore/QSet>

 // Generated
 #include <OperatorManagement/opm_db.h>
@@ -9,11 +9,11 @@

 #include "opm_dtc_impl_custom.h"
 #include <utility>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QVariantList>
-#include <QVector>
+#include <QtCore/QVector>
 #include <DDS/DTC/generic_dtc.h>
 #include <DDS/Generic/generic_data_reader.h>

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

 #include <OperatorManagement/opm_dtc_impl.h>
-#include <QHash>
-#include <QVector>
+#include <QtCore/QHash>
+#include <QtCore/QVector>

 //-------------------------------------------------------------------------------------------------------------
 namespace OperatorManagement
@@ -6,8 +6,8 @@
  */

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

 namespace NGL
 {