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:
1 parent
3d3c3b48fe
commit
7a6be7474e
2839 files changed
+6495
-6513
No files matched your search
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
#include "ppmcommon_export.h"
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
#include <memory>
|
||||
#include <Common/participant_dis_type_edit.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
+3
-3
@@ -3,9 +3,9 @@
|
||||
|
||||
#include <Common/participant_beautify_view.h>
|
||||
|
||||
#include <QTreeView>
|
||||
#include <QHeaderView>
|
||||
#include <QModelIndex>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QtWidgets/QHeaderView>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
|
||||
#include <ppmcommon_export.h>
|
||||
|
||||
#include <QString>
|
||||
#include <QRegularExpression>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QRegularExpression>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <Common/participant_dis_helper.h>
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+3
-3
@@ -9,9 +9,9 @@
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
#include <memory>
|
||||
#include <QSet>
|
||||
#include <QMap>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QRegularExpressionValidator>
|
||||
|
||||
class Ui_ParticipantDISTypeEdit;
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
#include <memory>
|
||||
#include <Common/participant_dis_type_edit.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "participant_edit_item.h"
|
||||
#include "ui_participant_edit_item_widget_base.h"
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <QStandardItemModel>
|
||||
#include <QtGui/QStandardItemModel>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <SymbologyGui/symbol_modification_dialog.h>
|
||||
#include <Symbology/sidc_codec.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <QStandardItemModel>
|
||||
#include <QtGui/QStandardItemModel>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
namespace AdvancedSymbology
|
||||
{
|
||||
|
||||
+3
-3
@@ -12,9 +12,9 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include <QTreeView>
|
||||
#include <QHeaderView>
|
||||
#include <QTimer>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QtWidgets/QHeaderView>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QToolTip>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
class QTreeView;
|
||||
|
||||
|
||||
+3
-3
@@ -2,9 +2,9 @@
|
||||
|
||||
#include "participant_firing_unit_validator.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QVariant>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QVariant>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
#include <ppmcommon_export.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
+4
-4
@@ -4,10 +4,10 @@
|
||||
#include "participant_icon_model_base.h"
|
||||
#include <AdvancedSymbology/asb_data_plugin_interface.h>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
#include <QHash>
|
||||
#include <QIcon>
|
||||
#include <QPointer>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtGui/QIcon>
|
||||
#include <QtCore/QPointer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <nglwidgets/ngltreemodel.h>
|
||||
|
||||
#include <QColor>
|
||||
#include <QSharedPointer>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QSharedPointer>
|
||||
|
||||
|
||||
namespace LtsSession
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
#include <ppmcommon_export.h>
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
#include <memory>
|
||||
|
||||
enum class DataModification;
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "ui_participant_edit_item_widget_base.h"
|
||||
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <QStandardItemModel>
|
||||
#include <QtGui/QStandardItemModel>
|
||||
|
||||
#include <LtsSession/lts_session_manager.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <LtsWidgets/lts_dialog_button_box.h>
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include "participant_firing_unit_validator.h"
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#include "participant_time_point_model.h"
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+4
-4
@@ -4,11 +4,11 @@
|
||||
#include "participant_tree_edit_handler.h"
|
||||
#include "participant_edit_model.h"
|
||||
|
||||
#include <QAction>
|
||||
#include <QMenu>
|
||||
#include <QTreeView>
|
||||
#include <QtGui/QAction>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
#include "participant_vulnerability_types.h"
|
||||
#include <ProjectDataManagement/pdm_to_string.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <QComboBox>
|
||||
#include <QDebug>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
#include <ParticipantManagement/ppm_enums.hpp>
|
||||
#include <ppmcommon_export.h>
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
class QComboBox;
|
||||
|
||||
|
||||
Reference in new issue
Block a user