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
@@ -7,7 +7,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <ProjectDataManagement/pdm_to_string.h>
|
||||
#include <QComboBox>
|
||||
#include <QtWidgets/QComboBox>
|
||||
|
||||
namespace Buildings
|
||||
{
|
||||
|
||||
+6
-6
@@ -18,17 +18,17 @@
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <ProjectDataManagement/pdm_data_plugin_interface.h>
|
||||
#include <ProjectDataManagement/pdm_translation.h>
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QPainterPath>
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QTextDocument>
|
||||
#include <QTimer>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
#include <QtGui/QTextDocument>
|
||||
#include <QtCore/QTimer>
|
||||
#include <ServiceMonitor/smo_operator_rights.h>
|
||||
#include <utility>
|
||||
|
||||
#ifdef PP_TEST
|
||||
#include <QDebug>
|
||||
#include <QMenu>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtWidgets/QMenu>
|
||||
#endif
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
#include <InfrastructureManagement/ism.hpp>
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
#include <QMap>
|
||||
#include <QPair>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QPair>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
|
||||
|
||||
#include <QShortcut>
|
||||
#include <QtGui/QShortcut>
|
||||
|
||||
|
||||
namespace Buildings
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
|
||||
#include <QPointer>
|
||||
#include <QtCore/QPointer>
|
||||
|
||||
|
||||
class QShortcut;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
#include <memory>
|
||||
|
||||
enum class DataModification;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <Buildings/bld_dtc.h>
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
|
||||
namespace Buildings
|
||||
{
|
||||
|
||||
+2
-2
@@ -13,8 +13,8 @@
|
||||
#include <AssetManagement/asm_data_plugin_interface.h>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
namespace Buildings
|
||||
{
|
||||
|
||||
+5
-5
@@ -13,12 +13,12 @@
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
|
||||
|
||||
#include <QNetworkReply>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtNetwork/QNetworkReply>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QEventLoop>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace Buildings
|
||||
{
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
|
||||
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QtNetwork/QNetworkAccessManager>
|
||||
|
||||
class QTimer;
|
||||
class QUrl;
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <ServiceMonitor/smo_monitors_gui_plugin_interface.h>
|
||||
|
||||
namespace Buildings
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
#include <Buildings/bld_enums.hpp>
|
||||
#include <Buildings/logger.h>
|
||||
#include <InfrastructureManagement/ism_enums.hpp>
|
||||
#include <QDateTime>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
namespace Buildings
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user