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>
This commit is contained in:
torstenandCopilot committed
1 parent
3d3c3b48fe
commit
7a6be7474e
2839 files changed
+6495
-6513
No files matched your search
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+2
-2
@@ -73,10 +73,10 @@
|
||||
|
||||
|
||||
#include <limits>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <functional>
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -17,8 +17,8 @@
|
||||
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
|
||||
|
||||
|
||||
#include <QObject>
|
||||
#include <QPointer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QPointer>
|
||||
|
||||
|
||||
namespace SituationMap
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
|
||||
#include <sstream>
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
|
||||
|
||||
#include <MapObjects/single_fire.h>
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+2
-2
@@ -14,8 +14,8 @@
|
||||
|
||||
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
|
||||
namespace SituationMap
|
||||
|
||||
+2
-2
@@ -14,8 +14,8 @@
|
||||
|
||||
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
|
||||
namespace SituationMap
|
||||
|
||||
+3
-3
@@ -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
|
||||
|
||||
+3
-3
@@ -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
|
||||
|
||||
+1
-1
@@ -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__)
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+2
-2
@@ -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
|
||||
{
|
||||
|
||||
+3
-3
@@ -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>
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+2
-2
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
|
||||
#include <MapObjects/functional_area.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace SituationMap
|
||||
{
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+4
-4
@@ -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
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+4
-4
@@ -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>
|
||||
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include <MapObjects/map_object_attributes.h>
|
||||
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace SituationMap
|
||||
{
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
#include <Common/resource_path.h>
|
||||
|
||||
|
||||
#include <QUrl>
|
||||
#include <QDir>
|
||||
#include <QtCore/QUrl>
|
||||
#include <QtCore/QDir>
|
||||
|
||||
|
||||
namespace SituationMap
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <Plugins/Buildings/bld_info_gui_plugin_interface.h>
|
||||
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
|
||||
#include <sstream>
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
|
||||
#include <MapObjects/participant.h>
|
||||
|
||||
#include <QPointer>
|
||||
#include <QtCore/QPointer>
|
||||
|
||||
namespace SituationMap
|
||||
{
|
||||
|
||||
+2
-2
@@ -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
|
||||
{
|
||||
|
||||
+2
-2
@@ -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>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include "sitmapdds_export.h"
|
||||
|
||||
namespace LtsAppDescriptor
|
||||
|
||||
+1
-1
@@ -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>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace SituationMap
|
||||
{
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+3
-3
@@ -26,9 +26,9 @@
|
||||
|
||||
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include <QVector>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
|
||||
const char SimIdProperty[] = "SimId";
|
||||
|
||||
+3
-3
@@ -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>
|
||||
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace SituationMap
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user