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>
 #include <Common/LtsTimeline/timeline_utils.h>

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

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


 namespace PresentationManagement
@@ -2,7 +2,7 @@

 #include <LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>

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


@@ -5,10 +5,10 @@
 #include <utility>
 #include "pre_screen.h"
 #include "pre_topic_item.h"
-#include <QProcess>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QProcess>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>

 namespace PresentationManagement
 {
@@ -3,9 +3,9 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <QTemporaryDir>
-#include <QSet>
+#include <QtCore/QSet>
 #include <Services/PresentationManagement/logger.h>
 #include "pre_topic_recorder.h"

@@ -3,13 +3,13 @@

 #include "pre_screen_shotter.h"
 #include <utility>
-#include <QProcess>
+#include <QtCore/QProcess>
 #include "pre_screen.h"
 #include <limits>
 #include "pre_topic_item.h"
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>

 namespace PresentationManagement
 {
@@ -3,9 +3,9 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <QTemporaryDir>
-#include <QSet>
+#include <QtCore/QSet>
 #include <Services/PresentationManagement/logger.h>
 #include "pre_topic_shotter.h"

@@ -5,10 +5,10 @@
 #include <LtsTimeline/timeline_header_view.h>
 #include <LtsTimeline/timeline_view.h>

-#include <QApplication>
-#include <QGuiApplication>
-#include <QPainter>
-#include <QDebug>
+#include <QtWidgets/QApplication>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QPainter>
+#include <QtCore/QDebug>


 namespace PresentationManagement
@@ -74,23 +74,23 @@
 #include <Common2Core/tpm_tools.h>
 #include <LtsUtils/LtsUtilsCore/await.h>

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


@@ -27,9 +27,9 @@
 #include <functional>
 #include <memory>

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


@@ -6,12 +6,12 @@
 #include <LtsTimeline/timeline_widget.h>
 #include <TopicEditorBase/topic_editor_utils.h>

-#include <QApplication>
-#include <QDebug>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
 #include <QDrag>
 #include <QMimeData>
-#include <QMouseEvent>
-#include <QTimer>
+#include <QtGui/QMouseEvent>
+#include <QtCore/QTimer>


 namespace PresentationManagement
@@ -5,8 +5,8 @@

 #include <LtsTimeline/timeline_view.h>

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


 namespace PresentationManagement
@@ -4,7 +4,7 @@
 #include <QToolTip>


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


 namespace PresentationManagement
@@ -10,9 +10,9 @@
 #include <LtsTimeline/timeline_widget.h>
 #include <Services/PresentationManagement/logger.h>

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


 namespace PresentationManagement
@@ -36,15 +36,15 @@

 #include <stdlib.h> 

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


 namespace PresentationManagement
@@ -4,13 +4,13 @@
 #include <LtsPrinting/printing.h>
 #include "pre_script_dialog_select_handler.h"

-#include <QDir>
-#include <QLabel>
-#include <QJsonArray>
+#include <QtCore/QDir>
+#include <QtWidgets/QLabel>
+#include <QtCore/QJsonArray>
 #include <QTextTable>
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 #include <QPrinter>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPrintDialog>
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>
@@ -6,8 +6,8 @@
 #include <LtsWidgets/lts_dialog.h>
 #include "pre_topic_item.h"

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

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

 #include <LtsWidgets/lts_dialog.h>

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


 namespace Ui
@@ -4,15 +4,15 @@

 #include <PresentationManagement/pre.hpp>

-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QPainter>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtGui/QPainter>
 #include <QStyleOptionViewItem>


 #include <LtsTimeline/timeline_utils.h>
-#include <QDebug>
+#include <QtCore/QDebug>


 namespace PresentationManagement
@@ -7,7 +7,7 @@
 #include <PluginInterfaces/topic_replay_interface.h>
 #include <TopicEditorBase/topic_editor_utils.h>

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


 namespace PresentationManagement
@@ -6,8 +6,8 @@

 #include <LtsUtils/LtsUtilsCore/await.h>

-#include <QFile>
-#include <QThread>
+#include <QtCore/QFile>
+#include <QtCore/QThread>



@@ -3,9 +3,9 @@

 #pragma once

-#include <QObject>
-#include <QTemporaryFile>
-#include <QProcess>
+#include <QtCore/QObject>
+#include <QtCore/QTemporaryFile>
+#include <QtCore/QProcess>
 #include <Services/PresentationManagement/logger.h>

 class Screen;
@@ -3,10 +3,10 @@

 #include "pre_topic_shotter.h"
 #include "pre_screen.h"
-#include <QFile>
-#include <QThread>
-#include <QScreen>
-#include <QTimer>
+#include <QtCore/QFile>
+#include <QtCore/QThread>
+#include <QtGui/QScreen>
+#include <QtCore/QTimer>


 namespace PresentationManagement
@@ -3,9 +3,9 @@

 #pragma once

-#include <QObject>
-#include <QTemporaryFile>
-#include <QProcess>
+#include <QtCore/QObject>
+#include <QtCore/QTemporaryFile>
+#include <QtCore/QProcess>
 #include <Services/PresentationManagement/logger.h>

 class Screen;
@@ -1,6 +1,6 @@
 #pragma once

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


 namespace PresentationManagement