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
+6
-6
@@ -15,12 +15,12 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <ParticipantManagement/logger.h>
|
||||
|
||||
#include <QAction>
|
||||
#include <QHeaderView>
|
||||
#include <QJsonDocument>
|
||||
#include <QTableView>
|
||||
#include <QTimer>
|
||||
#include <QTreeView>
|
||||
#include <QtGui/QAction>
|
||||
#include <QtWidgets/QHeaderView>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtWidgets/QTableView>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
#include <ParticipantManagement/logger.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QSet>
|
||||
#include <QtCore/QSortFilterProxyModel>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+4
-4
@@ -9,10 +9,10 @@
|
||||
#include <ParticipantManagement/Gui/ParticipantTemplates/participant_template_chooser_model.h>
|
||||
#include <ParticipantManagement/ppm_mime_datas.h>
|
||||
|
||||
#include <QMenu>
|
||||
#include <QPainter>
|
||||
#include <QRect>
|
||||
#include <QMouseEvent>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtGui/QMouseEvent>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
#include <QItemDelegate>
|
||||
#include <QtWidgets/QItemDelegate>
|
||||
|
||||
class QSortFilterProxyModel;
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <Symbology/symbol_data_to_render_role.h>
|
||||
|
||||
#include <QMimeData>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@
|
||||
#include <ParticipantManagement/Gui/Common/participant_edit_model.h>
|
||||
#include <ParticipantManagement/Gui/Common/participant_search_modal.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <QMenu>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <Core/core_ftc.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
|
||||
|
||||
Reference in new issue
Block a user