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 <ngltools/ngltools_dtg.h>
 #include <LtsUtils/dds_vector_to_pixmap.h>

-#include <QFile>
-#include <QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QDebug>


 namespace ExerciseManagement
@@ -17,7 +17,7 @@
 #include <OperatorManagement/opm_operator_rights.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>

-#include <QCloseEvent>
+#include <QtGui/QCloseEvent>


 namespace ExerciseManagement
@@ -3,7 +3,7 @@
 #pragma once


-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <memory>
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>

@@ -4,7 +4,7 @@

 #include <ExerciseManagement/exm_translation.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <utility>

 namespace ExerciseManagement
@@ -5,9 +5,9 @@
 #include <ParticipantManagement/ppm_translation.h>
 #include <ParticipantManagement/ppm.hpp>

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

 namespace ExerciseManagement
 {
@@ -8,8 +8,8 @@

 #include <LtsSession/lts_session_data_dds.h>
 #include <LtsWidgets/lts_checkable_table_model.h>
-#include <QDebug>
-#include <QPair>
+#include <QtCore/QDebug>
+#include <QtCore/QPair>

 namespace ExerciseManagement
 {
@@ -17,11 +17,11 @@
 #include <LtsWidgets/lts_message_dialog.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
-#include <QFile>
-#include <QFileDialog>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QMenu>
+#include <QtCore/QFile>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QMenu>
 #include <Services/FileManagement/flm_ftc.h>
 #include <utility>

@@ -24,8 +24,8 @@
 #include <ExerciseManagement/exm_operator_rights.h>
 #include <LtsUtilsSettings/settings.h>

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


 namespace ExerciseManagement
@@ -9,11 +9,11 @@
 #include <LtsWidgets/lts_message_dialog.h>
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
 #include <Plugins/ExerciseManagement/Data/exm_data_plugin.h>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QListWidget>
-#include <QMenu>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QMenu>

 namespace ExerciseManagement
 {
@@ -9,7 +9,7 @@
 #include <LtsSession/lts_session_data_dds.h>
 #include <LtsWidgets/lts_checkable_table_model.h>

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

 namespace ExerciseManagement
 {
@@ -5,7 +5,7 @@
 #include "ui_exm_operator_edit.h"

 #include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
-#include <QMenu>
+#include <QtWidgets/QMenu>

 namespace ExerciseManagement
 {