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
@@ -9,7 +9,7 @@
 #include <AreaEffectSimulation/aes.hpp>
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>

-#include <QWidget>
+#include <QtWidgets/QWidget>

 namespace Ui {
 class AesChargeEffectItemInfo;
@@ -9,7 +9,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <memory>
 #include <utility>

@@ -8,7 +8,7 @@
 #include <GuezNasat/gna_dtc.h>
 #include <ParticipantManagement/ppm.hpp>
 #include <LtsSession/lts_session.h>
-#include <QSortFilterProxyModel>
+#include <QtCore/QSortFilterProxyModel>

 namespace AreaEffectSimulation
 {
@@ -7,7 +7,7 @@
 #include <Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.h>
 #include <LtsSession/lts_session.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>

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

 #pragma once

-#include <QSet>
+#include <QtCore/QSet>
 #include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <ProjectDataManagement/pdm_enums.hpp>

@@ -4,7 +4,7 @@
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
 #include <LtsSession/lts_session.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <AreaEffectSimulation/aes_translation.h>
 #include <ParticipantManagement/ppm_translation.h>

@@ -10,8 +10,8 @@
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
-#include <QJsonDocument>
-#include <QSpinBox>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QSpinBox>

 namespace AreaEffectSimulation
 {
@@ -13,8 +13,8 @@
 #include <AreaEffectSimulation/logger.h>
 #include <ProjectDataManagement/pdm_translation.h>

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

 #include <LtsWidgets/lts_abstract_table_model.h>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>
@@ -11,10 +11,10 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
-#include <QCheckBox>
-#include <QJsonDocument>
-#include <QKeyEvent>
-#include <QTreeView>
+#include <QtWidgets/QCheckBox>
+#include <QtCore/QJsonDocument>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QTreeView>
 #include <Viewer/LtsDataView/lts_data_view.h>

 static const auto ADLER_BTN = LtsWidgets::DialogButton::Export;
@@ -3,7 +3,7 @@

 #pragma once

-#include <QLabel>
+#include <QtWidgets/QLabel>
 #include <QPolygonF>
 #include "aes_base_exports.h"
 #include <AreaEffectSimulation/aes_enums.hpp>
@@ -12,9 +12,9 @@
 #include <LtsWidgets/lts_message_dialog.h>
 #include <FileManagement/flm_translation.h>

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

 namespace AreaEffectSimulation
 {
@@ -7,9 +7,9 @@
 #include <LtsSession/lts_session_data.h>
 #include <FileManagement/flm_translation.h>

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

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

 #include "aes_charge_administration_model.h"

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


 namespace AreaEffectSimulation
@@ -2,7 +2,7 @@

 #pragma once

-#include <QWidget>
+#include <QtWidgets/QWidget>

 #include <Viewer/LtsDataView/abstract_display_widget.h>

@@ -13,8 +13,8 @@
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
-#include <QInputDialog>
-#include <QTreeView>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QTreeView>

 namespace AreaEffectSimulation
 {
@@ -15,8 +15,8 @@
 #include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
-#include <QInputDialog>
-#include <QTreeView>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QTreeView>
 #include <utility>

 namespace AreaEffectSimulation
@@ -20,7 +20,7 @@

 #include "aes_charge_effect_edit.h"
 #include "ui_aes_charge_effect_edit.h"
-#include <QDebug>
+#include <QtCore/QDebug>


 namespace AreaEffectSimulation
@@ -3,7 +3,7 @@

 #pragma once

-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <AreaEffectSimulation/aes_enums.hpp>

 namespace Ui {
@@ -12,13 +12,13 @@
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Services/AreaEffectSimulation/Utils/polygons.h>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>
 #include <LtsUtilsSettings/settings.h>

 #include <AdvancedSymbology/asb_data_plugin_interface.h>
 #include <ParticipantManagement/Gui/ParticipantSelection/participant_selection.h>

-#include <QSpinBox>
+#include <QtWidgets/QSpinBox>

 namespace AreaEffectSimulation
 {
@@ -7,7 +7,7 @@
 #include "aes_explosions_edit.h"
 #include "aes_explosions_edit_adler.h"
 #include "aes_explosions_edit_adler_standalone.h"
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <AreaEffectSimulation/aes_operator_rights.h>
 #include <LtsSession/lts_session.h>
 #include <LtsUtilsSettings/settings.h>
@@ -32,13 +32,13 @@

 #include <MathUtils/simple_helper.h>

-#include <QButtonGroup>
-#include <QDateTime>
-#include <QHash>
-#include <QJsonDocument>
-#include <QSpinBox>
-#include <QStandardItem>
-#include <QTimer>
+#include <QtWidgets/QButtonGroup>
+#include <QtCore/QDateTime>
+#include <QtCore/QHash>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QSpinBox>
+#include <QtGui/QStandardItem>
+#include <QtCore/QTimer>

 namespace AreaEffectSimulation
 {
@@ -33,12 +33,12 @@
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 #include <LtsElevation/lts_elevation_manager.h>

-#include <QButtonGroup>
-#include <QDateTime>
-#include <QHash>
-#include <QJsonDocument>
-#include <QSpinBox>
-#include <QTimer>
+#include <QtWidgets/QButtonGroup>
+#include <QtCore/QDateTime>
+#include <QtCore/QHash>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QSpinBox>
+#include <QtCore/QTimer>

 namespace AreaEffectSimulation
 {
@@ -33,12 +33,12 @@

 #include <MathUtils/simple_helper.h>

-#include <QButtonGroup>
-#include <QDateTime>
-#include <QHash>
-#include <QJsonDocument>
-#include <QSpinBox>
-#include <QTimer>
+#include <QtWidgets/QButtonGroup>
+#include <QtCore/QDateTime>
+#include <QtCore/QHash>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QSpinBox>
+#include <QtCore/QTimer>

 namespace AreaEffectSimulation
 {
@@ -3,10 +3,10 @@

 #include "aes_rocket_utility.h"

-#include <QComboBox>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QStandardItemModel>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtGui/QStandardItemModel>

 #include <AreaEffectSimulation/aes.hpp>
 #include <AreaEffectSimulation/Trajectory/trajectory_generator.h>
@@ -4,7 +4,7 @@
 #include "aes_functional_areas_model.h"
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <QLocale>
-#include <QSet>
+#include <QtCore/QSet>
 #include <AreaEffectSimulation/aes_translation.h>

 namespace AreaEffectSimulation
@@ -17,8 +17,8 @@
 #include <LtsCoordTrans/lts_coord_widget.h>
 #include <LtsUtilsSettings/settings.h>

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

 namespace AreaEffectSimulation
 {
@@ -7,7 +7,7 @@
 #include <Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.h>
 #include <LtsSession/lts_session.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>

 namespace AreaEffectSimulation
 {
@@ -7,7 +7,7 @@
 #include <Plugins/AreaEffectSimulation/Gui/Base/InfoView/aes_base_info.h>
 #include <LtsSession/lts_session.h>
 #include <LtsCoordTrans/lts_coord_trans.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>

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

 #pragma once

-#include <QSet>
+#include <QtCore/QSet>
 #include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <ProjectDataManagement/pdm_enums.hpp>

@@ -19,7 +19,7 @@

 #include <LtsCoordTrans/lts_coord_trans.h>

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

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

 #pragma once

-#include <QSet>
+#include <QtCore/QSet>
 #include <Plugins/AreaEffectSimulation/Gui/Base/aes_base_model.h>
 #include <ProjectDataManagement/pdm_enums.hpp>

@@ -4,7 +4,7 @@
 #include "aes_technical_areas_model.h"
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <QLocale>
-#include <QSet>
+#include <QtCore/QSet>

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

 #pragma once

-#include <QSet>
-#include <QVector>
+#include <QtCore/QSet>
+#include <QtCore/QVector>
 #include <AreaEffectSimulation/aes_enums.hpp>

 namespace LtsWidgets