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
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/single_fire_central.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -73,10 +73,10 @@


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


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


@@ -17,8 +17,8 @@
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>


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


 namespace SituationMap
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/single_fire.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -8,7 +8,7 @@
 #include <PluginInterfaces/gui_plugin_interface.h>


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

 #include <sstream>

@@ -7,7 +7,7 @@
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>

 #include <MapObjects/single_fire.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>


@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/virtual_mine.h>
-#include <QObject>
+#include <QtCore/QObject>


 namespace SituationMap
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/polyline.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -14,8 +14,8 @@



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


 namespace SituationMap
@@ -14,8 +14,8 @@



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


 namespace SituationMap
@@ -8,9 +8,9 @@
 #include <Map/object_factory.h>


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


 namespace SituationMap
@@ -15,9 +15,9 @@


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

 namespace SituationMap
@@ -11,7 +11,7 @@
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
 #include <ProjectDataManagement/pdm_dtc.h>

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

 #define ADD_UNIQUE_MAP_ID_TO_NOTIFIY(uniqueMapId) addUniqueMapIdToNotifiy(uniqueMapId, __FILE__, __LINE__)

@@ -7,7 +7,7 @@
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <FilterManagement/flt_data_plugin_aes_display_filter.h>
 #include <MapObjects/area_fire.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/danger_area.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/participant.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -6,8 +6,8 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/area_fire.h>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>

 namespace SituationMap
 {
@@ -9,9 +9,9 @@
 #include <Common/LtsAppDescriptor/lts_app_descriptor.h>


-#include <QDateTime>
-#include <QPainter>
-#include <QDebug>
+#include <QtCore/QDateTime>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>

 #include <sstream>

@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/area_fire.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -6,8 +6,8 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/area_fire.h>
-#include <QSet>
-#include <QTimer>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>

 namespace SituationMap
 {
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/single_fire.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -9,7 +9,7 @@
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/functional_area.h>

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

 namespace SituationMap
 {
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/polygon.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -12,11 +12,11 @@


 #include <QPolygonF>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QTimer>
+#include <QtCore/QTimer>


 namespace SituationMap
@@ -14,8 +14,8 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>

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


 namespace SituationMap
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/participant.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/mine_field.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/polygon.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -11,11 +11,11 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <InfrastructureManagement/ism_translation.h>

-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QJsonArray>
-#include <QGuiApplication>
+#include <QtCore/QJsonArray>
+#include <QtGui/QGuiApplication>

 #include <sstream>

@@ -18,7 +18,7 @@
 #include <MapObjects/map_object_attributes.h>


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

 namespace SituationMap
 {
@@ -16,8 +16,8 @@
 #include <Common/resource_path.h>


-#include <QUrl>
-#include <QDir>
+#include <QtCore/QUrl>
+#include <QtCore/QDir>


 namespace SituationMap
@@ -10,7 +10,7 @@
 #include <Plugins/Buildings/bld_info_gui_plugin_interface.h> 


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

 #include <sstream>

@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/nuclear_agent.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/virtual_mine.h>
-#include <QObject>
+#include <QtCore/QObject>

 #define OFFROUTEMINE_HAS_SECONDARY_VIEW

@@ -19,11 +19,11 @@
 #include <Symbology/symbol_data_to_render_role.h>
 #include <ProjectDataManagement/pdm_to_string.h>
 #include <ParticipantManagement/ppm_enums.hpp>
-#include <QJsonDocument>
+#include <QtCore/QJsonDocument>


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


 namespace SituationMap
@@ -18,7 +18,7 @@

 #include <MapObjects/participant.h>

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

 namespace SituationMap
 {
@@ -4,8 +4,8 @@
 #include "pdm_handler.h"
 #include <utility>
 #include <ProjectDataManagement/pdm_dtc.h>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>

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

 #pragma once
 #include <Common/situation_map_logging.h>
-#include <QMap>
-#include <QObject>
+#include <QtCore/QMap>
+#include <QtCore/QObject>

 #include <memory> 
 #include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
@@ -4,7 +4,7 @@
 #pragma once

 #include <memory>
-#include <QObject>
+#include <QtCore/QObject>
 #include "sitmapdds_export.h"

 namespace LtsAppDescriptor
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/biological_agent.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <memory>


@@ -3,7 +3,7 @@

 #pragma once

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

 namespace SituationMap
 {
@@ -6,7 +6,7 @@
 #include "sim_to_situation_map_tmpl.h"
 #include <Plugins/TargetManagement/tgt_data_plugin_interface.h>
 #include <MapObjects/polygon.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -26,9 +26,9 @@



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


 const char SimIdProperty[]        = "SimId";
@@ -9,10 +9,10 @@
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <InfrastructureManagement/ism_translation.h>

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

 #include <sstream>

@@ -6,7 +6,7 @@
 #include "sim_to_situation_map_tmpl.h"
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
 #include <MapObjects/polygon.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -6,7 +6,7 @@
 #include "aes_to_situation_map_tmpl.h"
 #include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <MapObjects/polygon.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -6,7 +6,7 @@
 #include "sim_to_situation_map_tmpl.h"
 #include <Plugins/AssetManagement/asm_data_plugin_interface.h>
 #include <MapObjects/polygon.h>
-#include <QObject>
+#include <QtCore/QObject>

 namespace SituationMap
 {
@@ -9,7 +9,7 @@



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

 namespace SituationMap
 {
@@ -12,7 +12,7 @@



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

 class QToolButton;

@@ -10,10 +10,10 @@
 #include <LtsWidgets/lts_column_filter_proxy_model.h>


-#include <QString>
-#include <QBuffer>
-#include <QPainter>
-#include <QGuiApplication>
+#include <QtCore/QString>
+#include <QtCore/QBuffer>
+#include <QtGui/QPainter>
+#include <QtGui/QGuiApplication>


 namespace SituationMap
@@ -22,9 +22,9 @@
 #include <Proxies/Buildings/bld_ftc.h>


-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QItemSelection>
-#include <QGridLayout>
+#include <QtWidgets/QGridLayout>
 #include <LtsWidgets/lts_column_filter_proxy_model.h>


@@ -18,8 +18,8 @@
 #include <ServiceMonitor/Gui/Monitors/smo_check_button_handler.h>


-#include <QPointer>
-#include <QDialog>
+#include <QtCore/QPointer>
+#include <QtWidgets/QDialog>



@@ -7,10 +7,10 @@
 #include <TopicEditorBase/topic_preview_widget.h>
 #include <TopicEditorBase/topic_previewer.h>

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


 namespace SituationMap
@@ -9,7 +9,7 @@
 #include <ngltools/ngltools_dtg.h>


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

 namespace SituationMap
 {
@@ -5,7 +5,7 @@

 #include <Common/situation_map_logging.h>
 #include <Map/map.h>
-#include <QAbstractTableModel>
+#include <QtCore/QAbstractTableModel>

 #include <LtsSession/lts_session.h>

@@ -7,7 +7,7 @@
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_manager.h>
 #include <LtsSession/lts_session_data.h>
-#include <QPointer>
+#include <QtCore/QPointer>

 #include <AreaEffectSimulation/aes_data_plugin_interface.h>
 #include <AreaEffectSimulation/aes_info_gui_plugin_interface.h>
@@ -60,14 +60,14 @@
 #include <MathUtils/simple_helper.h>
 #include <MathUtils/math_const.h>

-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <QLocale>
-#include <QLayout>
-#include <QFormLayout>
-#include <QJsonDocument>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QFormLayout>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
-#include <QUuid>
-#include <QIcon>
+#include <QtCore/QUuid>
+#include <QtGui/QIcon>

 #include <math.h>

@@ -85,7 +85,7 @@ static QString viewshedSvcName() { return QStringLiteral("Viewshed"); }
 #include "MapObjectSelection/map_object_selection_widget.h"
 #include "viewshed_dialog.h"

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



@@ -32,7 +32,7 @@
 #include <Rubberbands/rubberband_factory.h>

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


 namespace SituationMap
@@ -7,8 +7,8 @@
 #include <FilterManagement/Gui/FilterChange/flt_filter_change.h>
 #include <LtsUtilsSettings/settings.h>

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

 namespace SituationMap
 {
@@ -8,7 +8,7 @@
 #include <OperatorManagement/opm_data_plugin_interface.h>


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


 namespace OperatorManagement
@@ -11,7 +11,7 @@
 #include <LtsUtilsSettings/settings.h>


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

 namespace SituationMap
 {
@@ -5,10 +5,10 @@
 #include <utility>
 #include "situation_map_init_p.h"

-#include <QCoreApplication>
-#include <QMenu>
-#include <QFile>
-#include <QDir>
+#include <QtCore/QCoreApplication>
+#include <QtWidgets/QMenu>
+#include <QtCore/QFile>
+#include <QtCore/QDir>
 #include <QJsonParseError>

 #include <ngltools/ngltools_filesystem.h>
@@ -3,8 +3,8 @@

 #pragma once

-#include <QObject>
-#include <QPointer>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 #include <SituationMap/Common/situation_map_logging.h>

 namespace LtsSession
@@ -5,12 +5,12 @@

 #include <LtsWidgets/lts_dialog.h>

-#include <QFormLayout>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QLineEdit>
-#include <QDoubleValidator>
-#include <QSlider>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtGui/QDoubleValidator>
+#include <QtWidgets/QSlider>


 class ViewshedDialog : public LtsWidgets::LtsDialog