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 "mainwindow.h"

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

 int main(int argc, char* argv[])
 {
@@ -3,8 +3,8 @@
 #include "ui_mainwindow.h"

 #include <LtsScriptTimeline/track_entry.h>
-#include <QDialog>
-#include <QLabel>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QLabel>

 MainWindow::MainWindow(QWidget* parent)
    : QMainWindow(parent), ui(new Ui::MainWindow), m_selectedTe(nullptr), m_currentNewTopicEditor(nullptr),
@@ -1,6 +1,6 @@
 #pragma once
-#include <QMainWindow>
-#include <QObject>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QObject>

 namespace Ui
 {
@@ -5,7 +5,7 @@
 #include "track_content_widget.h"
 #include "track_entry.h"

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

 namespace LtsScriptTimeline
 {
@@ -1,9 +1,9 @@
 #pragma once
 #include "track_content_widget.h"

-#include <QMap>
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>

 namespace LtsScriptTimeline
 {
@@ -4,10 +4,10 @@
 #include "track_entry.h"
 #include "ui_filter_track_widget.h"

-#include <QBrush>
-#include <QColor>
-#include <QPainter>
-#include <QPen>
+#include <QtGui/QBrush>
+#include <QtGui/QColor>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>

 namespace LtsScriptTimeline
 {
@@ -2,8 +2,8 @@
 #include "ltsscripttimeline_export.h"
 #include "track_entry_painters.h"

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

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

 #include "ui_indicator.h"

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

 namespace LtsScriptTimeline
 {
@@ -1,6 +1,6 @@
 #pragma once
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>

 namespace Ui
 {
@@ -11,12 +11,12 @@

 #include <LtsWidgets/lts_message_dialog.h>
 #include <QCursor>
-#include <QDebug>
-#include <QMessageBox>
-#include <QPixmap>
-#include <QRubberBand>
-#include <QTime>
-#include <QTimer>
+#include <QtCore/QDebug>
+#include <QtWidgets/QMessageBox>
+#include <QtGui/QPixmap>
+#include <QtWidgets/QRubberBand>
+#include <QtCore/QTime>
+#include <QtCore/QTimer>
 #include <utility>

 namespace LtsScriptTimeline
@@ -2,10 +2,10 @@
 #include "ltsscripttimeline_export.h"
 #include "track_entry_painters.h"

-#include <QKeyEvent>
-#include <QObject>
-#include <QPointer>
-#include <QWidget>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtWidgets/QWidget>

 namespace Ui
 {
@@ -1,7 +1,7 @@
 #pragma once

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

 namespace LtsScriptTimeline
 {
@@ -1,6 +1,6 @@
 #pragma once

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

 namespace LtsScriptTimeline
 {
@@ -12,19 +12,19 @@
 #include "track_widget.h"

 #include <LtsWidgets/lts_message_dialog.h>
-#include <QApplication>
-#include <QBrush>
-#include <QByteArray>
-#include <QColor>
-#include <QDataStream>
-#include <QGuiApplication>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtWidgets/QApplication>
+#include <QtGui/QBrush>
+#include <QtCore/QByteArray>
+#include <QtGui/QColor>
+#include <QtCore/QDataStream>
+#include <QtGui/QGuiApplication>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QJsonValue>
-#include <QKeyEvent>
-#include <QPainter>
+#include <QtCore/QJsonValue>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QPainter>
 #include <QtCore/qglobal.h>
 #include <cassert>
 #include <utility>
@@ -1,8 +1,8 @@
 #pragma once
 #include "ltsscripttimeline_export.h"

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

 namespace LtsScriptTimeline
 {
@@ -7,12 +7,12 @@
 #include "track_widget.h"

 #include <LtsWidgets/lts_message_dialog.h>
-#include <QApplication>
-#include <QDebug>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
 #include <QDrag>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QGuiApplication>
+#include <QtGui/QDragEnterEvent>
+#include <QtGui/QDropEvent>
+#include <QtGui/QGuiApplication>
 #include <QMimeData>
 #include <utility>

@@ -2,7 +2,7 @@

 #include "ltsscripttimeline_export.h"

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

 namespace LtsScriptTimeline
 {
@@ -3,8 +3,8 @@
 #include "ltsscripttimeline_export.h"
 #include "track_entry_painters.h"

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

 namespace LtsScriptTimeline
 {
@@ -4,8 +4,8 @@

 #include "track_entry.h"

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

 namespace LtsScriptTimeline
 {
@@ -4,11 +4,11 @@

 #include "ltsscripttimeline_export.h"

-#include <QColor>
-#include <QIcon>
-#include <QPainter>
-#include <QPen>
-#include <QRect>
+#include <QtGui/QColor>
+#include <QtGui/QIcon>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QRect>

 namespace LtsScriptTimeline
 {
@@ -5,10 +5,10 @@

 #include <LtsSession/lts_session_data.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QContextMenuEvent>
-#include <QJsonDocument>
-#include <QMenu>
-#include <QTextEdit>
+#include <QtGui/QContextMenuEvent>
+#include <QtCore/QJsonDocument>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QTextEdit>

 namespace LtsScriptTimeline
 {
@@ -1,8 +1,8 @@
 #pragma once
 #include "ltsscripttimeline_export.h"

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

 namespace Ui
 {
@@ -6,8 +6,8 @@

 #include <QDrag>
 #include <QMimeData>
-#include <QMouseEvent>
-#include <QPainter>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>

 namespace LtsScriptTimeline
 {
@@ -1,6 +1,6 @@
 #pragma once
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>

 namespace LtsScriptTimeline
 {
@@ -2,17 +2,17 @@

 #include "tools.h"

-#include <QApplication>
-#include <QBrush>
-#include <QColor>
+#include <QtWidgets/QApplication>
+#include <QtGui/QBrush>
+#include <QtGui/QColor>
 #include <QCursor>
-#include <QDebug>
-#include <QFont>
+#include <QtCore/QDebug>
+#include <QtGui/QFont>
 #include <QFontMetrics>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPen>
-#include <QTime>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QTime>

 namespace LtsScriptTimeline
 {
@@ -1,6 +1,6 @@
 #pragma once
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>

 namespace LtsScriptTimeline
 {
@@ -8,8 +8,8 @@
 #include "track_widget.h"

 #include <LtsWidgets/lts_message_dialog.h>
-#include <QDebug>
-#include <QMouseEvent>
+#include <QtCore/QDebug>
+#include <QtGui/QMouseEvent>
 #include <utility>

 namespace LtsScriptTimeline
@@ -4,13 +4,13 @@
 #include "track_content_widget.h"
 #include "track_entry.h"

-#include <QCoreApplication>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QInputDialog>
-#include <QKeyEvent>
-#include <QMenu>
-#include <QMouseEvent>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtWidgets/QInputDialog>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QMenu>
+#include <QtGui/QMouseEvent>

 namespace LtsScriptTimeline
 {
@@ -2,7 +2,7 @@

 #include "ltsscripttimeline_export.h"

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

 class QMouseEvent;
 class QKeyEvent;
@@ -7,14 +7,14 @@
 #include "track_entry.h"
 #include "ui_track_widget.h"

-#include <QBrush>
-#include <QColor>
-#include <QDebug>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QPainter>
-#include <QPen>
+#include <QtGui/QBrush>
+#include <QtGui/QColor>
+#include <QtCore/QDebug>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
 #include <utility>

 namespace LtsScriptTimeline
@@ -2,9 +2,9 @@
 #include "ltsscripttimeline_export.h"
 #include "track_entry_painters.h"

-#include <QMap>
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>
 #include <functional>

 namespace Ui