lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 migration: Fix BUILD_RTI=OFF build errors in TrainingAreaBase

Browse Source 
- 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 2026-08-23 20:49:23 +02:00
1 parent 3d3c3b48fe
commit 7a6be7474e
2839 files changed
+6495 -6513
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_cnr_json_helper.cpp
+3 -3
View File
@@ -6,9 +6,9 @@
#include <AudioVideoManagement/avm_dtc.h>
#include <QJsonArray>
#include <QJsonObject>
#include <QJsonDocument>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonDocument>
#include <FileManagement/flm_translation.h>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include <LtsSession/lts_session.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <QTreeView>
#include <QtWidgets/QTreeView>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_combat_net_radio_dialog_model.cpp
+3 -3
View File
@@ -7,9 +7,9 @@
#include <AudioVideoManagement/avm_ftc.h>
#include <LtsSession/lts_session_data.h>
#include <ParticipantManagement/ppm_translation.h>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <utility>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.cpp
+4 -4
View File
@@ -11,10 +11,10 @@
#include <LtsSession/lts_session_data.h>
#include <ParticipantManagement/ppm_translation.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <QJsonDocument>
#include <QJsonObject>
#include <QStandardItemModel>
#include <QTimer>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtGui/QStandardItemModel>
#include <QtCore/QTimer>
#include <utility>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_edit_combat_net_radio_dialog.h
+2 -2
View File
@@ -10,8 +10,8 @@
#include <LtsWidgets/lts_dialog.h>
#include <ParticipantManagement/ppm.hpp>
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
#include <QString>
#include <QVector>
#include <QtCore/QString>
#include <QtCore/QVector>
#include <boost/optional.hpp>
#include <memory>
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/CombatNetRadioConfiguration/avm_load_combat_net_radio_dialog_model.cpp
+3 -3
View File
@@ -12,9 +12,9 @@
#include <LtsSession/lts_session.h>
#include <LtsSession/lts_session_data.h>
#include <ParticipantManagement/ppm_translation.h>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_dialog.cpp
+1 -1
View File
@@ -18,7 +18,7 @@
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_translation.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <QTreeView>
#include <QtWidgets/QTreeView>
#include <ngltools/ngltools_dtg.h>
#include <utility>
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.cpp
+4 -4
View File
@@ -9,10 +9,10 @@
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_translation.h>
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QPainter>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtGui/QPainter>
#include <nglwidgets/ngltreeitem.h>
#include <utility>
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_frequency_data_model.h
+1 -1
View File
@@ -7,7 +7,7 @@
#include <AudioVideoManagement/logger.h>
#include "avm_frequency_planning_helper.h"
#include <nglwidgets/ngltreemodel.h>
#include <QStyledItemDelegate>
#include <QtWidgets/QStyledItemDelegate>
namespace ParticipantManagement
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_edit_frequency_planning_resource_dialog.cpp
+2 -2
View File
@@ -24,8 +24,8 @@
#include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
#include <LtsSession/lts_session.h>
#include <QTreeView>
#include <QJsonArray>
#include <QtWidgets/QTreeView>
#include <QtCore/QJsonArray>
namespace
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog.cpp
+2 -2
View File
@@ -16,8 +16,8 @@
#include <LtsWidgets/lts_base_layout_widget.h>
#include <ParticipantManagement/ppm.hpp>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <QMessageBox>
#include <QTreeView>
#include <QtWidgets/QMessageBox>
#include <QtWidgets/QTreeView>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_dialog_model.cpp
+3 -3
View File
@@ -3,9 +3,9 @@
#include "avm_frequency_planning_dialog_model.h"
#include <FileManagement/flm_translation.h>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <ngltools/ngltools_dtg.h>
namespace AudioVideoManagement
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_helper.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "avm_frequency_planning_helper.h"
#include <QObject>
#include <QtCore/QObject>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
#include <AudioVideoManagement/avm_translation.h>
#include <InfrastructureManagement/Gui/IsmComboBox/ism_combobox_gui_plugin.h>
#include <LtsWidgets/lts_spinbox.h>
#include <QJsonArray>
#include <QtCore/QJsonArray>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_frequency_planning_widget.h
+1 -1
View File
@@ -2,7 +2,7 @@
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
#include <AudioVideoManagement/avm.hpp>
#include <AudioVideoManagement/avm_dtc.h>
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "ui_avm_load_frequency_planning_dialog.h"
#include "avm_load_frequency_planning_dialog_model.h"
#include <QTreeView>
#include <QtWidgets/QTreeView>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.cpp
+4 -4
View File
@@ -8,10 +8,10 @@
#include <LtsUtilsCore/json_object.h>
#include <ParticipantManagement/ppm_translation.h>
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QPainter>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtGui/QPainter>
#include <nglwidgets/ngltreeitem.h>
#include <utility>
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_load_frequency_planning_dialog_model.h
+1 -1
View File
@@ -7,7 +7,7 @@
#include <AudioVideoManagement/logger.h>
#include "avm_frequency_planning_helper.h"
#include <nglwidgets/ngltreemodel.h>
#include <QStyledItemDelegate>
#include <QtWidgets/QStyledItemDelegate>
namespace ParticipantManagement
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include <LtsUtilsSettings/settings.h>
#include <QJsonArray>
#include <QtCore/QJsonArray>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_hf_widget.h
+1 -1
View File
@@ -3,7 +3,7 @@
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
#include "avm_radio_specifica_widget.h"
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include <AudioVideoManagement/avm_translation.h>
#include <LtsUtilsSettings/settings.h>
#include <QButtonGroup>
#include <QtWidgets/QButtonGroup>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_uhf_widget.h
+1 -1
View File
@@ -3,7 +3,7 @@
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
#include "avm_radio_specifica_widget.h"
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include <AudioVideoManagement/avm_enums.hpp>
#include <AudioVideoManagement/avm_translation.h>
#include <AudioVideoManagement/avm_dtc.h>
#include <QButtonGroup>
#include <QtWidgets/QButtonGroup>
namespace AudioVideoManagement
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_vhf_widget.h
+1 -1
View File
@@ -3,7 +3,7 @@
#pragma once
#include <QWidget>
#include <QtWidgets/QWidget>
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
#include "avm_radio_specifica_widget.h"
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_widget.cpp
+2 -2
View File
@@ -1,7 +1,7 @@
#include "avm_radio_specifica_widget.h"
#include <QSpinBox>
#include <QJsonArray>
#include <QtWidgets/QSpinBox>
#include <QtCore/QJsonArray>
namespace AudioVideoManagement {
RadioSpecificaWidget::RadioSpecificaWidget(QWidget *parent)
qt6-after/qt6-migrated-legatus/Lts/Plugins/AudioVideoManagement/Gui/CombatNetRadio/FrequencyPlanning/avm_radio_specifica_widget.h
+2 -2
View File
@@ -1,7 +1,7 @@
#pragma once
#include <QWidget>
#include <QJsonObject>
#include <QtWidgets/QWidget>
#include <QtCore/QJsonObject>
#include <functional>
class QLabel;