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
@@ -9,7 +9,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QPolygonF>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace CesExplosions
|
||||
{
|
||||
|
||||
+2
-2
@@ -17,8 +17,8 @@
|
||||
//#include <CentralEffectSimulation/proxy_building.h>
|
||||
|
||||
|
||||
#include <QHash>
|
||||
#include <QVector>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QVector>
|
||||
#include <QPolygonF>
|
||||
|
||||
|
||||
|
||||
+5
-5
@@ -19,11 +19,11 @@
|
||||
#include <LtsCoordinate/lts_coordinate.h>
|
||||
|
||||
|
||||
#include <QPointF>
|
||||
#include <QVector>
|
||||
#include <QSet>
|
||||
#include <QDateTime>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QElapsedTimer>
|
||||
|
||||
using namespace CentralEffectSimulation;
|
||||
|
||||
+1
-1
@@ -27,7 +27,7 @@
|
||||
#include <QtCore/QVector>
|
||||
#include <QPolygonF>
|
||||
#include <QQueue>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
// AES-Handling for Explosions
|
||||
|
||||
|
||||
+5
-5
@@ -18,13 +18,13 @@
|
||||
#include <CentralEffectSimulation/handler_participant.h>
|
||||
|
||||
#include <QPainterPath>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QPolygonF>
|
||||
#include <QVector>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QTransform>
|
||||
#include <QDateTime>
|
||||
#include <QVariant>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QVariant>
|
||||
|
||||
|
||||
namespace CesExplosions
|
||||
|
||||
+2
-2
@@ -23,8 +23,8 @@
|
||||
#include <QtCore/QVector>
|
||||
#include <QPolygonF>
|
||||
#include <QQueue>
|
||||
#include <QHash>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace LtsUtils
|
||||
{
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <LtsCoordinate/lts_coordinate.h>
|
||||
#include <CentralEffectSimulation/proxy_building.h>
|
||||
|
||||
#include <QFlags>
|
||||
#include <QtCore/QFlags>
|
||||
#pragma once
|
||||
|
||||
namespace CesExplosions
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
#include <CentralEffectSimulation/dds_handler.h>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace CesExplosions
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user