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
+2
-2
@@ -13,8 +13,8 @@
|
||||
|
||||
#include <EntityTypeStruct.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QSet>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#include "damage_model.h"
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace HighLevelArchitecture
|
||||
{
|
||||
|
||||
+2
-2
@@ -5,8 +5,8 @@
|
||||
|
||||
#include <Common/identifierstruct.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QVector>
|
||||
#include <TacticalStatusStruct.h>
|
||||
#include <EntityIdentifierStruct.h>
|
||||
#include <DamageStatusEnum32.h>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/Core/core_dts_types.h>
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
#include <Common/logger.h>
|
||||
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
#include "web_socket_handler.h"
|
||||
#include "Common/identifierstruct.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QTimer>
|
||||
#include <Common/settings.h>
|
||||
#include <Common/logger.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
#include "dds_handler.h"
|
||||
#include <Common/logger.h>
|
||||
|
||||
+2
-2
@@ -30,10 +30,10 @@
|
||||
|
||||
#include <NGSException.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QPolygonF>
|
||||
#include <QTransform>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <AreaEffectSimulation/aes_enums.hpp>
|
||||
|
||||
|
||||
+3
-3
@@ -4,10 +4,10 @@
|
||||
|
||||
#include <Common/participantposition.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <IObserver.h>
|
||||
#include <QMap>
|
||||
#include <QSet>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QSet>
|
||||
#include <QTransform>
|
||||
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <Common/logger.h>
|
||||
#include <Common/settings.h>
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QHostInfo>
|
||||
|
||||
namespace HighLevelArchitecture
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
#include "dds_handler.h"
|
||||
#include "ppm_handler.h"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QSet>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include <IObserverWeaponFireIntClassCB.h>
|
||||
#include <IObserverWeaponFireIntInstance.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
#include <Common/logger.h>
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <IObserverBaseEntityObjInstance.h>
|
||||
#include <IObserverEnvironmentObjectObjInstance.h>
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include "ppm_handler.h"
|
||||
#include <Common/settings.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
|
||||
namespace HighLevelArchitecture
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QQueue>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <memory>
|
||||
|
||||
Reference in new issue
Block a user