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>
2026-08-23 20:49:23 +02:00
1 parent 3d3c3b48fe
commit 7a6be7474e
@@ -5,7 +5,7 @@
 #include "StructBuilder.h"

 #include <NGLLogger/INGLLogger.h>
-#include <QCryptographicHash>
+#include <QtCore/QCryptographicHash>
 #include <grantlee/context.h>

 #ifdef RTI_HEADER_AVAILABLE
@@ -5,7 +5,7 @@
 #include "GrantleeWrappers.h"
 #include "StructBuilder.h"

-#include <QObject>
+#include <QtCore/QObject>

 namespace CodeGen
 {
@@ -5,7 +5,7 @@
 #include "GrantleeWrappers.h"
 #include "StructBuilder.h"

-#include <QObject>
+#include <QtCore/QObject>

 namespace CodeGen
 {
@@ -5,7 +5,7 @@
 #include "GrantleeWrappers.h"
 #include "StructBuilder.h"

-#include <QObject>
+#include <QtCore/QObject>

 namespace CodeGen
 {
@@ -6,8 +6,8 @@
 #include "XmlReader.h"

 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QFile>
-#include <QRegularExpression>
+#include <QtCore/QFile>
+#include <QtCore/QRegularExpression>
 #include <grantlee/context.h>
 #include <grantlee/engine.h>

@@ -4,8 +4,8 @@

 #include "XmlReader.h"

-#include <QObject>
-#include <QSharedPointer>
+#include <QtCore/QObject>
+#include <QtCore/QSharedPointer>

 namespace NGL
 {
@@ -4,9 +4,9 @@

 #include "StructBuilder.h"

-#include <QObject>
-#include <QString>
-#include <QVariant>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVariant>
 #include <utility>

 #ifdef RTI_HEADER_AVAILABLE
@@ -6,7 +6,7 @@
 #include "XmlReader.h"

 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QStringList>
+#include <QtCore/QStringList>
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>

@@ -5,8 +5,8 @@
 #include "StructBuilder.h"
 #include "codegen_base_export.h"

-#include <QSharedPointer>
-#include <QStringList>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QStringList>

 namespace NGL
 {
@@ -3,7 +3,7 @@
 #include "StructBuilder.h"

 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <utility>

 using namespace CodeGen;
@@ -4,9 +4,9 @@

 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QDirIterator>
-#include <QDomDocument>
-#include <QFile>
-#include <QXmlStreamReader>
+#include <QtXml/QDomDocument>
+#include <QtCore/QFile>
+#include <QtCore/QXmlStreamReader>
 #include <ngltools/ngltools_filesystem.h>
 #include <utility>

@@ -9,7 +9,7 @@

 #include <LtsCommandLineParser/LtsCommandLineParser.h>
 #include <NGLLogger/INGLLogger.h>
-#include <QDir>
+#include <QtCore/QDir>
 #include <nglapplication/nglcoreapplication.h>

 class CmdLineParser : public LtsCommandLineParser::LtsCommandLineParser
@@ -9,8 +9,8 @@
 #include "ui_main_grantlee_gui.h"

 #include <NGLLogger/INGLLogger.h>
-#include <QFileDialog>
-#include <QMessageBox>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>
 #include <grantlee/engine.h>
 #include <nglapplication/nglapplication.h>

@@ -1,8 +1,8 @@


 #pragma once
-#include <QMainWindow>
-#include <QObject>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QObject>

 namespace CodeGen
 {
@@ -1,6 +1,6 @@
-#include <QCoreApplication>
-#include <QDebug>
-#include <QDir>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
 #include <grantlee/engine.h>
 #include <grantlee/templateloader.h>