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
+2
-2
@@ -6,8 +6,8 @@
|
||||
#include "ui_participant_bite_dialog.h"
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
+3
-3
@@ -15,9 +15,9 @@
|
||||
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
|
||||
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QVector>
|
||||
#include <QGridLayout>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtWidgets/QGridLayout>
|
||||
|
||||
|
||||
namespace Ui {
|
||||
|
||||
+3
-3
@@ -11,9 +11,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;
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "participant_follow_dialog.h"
|
||||
#include "ui_participant_follow_dialog.h"
|
||||
#include <AdvancedSymbology/asb_data_plugin_interface.h>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
namespace Ui {
|
||||
class ParticipantGearRestockCharge;
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include "participant_history_dialog.h"
|
||||
#include "ui_participant_history_dialog.h"
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+5
-5
@@ -30,13 +30,13 @@
|
||||
|
||||
#include <Services/AreaEffectSimulation/Utils/polygons.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QTableWidgetItem>
|
||||
#include <QToolButton>
|
||||
#include <QtWidgets/QToolButton>
|
||||
#include <QTransform>
|
||||
#include <QMenu>
|
||||
#include <QColor>
|
||||
#include <QLabel>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtWidgets/QLabel>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+3
-3
@@ -20,9 +20,9 @@
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <LtsNotification/lts_notification.h>
|
||||
|
||||
#include <QShortcut>
|
||||
#include <QApplication>
|
||||
#include <QDebug>
|
||||
#include <QtGui/QShortcut>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "participant_info_ltd_gear_component.h"
|
||||
|
||||
#include <QTableWidget>
|
||||
#include <QtWidgets/QTableWidget>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
#include <LtsWidgets/lts_led_widget.h>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <ParticipantManagement/logger.h>
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
|
||||
class QTableWidget;
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
|
||||
#include "participant_info_table_add_dialog.h"
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QMenu>
|
||||
#include <QtCore/QSortFilterProxyModel>
|
||||
#include <QtWidgets/QMenu>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
#include <ProjectDataManagement/pdm_to_string.h>
|
||||
#include <ParticipantManagement/logger.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QSet>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "participant_search_dialog.h"
|
||||
#include "ui_participant_search_dialog.h"
|
||||
#include <AdvancedSymbology/asb_data_plugin_interface.h>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
+2
-2
@@ -2,8 +2,8 @@
|
||||
#define FORM1_H
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <QWidget>
|
||||
#include <QMap>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
|
||||
+2
-2
@@ -20,8 +20,8 @@
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
|
||||
#include <QWidget>
|
||||
#include <QButtonGroup>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtWidgets/QButtonGroup>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
|
||||
#include <QApplication>
|
||||
#include <QBuffer>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtCore/QBuffer>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
#include <utility>
|
||||
#include "ui_participant_target_config_dialog.h"
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <QTreeView>
|
||||
#include <QDebug>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include "participant_shootback_area_model.h"
|
||||
|
||||
#include <QItemDelegate>
|
||||
#include <QtWidgets/QItemDelegate>
|
||||
|
||||
namespace Ui {
|
||||
class ParticipantTargetConfigurationDialog;
|
||||
|
||||
Reference in new issue
Block a user