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
@@ -1,6 +1,6 @@
 #include "pre_journal_types.h"

-#include <QDateTime>
+#include <QtCore/QDateTime>
 #include <ngltools/ngltools_dtg.h>


@@ -1,7 +1,7 @@
 #pragma once

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


 namespace PresentationManagement
@@ -1,7 +1,7 @@
 #include "pre_screen.h"

 #include <QStyleOption>
-#include <QPainter>
+#include <QtGui/QPainter>


 Screen::Screen()
@@ -1,6 +1,6 @@
 #pragma once

-#include <QWidget>
+#include <QtWidgets/QWidget>


 class Screen : public QWidget
@@ -64,19 +64,19 @@
 #include <Plugins/Evaluations/evl_gui_plugin_interface.h>
 #include <Plugins/PlanOverlays/plan_overlays_plugin_interface.h>

-#include <QCoreApplication>
-#include <QStringList>
-#include <QDateTime>
-#include <QDir>
-#include <QFileDialog>
-#include <QJsonDocument>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QStringList>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonValue>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
 #include <QMutableVectorIterator>
-#include <QPoint>
-#include <QTimer>
+#include <QtCore/QPoint>
+#include <QtCore/QTimer>


 using namespace LtsScriptTimeline;
@@ -28,9 +28,9 @@
 #include <Plugins/SituationReplay/srp_gui_plugin_interface.h>
 #include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>

-#include <QString>
-#include <QStringList>
-#include <QMap>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtCore/QMap>
 #include <functional>
 #include <memory>

@@ -31,14 +31,14 @@
 #include <Services/PresentationManagement/pre_operator_rights.h>
 #include <PresentationManagement/pre_dtc.h>

-#include <QDir>
+#include <QtCore/QDir>
 #include <QJsonParseError>
-#include <QJsonDocument>
-#include <QProgressDialog>
-#include <QTimer>
-#include <QFileDialog>
-#include <QVBoxLayout>
-#include <QDateTime>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QProgressDialog>
+#include <QtCore/QTimer>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QVBoxLayout>
+#include <QtCore/QDateTime>

 #include <stdlib.h> 

@@ -6,7 +6,7 @@
 #include <LtsScriptTimeline/track_entry.h>
 #include <LtsSession/lts_session.h>

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


 namespace Ui
@@ -5,7 +5,7 @@

 #include <LtsWidgets/lts_dialog.h>

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


 namespace Ui