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

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

 namespace LtsTimelineClassic
 {
@@ -3,9 +3,9 @@
 #include "Event.h"

 #include <LtsSession/lts_session.h>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPainterPath>
-#include <QRect>
+#include <QtCore/QRect>
 #include <time.h>

 namespace LtsTimelineClassic
@@ -7,9 +7,9 @@
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include <NGLLogger/INGLLogger.h>
 #include <NGLLoggerBootstrap.h>
-#include <QColor>
-#include <QJsonObject>
-#include <QStringList>
+#include <QtGui/QColor>
+#include <QtCore/QJsonObject>
+#include <QtCore/QStringList>

 class QPainter;
 class QRect;
@@ -4,8 +4,8 @@

 #include "PassiveEventContainer.h"

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

 namespace LtsTimelineClassic
 {
@@ -4,8 +4,8 @@
 #include "AbstractTimelineModel.h"
 #include "Range.h"

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

 namespace LtsTimelineClassic
 {
@@ -2,13 +2,13 @@

 #include "EventGraphic.h"

-#include <QBrush>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QPainter>
+#include <QtGui/QBrush>
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QPainter>
 #include <QPalette>
-#include <QPen>
-#include <QPoint>
+#include <QtGui/QPen>
+#include <QtCore/QPoint>
 #include <utility>

 namespace LtsTimelineClassic
@@ -2,7 +2,7 @@

 #pragma once

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

 namespace LtsTimelineClassic
 {
@@ -6,8 +6,8 @@
 #include "EventGraphic.h"

 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDebug>
-#include <QPainter>
+#include <QtCore/QDebug>
+#include <QtGui/QPainter>
 #include <math.h>

 namespace LtsTimelineClassic
@@ -5,7 +5,7 @@
 #include "EventList.h"
 #include "ltstimelineclassic_export.h"

-#include <QRect>
+#include <QtCore/QRect>
 #include <time.h>

 class QPainter;
@@ -5,7 +5,7 @@
 #include "EventGraphic.h"
 #include "EventTools.h"

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

 #ifdef LTS_DEBUG
@@ -2,7 +2,7 @@

 #pragma once

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

 namespace LtsTimelineClassic
 {
@@ -5,11 +5,11 @@
 #include "EventGraphic.h"
 #include "EventTools.h"

-#include <QBrush>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QPainter>
-#include <QPen>
+#include <QtGui/QBrush>
+#include <QtCore/QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
 #include <QStyleOptionViewItem>
 #include <math.h>
 #include <time.h>
@@ -6,7 +6,7 @@
 #include "LineMap.h"
 #include "Range.h"

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

 class QPainter;
 class QStyleOptionViewItem;
@@ -4,7 +4,7 @@

 #include "EventGraphic.h"

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

 namespace LtsTimelineClassic
@@ -3,7 +3,7 @@
 #pragma once
 #include "AbstractTimelineModel.h"

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

 namespace LtsTimelineClassic
 {
@@ -4,12 +4,12 @@

 #include "TimelineWidget.h"

-#include <QGuiApplication>
-#include <QPainter>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QPainter>
 #include <QPainterPath>
-#include <QPen>
-#include <QPoint>
-#include <QRect>
+#include <QtGui/QPen>
+#include <QtCore/QPoint>
+#include <QtCore/QRect>

 namespace LtsTimelineClassic
 {
@@ -3,8 +3,8 @@
 #pragma once
 #include "EventTools.h"

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

 class QPainter;

@@ -6,20 +6,20 @@
 #include "TimelineWidget.h"

 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QApplication>
-#include <QComboBox>
-#include <QDateTime>
-#include <QDebug>
-#include <QFont>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QDateTime>
+#include <QtCore/QDebug>
+#include <QtGui/QFont>
 #include <QFontMetrics>
-#include <QGuiApplication>
-#include <QHBoxLayout>
-#include <QHeaderView>
-#include <QLabel>
-#include <QPainter>
+#include <QtGui/QGuiApplication>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QLabel>
+#include <QtGui/QPainter>
 #include <QPalette>
-#include <QPoint>
-#include <QPushButton>
+#include <QtCore/QPoint>
+#include <QtWidgets/QPushButton>
 #include <ngltools/ngltools_dtg.h>

 #ifdef LTS_DEBUG
@@ -4,11 +4,11 @@
 #include "EventTools.h"
 #include "LineMap.h"

-#include <QComboBox>
-#include <QObject>
-#include <QPair>
-#include <QPoint>
-#include <QWidget>
+#include <QtWidgets/QComboBox>
+#include <QtCore/QObject>
+#include <QtCore/QPair>
+#include <QtCore/QPoint>
+#include <QtWidgets/QWidget>

 namespace NGL
 {
@@ -7,15 +7,15 @@
 #include "TimelineHeaderView.h"
 #include "TimelineWidget.h"

-#include <QBrush>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QHeaderView>
+#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 LtsTimelineClassic
@@ -7,8 +7,8 @@
 #include "TimelineHeaderView.h"
 #include "TimelineIndicator.h"

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

 namespace LtsTimelineClassic
 {
@@ -8,11 +8,11 @@
 #include "ui_TimelineWidgetUi.h"

 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDateTime>
-#include <QDebug>
-#include <QPoint>
-#include <QRect>
-#include <QSize>
+#include <QtCore/QDateTime>
+#include <QtCore/QDebug>
+#include <QtCore/QPoint>
+#include <QtCore/QRect>
+#include <QtCore/QSize>

 namespace LtsTimelineClassic
 {
@@ -5,8 +5,8 @@
 #include "ltstimelineclassic_export.h"

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

 namespace Ui
 {
@@ -4,9 +4,9 @@
 #include "TimelineWidget.h"

 #include <NGLLogger/NGLLoggerBootstrap.h>
-#include <QDebug>
-#include <QPushButton>
-#include <QVBoxLayout>
+#include <QtCore/QDebug>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>
 #include <Services/ProjectDataManagement/pdm_enums.hpp>
 #include <Services/ProjectDataManagement/pdm_translation.h>
 #include <nglapplication/nglapplication.h>