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
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "opm_settings_group.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QJsonParseError>
|
||||
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QVector>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QVector>
|
||||
#include <OperatorManagement/logger.h>
|
||||
|
||||
namespace LtsUtils { class OperatorSettings; }
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "operator_settings_create_new_dialog.h"
|
||||
#include "ui_operator_settings_create_new_dialog.h"
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <QComboBox>
|
||||
#include <QtWidgets/QComboBox>
|
||||
|
||||
namespace OperatorManagement
|
||||
{
|
||||
|
||||
+7
-7
@@ -21,13 +21,13 @@
|
||||
#include <OperatorManagement/opm_operator_rights.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
#include <QBrush>
|
||||
#include <QFileDialog>
|
||||
#include <QKeyEvent>
|
||||
#include <QPainter>
|
||||
#include <QPen>
|
||||
#include <QTimer>
|
||||
#include <QUuid>
|
||||
#include <QtGui/QBrush>
|
||||
#include <QtWidgets/QFileDialog>
|
||||
#include <QtGui/QKeyEvent>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPen>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QUuid>
|
||||
|
||||
|
||||
static const char* DISABLE_FAST_CLICKS_PROPERTY = "DisableFastClicks";
|
||||
|
||||
+2
-2
@@ -12,8 +12,8 @@
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
#include <QBasicTimer>
|
||||
#include <QPointer>
|
||||
#include <QLabel>
|
||||
#include <QtCore/QPointer>
|
||||
#include <QtWidgets/QLabel>
|
||||
|
||||
enum LtsDate
|
||||
{
|
||||
|
||||
+5
-5
@@ -21,11 +21,11 @@
|
||||
|
||||
#include <Common/LtsProjectionWorkstation/lts_projection_workstation.h>
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QUuid>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QUuid>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace OperatorManagement
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user