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
@@ -4,8 +4,8 @@
|
||||
#include "abstract_socket_handler.h"
|
||||
#include "guez_nasat_telegrams.h"
|
||||
#include "settings.h"
|
||||
#include <QDateTime>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace GuezNasat
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <logger.h>
|
||||
#include "guez_nasat_telegrams.h"
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <TrainingAreaBase/tab_dts.h>
|
||||
#include <QHash>
|
||||
#include <QSet>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
#include "guez_nasat_telegrams.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace GuezNasat
|
||||
{
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
|
||||
#include <cstdint>
|
||||
#include <exception>
|
||||
#include <QJsonObject>
|
||||
#include <QString>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace GuezNasat
|
||||
{
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QHash>
|
||||
#include <GuezNasat/gna_dts.h>
|
||||
#include <GuezNasat/gna_fts.h>
|
||||
#include <GuezNasat/gna_db.h>
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "handler_participant.h"
|
||||
#include <GuezNasat/gna_db.h>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace GuezNasat
|
||||
{
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QHash>
|
||||
#include <GuezNasat/gna_dts.h>
|
||||
#include <GuezNasat/gna_fts.h>
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
#include "dds_handler.h"
|
||||
#include "handler_participant.h"
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QHash>
|
||||
#include <QObject>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QObject>
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
#include <ProjectDataManagement/pdm.hpp>
|
||||
#include "guez_nasat_telegrams.h"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "initialization.h"
|
||||
#include "dds_handler.h"
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
namespace GuezNasat
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
#include "handler_participant.h"
|
||||
#include "logger.h"
|
||||
#include <GuezNasat/gna_dtc.h>
|
||||
#include <QHash>
|
||||
#include <QObject>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace GuezNasat
|
||||
{
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace GuezNasat
|
||||
{
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QHash>
|
||||
#include <GuezNasat/gna.hpp>
|
||||
#include <ParticipantManagement/ppm_dtc_types.h>
|
||||
#include "guez_nasat_telegrams.h"
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace GuezNasat
|
||||
{
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
|
||||
#pragma once
|
||||
#include <QPointF>
|
||||
#include <QString>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QtCore/QString>
|
||||
#include "svcgnaserver_export.h"
|
||||
|
||||
namespace NGL
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTcpServer>
|
||||
#include <QtNetwork/QTcpServer>
|
||||
#include "logger.h"
|
||||
#include "abstract_socket_handler.h"
|
||||
|
||||
|
||||
Reference in new issue
Block a user