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
+2
-2
@@ -9,8 +9,8 @@
|
||||
|
||||
#include "gmp_minefieldInterpreter_test.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
+3
-3
@@ -8,10 +8,10 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QSignalSpy>
|
||||
#include <QPair>
|
||||
#include <QtCore/QPair>
|
||||
|
||||
#include "../zssi_wi_Minenfeld_Interpreter.h"
|
||||
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include "dds_handler.h"
|
||||
#include "zssi_wi_Minenfeld_Interpreter.h"
|
||||
|
||||
#include <QLineF>
|
||||
#include <QtCore/QLineF>
|
||||
|
||||
#if BUILD_RTI
|
||||
|
||||
|
||||
+3
-3
@@ -8,9 +8,9 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QPointF>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include "gmp_export.h"
|
||||
|
||||
namespace NGL
|
||||
|
||||
+1
-1
@@ -46,7 +46,7 @@ static char rcs_id[] = "$Id$";
|
||||
|
||||
//------------------ includes ------------------------------
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <iostream>
|
||||
|
||||
+1
-1
@@ -48,7 +48,7 @@
|
||||
#define ZSSI_WI_MINENFELD_GENERATOR_H
|
||||
|
||||
/*------------------ includes ----------------------------*/
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
#include "GFS_map_cont.h"
|
||||
|
||||
|
||||
+1
-1
@@ -45,7 +45,7 @@
|
||||
|
||||
/*------------------ includes ----------------------------*/
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
#include "GFS_map_cont.h"
|
||||
#include "zssi_wi_Minenfeld_Generator.h"
|
||||
|
||||
Reference in new issue
Block a user