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
+4
-4
@@ -4,14 +4,14 @@
|
||||
#include "org_chart_main.h"
|
||||
#include <utility>
|
||||
#include "ui_org_chart_main.h"
|
||||
#include <QBuffer>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <AdvancedSymbology/asb_data_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsWidgets/lts_drag_icon.h>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <ParticipantManagement/Gui/Common/participant_edit_item.h>
|
||||
#include <Symbology/symbol_data_to_render_role.h>
|
||||
|
||||
|
||||
+1
-1
@@ -22,7 +22,7 @@
|
||||
#endif
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
#include <QPointer>
|
||||
#include <QtCore/QPointer>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "org_chart_main_helper.h"
|
||||
|
||||
#include <QBuffer>
|
||||
#include <QtCore/QBuffer>
|
||||
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
+3
-3
@@ -12,9 +12,9 @@
|
||||
|
||||
#include <LtsWidgets/lts_drag_icon.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -6,10 +6,10 @@
|
||||
|
||||
#include <Symbology/symbol_data_to_render_role.h>
|
||||
|
||||
#include <QFile>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtWebEngine/QtWebEngine>
|
||||
#include <QtWebEngineWidgets/QWebEnginePage>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
#include <participant_org_chart_helper.h>
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtWebChannel/QWebChannel>
|
||||
|
||||
#include <ppmcommon_export.h>
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <AdvancedSymbology/asb_data_plugin_interface.h>
|
||||
|
||||
|
||||
#include <QPointer>
|
||||
#include <QtCore/QPointer>
|
||||
|
||||
|
||||
namespace Ui
|
||||
|
||||
+3
-3
@@ -3,9 +3,9 @@
|
||||
|
||||
#include "participant_org_chart_helper.h"
|
||||
|
||||
#include <QBuffer>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <AdvancedSymbology/asb_data_plugin_interface.h>
|
||||
#include <Symbology/bulk_renderer.h>
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user