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
@@ -6,7 +6,7 @@
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
|
||||
#include <QSettings>
|
||||
#include <QtCore/QSettings>
|
||||
|
||||
namespace ServiceMonitor
|
||||
{
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL { class Settings; }
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <Common/logger.h>
|
||||
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace ServiceMonitor
|
||||
{
|
||||
|
||||
+4
-4
@@ -7,10 +7,10 @@
|
||||
|
||||
#include <Common/logger.h>
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QJsonValue>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QJsonValue>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace ServiceMonitor
|
||||
{
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
namespace ServiceMonitor
|
||||
{
|
||||
|
||||
+2
-2
@@ -13,8 +13,8 @@
|
||||
#include <Common/logger.h>
|
||||
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <QTreeView>
|
||||
#include <QHeaderView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QtWidgets/QHeaderView>
|
||||
|
||||
namespace ServiceMonitor
|
||||
{
|
||||
|
||||
+5
-5
@@ -12,11 +12,11 @@
|
||||
#include <ProjectDataManagement/pdm_to_string.h>
|
||||
#include <Common/logger.h>
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonValue>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonValue>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace ServiceMonitor
|
||||
{
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
namespace ServiceMonitor
|
||||
{
|
||||
|
||||
+4
-4
@@ -5,10 +5,10 @@
|
||||
|
||||
#include <ProjectDataManagement/pdm_to_string.h>
|
||||
|
||||
#include <QAction>
|
||||
#include <QMenu>
|
||||
#include <QTimer>
|
||||
#include <QTreeView>
|
||||
#include <QtGui/QAction>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsDataView/lts_data_view.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
|
||||
+3
-3
@@ -14,9 +14,9 @@
|
||||
#include <AdvancedSymbology/asb_data_plugin_interface.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <QApplication>
|
||||
#include <QDateTime>
|
||||
#include <QTimer>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <Common/logger.h>
|
||||
#include <Symbology/symbol_data_to_render_role.h>
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
|
||||
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
|
||||
#include <AdvancedSymbology/Helper/table_model_symbol_renderer.h>
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
class QTimer;
|
||||
namespace ServiceMonitor
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
|
||||
#include <ProjectDataManagement/pdm_to_string.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <QMenu>
|
||||
#include <QAction>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtGui/QAction>
|
||||
|
||||
namespace LtsDataView
|
||||
{
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
|
||||
#include <QMenu>
|
||||
#include <QAction>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtGui/QAction>
|
||||
|
||||
|
||||
namespace LtsDataView
|
||||
|
||||
+3
-3
@@ -11,10 +11,10 @@
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <QTreeView>
|
||||
#include <QMenu>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QWidgetAction>
|
||||
#include <QLabel>
|
||||
#include <QtWidgets/QLabel>
|
||||
|
||||
#include <Common/PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <Plugins/Buildings/bld_data_plugin_interface.h>
|
||||
|
||||
+3
-3
@@ -17,9 +17,9 @@
|
||||
#include <InfrastructureManagement/ism_data_plugin_interface.h>
|
||||
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonArray>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QSpacerItem>
|
||||
|
||||
namespace ServiceMonitor
|
||||
|
||||
+6
-6
@@ -12,12 +12,12 @@
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QAction>
|
||||
#include <QPainter>
|
||||
#include <QTextDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtGui/QAction>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QTextDocument>
|
||||
|
||||
|
||||
namespace ServiceMonitor
|
||||
|
||||
+3
-3
@@ -9,9 +9,9 @@
|
||||
#include <Plugins/Buildings/bld_data_plugin_interface.h>
|
||||
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
|
||||
|
||||
#include <QSet>
|
||||
#include <QMenu>
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
|
||||
#include <nglwidgets/ngltreemodel.h>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <Common/logger.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace ServiceMonitor
|
||||
{
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
#include <Common/logger.h>
|
||||
|
||||
namespace ServiceMonitor
|
||||
|
||||
+3
-3
@@ -7,9 +7,9 @@
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <FileManagement/flm_translation.h>
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
|
||||
namespace ServiceMonitor
|
||||
|
||||
+3
-3
@@ -15,9 +15,9 @@
|
||||
#include <InfrastructureManagement/ism_data_plugin_interface.h>
|
||||
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonArray>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
namespace ServiceMonitor
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user