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
@@ -7,8 +7,8 @@
|
||||
#include <utility>
|
||||
#include <SoundManagement/som.hpp>
|
||||
|
||||
#include <QHash>
|
||||
#include <QVector>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
|
||||
namespace EffectManagement
|
||||
|
||||
+6
-6
@@ -5,12 +5,12 @@
|
||||
#include "../logger.h"
|
||||
#include "efm_sound_area_helper.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QDebug>
|
||||
#include <QMouseEvent>
|
||||
#include <QSpinBox>
|
||||
#include <QTime>
|
||||
#include <QTimer>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtGui/QMouseEvent>
|
||||
#include <QtWidgets/QSpinBox>
|
||||
#include <QtCore/QTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <utility>
|
||||
|
||||
namespace EffectManagement
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "efm_sound_state.h"
|
||||
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
#include <SoundManagement/som_dtc.h>
|
||||
|
||||
class QTimer;
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
#include "efm_sound_area.h"
|
||||
#include "efm_sound_area_helper.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QDebug>
|
||||
#include <QSpinBox>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtWidgets/QSpinBox>
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <QAbstractItemModel>
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QtCore/QAbstractItemModel>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
#include <SoundManagement/som_dtc.h>
|
||||
|
||||
namespace NGL
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "../logger.h"
|
||||
|
||||
#include <QColor>
|
||||
#include <QVector>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QVector>
|
||||
#include <utility>
|
||||
|
||||
namespace EffectManagement
|
||||
|
||||
+2
-2
@@ -5,8 +5,8 @@
|
||||
#include "../logger.h"
|
||||
#include "efm_sound_area_helper.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QTime>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtCore/QTime>
|
||||
#include <algorithm>
|
||||
|
||||
namespace EffectManagement
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <QItemDelegate>
|
||||
#include <QtWidgets/QItemDelegate>
|
||||
#include <SoundManagement/som_dtc.h>
|
||||
#include <SoundManagement/som_ftc.h>
|
||||
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <SoundManagement/som.hpp>
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
|
||||
namespace EffectManagement
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "../logger.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
namespace EffectManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user