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
@@ -10,7 +10,7 @@
|
||||
#include "ParticipantHandling/participant.h"
|
||||
#include "ParticipantHandling/participant_donator.h"
|
||||
#include "main_handler.h"
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QSet>
|
||||
#include <QMap>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include "main_handler.h"
|
||||
#include "ParticipantHandling/participant.h"
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
|
||||
ParticipantManagement::EquipmentEventHandling::EquipmentEventHandler::EquipmentEventHandler(MainHandler *mainHandler, QObject *parent)
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <ngldb/nsqlquery.h>
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
+2
-2
@@ -14,8 +14,8 @@
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
|
||||
#include <QTest>
|
||||
#include <QTimer>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
//--------------------------------------------------------------------------------
|
||||
ParticipantManagement::PpmTests::PpmTests(QObject *parent)
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
|
||||
#include <ParticipantManagement/web_socket_handler.h>
|
||||
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <TrainingAreaBase/tab.hpp>
|
||||
|
||||
#include <QMutex>
|
||||
#include <QtCore/QMutex>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+5
-5
@@ -22,11 +22,11 @@
|
||||
#include <ParticipantManagement/ppm_record_replay_plugin.h>
|
||||
#include <ngldb/dbtransaction.h>
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QTimer>
|
||||
#include <QVector>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtGui/QTransform>
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
#include <QtCore/QMutex>
|
||||
#include <QtCore/QString>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <ExerciseManagement/exm_dtc.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <ParticipantManagement/ppm_fts.h>
|
||||
|
||||
+3
-3
@@ -9,12 +9,12 @@
|
||||
|
||||
#include "unit_position_calculator.h"
|
||||
#include "participant_handler.h"
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <LtsUtils/LtsUtilsCore/qpoint3d.h>
|
||||
#include <LtsUtils/LtsUtilsCore/outdated_position.h>
|
||||
#include <QPointF>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtConcurrent>
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QFutureWatcher>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QFutureWatcher>
|
||||
#include <Core/core.hpp>
|
||||
#include <unordered_map>
|
||||
#include "participant_handler.h"
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <TrainingAreaBase/tab_record_replay_plugin_custom.h>
|
||||
#include <ParticipantManagement/ppm_dts.h>
|
||||
#include <ParticipantManagement/ParticipantHandling/participant_handler.h>
|
||||
#include <QFuture>
|
||||
#include <QtCore/QFuture>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include "dds_handler.h"
|
||||
#include <ParticipantManagement/logger.h>
|
||||
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
#include "object_target_information.h"
|
||||
#include "../main_handler.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#include "type_handler_global.h"
|
||||
#include "main_handler.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include "type_handler.h"
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
#include <ParticipantManagement/dds_handler.h>
|
||||
#include "logger.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
namespace UasHandling
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
#include "main_handler.h"
|
||||
#include "ParticipantHandling/participant.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QUuid>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@
|
||||
|
||||
#include <LtsWebSocket/reply_message.h>
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QString>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
#include <OcBaseDownload/WebSocketInterface/json_keys.h>
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#include <DDS/DTS/generic_dts_impl.h>
|
||||
#include <QThread>
|
||||
#include <QtCore/QThread>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include "logger.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace Core
|
||||
{
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "exercise_time.h"
|
||||
#include "ppm_dts.h"
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <DDS/DTS/generic_dts_impl.h>
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QThread>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QThread>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <DDS/Core/core_dts_types.h>
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
#include "ppm_common.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QVector>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
namespace ParticipantManagement
|
||||
|
||||
+3
-3
@@ -14,11 +14,11 @@
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <LtsUtilsCore/json_object.h>
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QJsonParseError>
|
||||
#include <QPolygonF>
|
||||
#include <QSet>
|
||||
#include <QVector>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
namespace ParticipantManagement
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
// STUB-HEADER: Diese Datei wird normalerweise von ddsdtc generiert
|
||||
// Für die Migration erstellen wir minimale Typ-Definitionen
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <ostream>
|
||||
#include "ppm_enums.hpp"
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QPair>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QPair>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@
|
||||
#include <utility>
|
||||
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <ParticipantManagement/ppm_common.h>
|
||||
#include "logger.h"
|
||||
|
||||
Reference in new issue
Block a user