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:
torstenandCopilot committed
1 parent
3d3c3b48fe
commit
7a6be7474e
2839 files changed
+6495
-6513
No files matched your search
+1
-1
@@ -1,7 +1,7 @@
|
||||
|
||||
#include "mrk_apply_filter.h"
|
||||
#include <QJsonParseError>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
#include <FilterManagement/flt_data_plugin_aes_display_filter.h>
|
||||
#include <FilterManagement/flt_symbol_appearance_settings.h>
|
||||
|
||||
+3
-3
@@ -14,9 +14,9 @@
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <LtsProjectionWorkstation/lts_projection_workstation.h>
|
||||
#include <QBuffer>
|
||||
#include <QSet>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace MarkerManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -10,9 +10,9 @@
|
||||
#include <Services/MarkerManagement/mrk.hpp>
|
||||
#include <TopicEditorBase/topic_previewer.h>
|
||||
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QModelIndexList>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QtCore/QSortFilterProxyModel>
|
||||
|
||||
|
||||
namespace MarkerManagement
|
||||
|
||||
+4
-4
@@ -16,11 +16,11 @@
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QImage>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtGui/QImage>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
namespace MarkerManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace MarkerManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "mrk_edit_dialog.h"
|
||||
#include "ui_mrk_edit_dialog.h"
|
||||
#include <AudioVideoManagement/stream_name_mapping.h>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QListWidgetItem>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
|
||||
|
||||
+3
-3
@@ -19,10 +19,10 @@
|
||||
#include <LtsAppManager/lts_app_manager.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QJsonParseError>
|
||||
#include <QTimer>
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
namespace MarkerManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
#include <FilterManagement/flt_building_cmpnt_settings.h>
|
||||
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
+4
-4
@@ -25,11 +25,11 @@
|
||||
#include <FilterManagement/flt_data_plugin_aes_display_filter.h>
|
||||
#include <Map/operator_map_settings.h>
|
||||
|
||||
#include <QImage>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtGui/QImage>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QJsonParseError>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
|
||||
#include <QPointer>
|
||||
#include <QtCore/QPointer>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+5
-5
@@ -7,11 +7,11 @@
|
||||
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <QSet>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QBuffer>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace MarkerManagement
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user