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
+5
-5
@@ -4,12 +4,12 @@
|
||||
|
||||
#include <utility>
|
||||
#include <AudioVideoManagement/avm_translation.h>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QSet>
|
||||
#include <QVector>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
namespace AudioVideoManagement {
|
||||
|
||||
|
||||
+5
-5
@@ -1,10 +1,10 @@
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QVector>
|
||||
#include <QSet>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QSet>
|
||||
#include "svccnrhelper_export.h"
|
||||
|
||||
// Use avm_enums.hpp from RTI DDS tools
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include <QtCore/QUuid>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtGlobal>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace CombatNetRadio
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <set>
|
||||
|
||||
namespace ExerciseManagement
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
#include <AudioVideoManagement/avm_dtc.h>
|
||||
#include <AudioVideoManagement/avm_translation.h>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <QDateTime>
|
||||
#include <QString>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QString>
|
||||
#include <QtGlobal>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <Proxies/CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
|
||||
|
||||
namespace CombatNetRadio
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
|
||||
#include "WebSocketInterface/Messages/reply_message.h"
|
||||
#include "logger.h"
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
#include "config_cnr.h"
|
||||
#include "positions_cnr.h"
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <QUuid>
|
||||
#include <QDateTime>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QUuid>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <memory>
|
||||
|
||||
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#pragma once
|
||||
|
||||
#include "WebSocketInterface/Messages/reply_message.h"
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QTimer>
|
||||
#include <QVector>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QVector>
|
||||
#include <map>
|
||||
#include <vector>
|
||||
#include <memory>
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
#include <LtsUtilsCore/json_object.h>
|
||||
#include <AudioVideoManagement/avm.hpp>
|
||||
#include <InfrastructureManagement/ism.hpp>
|
||||
#include <QString>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace CombatNetRadio
|
||||
{
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <LtsUtils/LtsUtilsCore/outdated_position.h>
|
||||
#include <QtGlobal>
|
||||
#include <QDateTime>
|
||||
#include <QSet>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "WebSocketInterface/Messages/reply_message.h"
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <AssetManagement/asm_dtc.h>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <QtGlobal>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
|
||||
namespace CombatNetRadio
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user