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
@@ -2,11 +2,11 @@

 #include "item.h"

-#include <QBrush>
-#include <QDebug>
-#include <QModelIndex>
-#include <QPainter>
-#include <QPen>
+#include <QtGui/QBrush>
+#include <QtCore/QDebug>
+#include <QtCore/QModelIndex>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
 #include <QStyleOptionViewItem>

 namespace LtsTimeline
@@ -4,7 +4,7 @@

 #include "ltstimeline_export.h"

-#include <QColor>
+#include <QtGui/QColor>
 #include <functional>
 #include <memory>

@@ -6,11 +6,11 @@
 #include "timeline_view.h"
 #include "track.h"

-#include <QDebug>
-#include <QGuiApplication>
-#include <QModelIndex>
-#include <QPainter>
-#include <QRect>
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtCore/QModelIndex>
+#include <QtGui/QPainter>
+#include <QtCore/QRect>

 namespace LtsTimeline
 {
@@ -3,9 +3,9 @@
 #pragma once
 #include "ltstimeline_export.h"

-#include <QObject>
-#include <QPushButton>
-#include <QStyledItemDelegate>
+#include <QtCore/QObject>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QStyledItemDelegate>

 namespace LtsTimeline
 {
@@ -1,6 +1,6 @@
 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDateTime>
-#include <QDebug>
+#include <QtCore/QDateTime>
+#include <QtCore/QDebug>
 #include <item.h>
 #include <nglapplication/nglapplication.h>
 #include <timeline_model.h>
@@ -2,18 +2,18 @@

 #include "timeline_view.h"

-#include <QBrush>
-#include <QDebug>
-#include <QFont>
-#include <QGuiApplication>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPen>
-#include <QPoint>
-#include <QPolygon>
-#include <QRect>
-#include <QTime>
-#include <QTimer>
+#include <QtGui/QBrush>
+#include <QtCore/QDebug>
+#include <QtGui/QFont>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QPoint>
+#include <QtGui/QPolygon>
+#include <QtCore/QRect>
+#include <QtCore/QTime>
+#include <QtCore/QTimer>
 #include <utility>

 namespace LtsTimeline
@@ -3,8 +3,8 @@
 #include "timeline_header_view_mouse_handler.h"
 #include "timeline_utils.h"

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

 class QMouseEvent;
 class QPainter;
@@ -3,10 +3,10 @@
 #include "timeline_header_view.h"
 #include "timeline_view.h"

-#include <QApplication>
-#include <QDebug>
-#include <QMouseEvent>
-#include <QWheelEvent>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QWheelEvent>

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

 #include "ltstimeline_export.h"

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

 class QMouseEvent;
 class QWheelEvent;
@@ -6,7 +6,7 @@
 #include "track.h"

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

 namespace LtsTimeline
@@ -6,8 +6,8 @@
 #include "track.h"

 #include <NGLLogger/INGLLogger.h>
-#include <QAbstractItemModel>
-#include <QObject>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QObject>
 #include <type_traits>

 namespace LtsTimeline
@@ -1,7 +1,7 @@
 #include "timeline_utils.h"

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

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

 #include "ltstimeline_export.h"

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

 namespace LtsTimeline
 {
@@ -6,16 +6,16 @@

 #include <NGLLogger/NGLLoggerBootstrap.h>
 #include <QAbstractProxyModel>
-#include <QApplication>
-#include <QBrush>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QHeaderView>
+#include <QtWidgets/QApplication>
+#include <QtGui/QBrush>
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtWidgets/QHeaderView>
 #include <QHelpEvent>
-#include <QModelIndex>
-#include <QPainter>
-#include <QPen>
-#include <QRect>
+#include <QtCore/QModelIndex>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QRect>
 #include <utility>

 namespace LtsTimeline
@@ -9,9 +9,9 @@
 #include "timeline_view_selection_handler.h"
 #include "timeline_view_track_handler.h"

-#include <QLabel>
-#include <QObject>
-#include <QTreeView>
+#include <QtWidgets/QLabel>
+#include <QtCore/QObject>
+#include <QtWidgets/QTreeView>
 #include <functional>

 class QAbstractProxyModel;
@@ -3,11 +3,11 @@
 #include "item.h"
 #include "track.h"

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

 namespace LtsTimeline
@@ -3,9 +3,9 @@
 #include "ltstimeline_export.h"
 #include "timeline_view.h"

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

 class QDragEnterEvent;
 class QDragMoveEvent;
@@ -5,9 +5,9 @@
 #include "timeline_view.h"
 #include "track.h"

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

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

 #include "ltstimeline_export.h"

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

 namespace LtsTimeline
 {
@@ -2,12 +2,12 @@

 #include "item_delegate.h"

-#include <QApplication>
-#include <QDebug>
-#include <QKeyEvent>
-#include <QModelIndex>
-#include <QMouseEvent>
-#include <QSize>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDebug>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QModelIndex>
+#include <QtGui/QMouseEvent>
+#include <QtCore/QSize>
 #include <utility>

 namespace LtsTimeline
@@ -3,7 +3,7 @@
 #include "ltstimeline_export.h"
 #include "timeline_view.h"

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

 class QMouseEvent;
 class QKeyEvent;
@@ -5,9 +5,9 @@
 #include "track.h"

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

 namespace LtsTimeline
 {
@@ -2,8 +2,8 @@

 #include "ltstimeline_export.h"

-#include <QModelIndex>
-#include <QMouseEvent>
+#include <QtCore/QModelIndex>
+#include <QtGui/QMouseEvent>

 namespace LtsTimeline
 {
@@ -9,11 +9,11 @@
 #include "ui_timeline_widget.h"

 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDateTime>
-#include <QPoint>
-#include <QRect>
-#include <QSize>
-#include <QStandardItemModel>
+#include <QtCore/QDateTime>
+#include <QtCore/QPoint>
+#include <QtCore/QRect>
+#include <QtCore/QSize>
+#include <QtGui/QStandardItemModel>
 #include <QtGlobal>
 #include <utility>

@@ -5,8 +5,8 @@
 #include "timeline_utils.h"

 #include <NGLLogger/INGLLogger.h>
-#include <QObject>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtWidgets/QWidget>

 class QScrollBar;
 class QAbstractItemModel;
@@ -5,9 +5,9 @@
 #include "item.h"
 #include "ltstimeline_export.h"

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

 namespace LtsTimeline