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
@@ -9,7 +9,7 @@
 #pragma once

 #include <QtCore/QJsonObject>
-#include <QVector>
+#include <QtCore/QVector>

 #include <DDS/Core/core.hpp>

@@ -12,8 +12,8 @@

 #include <DDS/Core/core.hpp>

-#include <QString>
-#include <QMap>
+#include <QtCore/QString>
+#include <QtCore/QMap>

 #include <QtCore/QVector>
 #include <QtCore/QJsonObject>
@@ -9,7 +9,7 @@
  */
 #include "WebSocketInterface/data_manager.h"

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

 namespace OcBaseDownload
 {
@@ -13,7 +13,7 @@
 #include "data_manager.h"
 #include "WebSocketInterface/Messages/client_message.h"

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

 namespace OcBaseDownload
 {
@@ -8,8 +8,8 @@
  */
 #pragma once

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

 #include <LtsWebSocket/lts_web_socket_client.h>
 #include "logger.h"
@@ -14,10 +14,10 @@
 #include <ngldb/nsqlquery.h>
 #include <ngltools/ngltools_filesystem.h>

-#include <QDir>
-#include <QFile>
-#include <QProcess>
-#include <QSettings>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QProcess>
+#include <QtCore/QSettings>

 namespace OcBaseDownload
 {
@@ -9,8 +9,8 @@

 #pragma once

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

 #include "logger.h"

@@ -9,11 +9,11 @@
 #include "handler_base_download.h"
 #include <utility>

-#include <QStringList>
-#include <QSettings>
-#include <QSqlDriver>
-#include <QSqlField>
-#include <QSqlRecord>
+#include <QtCore/QStringList>
+#include <QtCore/QSettings>
+#include <QtSql/QSqlDriver>
+#include <QtSql/QSqlField>
+#include <QtSql/QSqlRecord>

 #include <ngldb/dbconnection.h>
 #include <ngldb/dbtransaction.h>
@@ -25,8 +25,8 @@

 #include <ngltools/ngltools_filesystem.h>
 #include <DDS/Core/pacemaker.h>
-#include <QUuid>
-#include <QDateTime>
+#include <QtCore/QUuid>
+#include <QtCore/QDateTime>
 #include "copy_database.h"
 #include "main_handler.h"
 #include "settings.h"
@@ -8,9 +8,9 @@
 #pragma once

 #include <QElapsedTimer>
-#include <QObject>
-#include <QSqlDatabase>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtSql/QSqlDatabase>
+#include <QtCore/QTimer>

 // db
 #include <AssetManagement/asm_db.h>
@@ -10,7 +10,7 @@
 #include <utility>

 #include "WebSocketInterface/Messages/reply_message.h"
-#include <QUuid>
+#include <QtCore/QUuid>
 #include "pdf_downloader.h"
 #include <ngldb/db_service_handler.h>
 #include <nglsettings/nglsettings_connections.h>
@@ -22,8 +22,8 @@
 #include <ngltools/ngltools_filesystem.h>
 #include "main_handler.h"
 #include "settings.h"
-#include <QFileInfo>
-#include <QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>

 namespace OcBaseDownload
 {
@@ -9,7 +9,7 @@

 // dds
 #include <OcBaseDownload/obd_fts.h>
-#include <QSqlDatabase>
+#include <QtSql/QSqlDatabase>
 #include <FileManagement/flm_db.h>
 #include <FileManagement/flm_db_impl_custom.h>
 #include "WebSocketInterface/Messages/client_message.h"
@@ -6,7 +6,7 @@
  */
 #pragma once

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

 #include <ServiceManagement/scm_dtc.h>
@@ -11,7 +11,7 @@
 #include <nglsettings/nglsettings_connections.h>
 #include <nglsettings/nglsettings_settings.h>

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

 namespace OcBaseDownload
 {
@@ -9,9 +9,9 @@
 #pragma once

 #include "logger.h"
-#include <QObject>
-#include <QTcpSocket>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QString>

 class QTimer;
 namespace OcBaseDownload
@@ -17,7 +17,7 @@
 #include <ngldb/db_service_handler.h>
 #include <ngltools/ngltools_filesystem.h>

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

 namespace OcBaseDownload
 {
@@ -8,10 +8,10 @@

 #pragma once

-#include <QObject>
-#include <QString>
-#include <QVector>
-#include <QSqlDatabase>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVector>
+#include <QtSql/QSqlDatabase>

 #include <DBAdministration/exercise_table_generator.h>
 #include <FileManagement/flm_db.h>
@@ -10,7 +10,7 @@
 #include <QtCore/QSettings>
 #include <nglsettings/nglsettings_settings.h>
 #include <ngltools/ngltools_filesystem.h>
-#include <QDir>
+#include <QtCore/QDir>
 namespace OcBaseDownload
 {
 class NGLSettingsClass : public NGL::Settings
@@ -6,7 +6,7 @@
  */

 #pragma once
-#include <QString>
+#include <QtCore/QString>

 namespace NGL
 {