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
+3
-3
@@ -19,10 +19,10 @@
|
||||
#include <ExerciseManagement/settings.h>
|
||||
#include <ExerciseManagement/logger.h>
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QSignalSpy>
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
#include <ExerciseManagement/exm_db.h>
|
||||
#include <ngldb/db_service_handler.h>
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QTimer>
|
||||
#include <QTest>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
#include <ExerciseManagement/exm_ftc.h>
|
||||
#include <AssetManagement/asm_ftc.h>
|
||||
|
||||
+2
-2
@@ -17,8 +17,8 @@
|
||||
#include <DDS/DTC/generic_dtc_impl.h>
|
||||
|
||||
#include <QtTest/QTest>
|
||||
#include <QVariant>
|
||||
#include <QThread>
|
||||
#include <QtCore/QVariant>
|
||||
#include <QtCore/QThread>
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <DDS/Generic/subscriber_listener.h>
|
||||
|
||||
// For Topic Exercise
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QSignalSpy>
|
||||
#include <ExerciseManagement/exm_dts_types.h>
|
||||
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@
|
||||
|
||||
#include <LtsWebSocket/reply_message.h>
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QString>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
#include <OcBaseDownload/WebSocketInterface/json_keys.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QStateMachine>
|
||||
|
||||
#include <ExerciseManagement/exm_enums.hpp>
|
||||
|
||||
+2
-2
@@ -8,9 +8,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <functional>
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include <ExerciseManagement/exm_enums.hpp>
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
#include "object_exercise.h"
|
||||
#include "settings.h"
|
||||
|
||||
//#include <QPixmap>
|
||||
#include <QTimer>
|
||||
//#include <QtGui/QPixmap>
|
||||
#include <QtCore/QTimer>
|
||||
#include <vector>
|
||||
|
||||
#include <LtsUtils/dds_vector_to_pixmap.h>
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QQueue>
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
#include <QCache>
|
||||
#include <QSize>
|
||||
#include <QtCore/QSize>
|
||||
|
||||
#include <DBAdministration/exercise_table_generator.h>
|
||||
#include "dds_handler.h"
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
|
||||
#include "handler_exercise_phase.h"
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QString>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QString>
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "exm_db.h"
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include "logger.h"
|
||||
#include "exm_fts.h"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
#include "dds_handler.h"
|
||||
#include "exm_db.h"
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <DBAdministration/copy_exercise.h>
|
||||
#include <DBAdministration/exercise_table_generator.h>
|
||||
#include <Lts/Common/ProjectConfig/project_defines.h>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace ExerciseManagement
|
||||
{
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include "dds_handler.h"
|
||||
#include <Core/core_types.h>
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QPair>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QPair>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user