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
+2
-2
@@ -15,8 +15,8 @@
|
||||
|
||||
#include <Services/EffectShowClient/esc_operator_rights.h>
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QUrlQuery>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QUrlQuery>
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#include <EffectShowManagement/esm_data_plugin_interface.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace LtsNotification
|
||||
{
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <Services/EffectShowClient/esc_dtc.h>
|
||||
#include <Services/EffectShowClient/esc_ftc.h>
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include "esc_smoke_state.h"
|
||||
#include "ui_esc_firing_smoke.h"
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <Services/EffectShowClient/esc_dtc.h>
|
||||
#include <Services/EffectShowClient/esc_ftc.h>
|
||||
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
#include "esc_smoke_state.h"
|
||||
#include "ui_esc_operating_condition.h"
|
||||
|
||||
#include <QStringList>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QTimer>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
namespace EffectShowClient
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include <EffectShowClient/logger.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <Services/EffectShowClient/esc_dtc.h>
|
||||
#include <Services/EffectShowClient/esc_ftc.h>
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "ui_esc_safety_confirmation_widget.h"
|
||||
#include "esc_smoke_state.h"
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace EffectShowClient
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#pragma once
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
#include <Services/EffectShowClient/esc_ftc.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
namespace Ui {
|
||||
class SmokeState;
|
||||
|
||||
Reference in new issue
Block a user