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
@@ -15,9 +15,9 @@

 #include "logger.h"

-#include <QLabel>
-#include <QPushButton>
-#include <QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>

 namespace Timeline
 {
@@ -4,7 +4,7 @@
 #pragma once

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

 class QLabel;
 class QPushButton;
@@ -6,11 +6,11 @@

 #include <NGLLogger/INGLLogger.h>

-#include <QComboBox>
-#include <QWidget>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>


 namespace Timeline
@@ -8,11 +8,11 @@
 #include "../detail_data.h"
 #include "logger.h"

-#include <QColor>
+#include <QtGui/QColor>
 #include <QSizePolicy>
-#include <QJsonArray>
+#include <QtCore/QJsonArray>

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


 namespace Timeline
@@ -6,14 +6,14 @@

 #include "FilterTableEntryAttribute.h"

-#include <QWidget>
-#include <QHBoxLayout>
-#include <QPushButton>
-#include <QComboBox>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QList>
-#include <QGroupBox>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPainter>
+#include <QtCore/QList>
+#include <QtWidgets/QGroupBox>


 namespace Timeline
@@ -8,9 +8,9 @@
 #include "logger.h"
 #include "../detail_data.h"

-#include <QVBoxLayout>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtWidgets/QVBoxLayout>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>


 namespace Timeline
@@ -6,7 +6,7 @@

 #include "AttributeEditingModeUI.h"
 #include "AttributeSelectionModeUI.h"
-#include <QGroupBox>
+#include <QtWidgets/QGroupBox>

 class QLabel;
 class QVBoxLayout;
@@ -10,10 +10,10 @@
 #include "logger.h"
 #include <FileManagement/flm_translation.h>

-#include <QMessageBox>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonDocument>
+#include <QtWidgets/QMessageBox>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
 #include <QJsonParseError>

 #if QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
@@ -21,7 +21,7 @@
 #endif


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


 namespace Timeline
@@ -8,8 +8,8 @@
 #include <NGLLogger/INGLLogger.h>
 #include <LtsSession/lts_session.h>

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



@@ -7,9 +7,9 @@
 #include "FilterValueInterpreter.h"
 #include "../../detail_data.h"

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

 namespace Timeline
 {
@@ -5,9 +5,9 @@
 #include "FilterValueInterpreter.h"
 #include "../../detail_data.h"

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


 namespace Timeline
@@ -4,8 +4,8 @@

 #pragma once

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


 namespace Timeline
@@ -6,13 +6,13 @@
 #include "InfoWindow.h"
 #include "../../detail_data.h"

-#include <QString>
-#include <QStringList>
-#include <QApplication>
-#include <QJsonArray>
-#include <QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtWidgets/QApplication>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>

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


 namespace Timeline
@@ -3,10 +3,10 @@

 #pragma once

-#include <QVector>
-#include <QString>
-#include <QWidget>
-#include <QMap>
+#include <QtCore/QVector>
+#include <QtCore/QString>
+#include <QtWidgets/QWidget>
+#include <QtCore/QMap>


 namespace Timeline
@@ -4,8 +4,8 @@

 #include "InfoWindow.h"

-#include <QHBoxLayout>
-#include <QMessageBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QMessageBox>


 namespace Timeline
@@ -4,12 +4,12 @@

 #pragma once

-#include <QDialog>
-#include <QWidget>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QTextEdit>
-#include <QLabel>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QLabel>


 namespace Timeline
@@ -4,8 +4,8 @@

 #include "AbstractAttributeWidget.h"

-#include <QHBoxLayout>
-#include <QPushButton>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QPushButton>


 namespace Timeline
@@ -4,7 +4,7 @@

 #pragma once

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

 class QHBoxLayout;

@@ -4,9 +4,9 @@

 #include "AreaWidget.h"

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


 namespace Timeline
@@ -4,7 +4,7 @@
 #include "CheckBoxWidget.h"
 #include "../../detail_data.h"

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


 namespace Timeline
@@ -5,7 +5,7 @@
 #include "ComboBox.h"
 #include "logger.h"

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

 namespace Timeline
 {
@@ -5,10 +5,10 @@
 #include "DefaultRangeWidget.h"
 #include "logger.h"

-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSpinBox>
-#include <QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QWidget>

 namespace Timeline
 {
@@ -4,9 +4,9 @@

 #include "RadiusWidget.h"

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


 namespace Timeline
@@ -8,9 +8,9 @@

 #include <LtsWidgets/lts_date_time_edit.h>

-#include <QHBoxLayout>
-#include <QLabel>
-#include <QDateTime>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtCore/QDateTime>


 namespace Timeline
@@ -14,7 +14,7 @@
 #include <OperatorManagement/opm_translation.h>
 #include <ParticipantManagement/ppm_translation.h>

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

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

 #pragma once

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

 namespace AudioVideoManagement
@@ -27,10 +27,10 @@
 #include <Services/AreaEffectSimulation/aes_translation.h>
 #include <Services/MarkerManagement/mrk_translation.h>

-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QVariant>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonValue>
+#include <QtCore/QVariant>


 namespace Timeline
@@ -9,9 +9,9 @@

 #include <Services/ProjectDataManagement/pdm_enums.hpp> 

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

 #include "attribute_value_lookup.h"

@@ -8,7 +8,7 @@
 #include <ProjectDataManagement/pdm_enums.hpp>
 #include "logger.h"

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


 namespace Timeline
@@ -2,7 +2,7 @@

 #include <LtsTimelineClassic/EventList.h>

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


 class QWidget;
@@ -4,9 +4,9 @@
 #include "tln_cache_dialog.h"
 #include "ui_tln_cache_dialog.h"

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

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


 namespace Timeline
@@ -5,8 +5,8 @@

 #include "tln_dialog_model.h"

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


 namespace Ui
@@ -24,18 +24,18 @@
 #include <LtsTimelineClassic/EventTools.h>
 #include <ngltools/ngltools_dtg.h>

-#include <QDialog>
-#include <QPushButton>
-#include <QLineEdit>
-#include <QTextEdit>
-#include <QFormLayout>
-#include <QSpinBox>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QSpinBox>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <QJsonParseError>

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

 using namespace LtsTimelineClassic;

@@ -20,7 +20,7 @@

 #include <Plugins/SituationReplay/srp_gui_plugin_interface.h>

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


 namespace AudioVideoManagement
@@ -19,16 +19,16 @@
 #include <AudioVideoManagement/stream_name_mapping.h>
 #include <Plugins/Timeline/tln_data_plugin_interface.h>

-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
-#include <QDateTime>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonValue>
+#include <QtCore/QDateTime>
 #include <QMutableVectorIterator>
 #include <QtWebSockets/QWebSocket> 
-#include <QTimer>
-#include <QUrl>
-#include <QUrlQuery>
+#include <QtCore/QTimer>
+#include <QtCore/QUrl>
+#include <QtCore/QUrlQuery>


 using namespace LtsTimelineClassic;
@@ -13,7 +13,7 @@
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>

-#include <QJsonArray>
+#include <QtCore/QJsonArray>
 #include <QAbstractSocket>


@@ -11,8 +11,8 @@
 #include <LtsTimelineClassic/EventGraphic.h>
 #include <LtsPrinting/printing.h>

-#include <QHeaderView>
-#include <QTreeView>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QTreeView>

 const int MAX_EVENTS = 30; 

@@ -9,13 +9,13 @@
 #include <FileManagement/flm_translation.h>
 #include <LtsWidgets/lts_dialog.h>

-#include <QSortFilterProxyModel>
-#include <QAbstractItemModel>
-#include <QColor>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QAbstractItemModel>
+#include <QtGui/QColor>

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

 namespace Timeline
@@ -8,7 +8,7 @@

 #include "logger.h"

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

 namespace Ui
 {
@@ -6,8 +6,8 @@
 #include <ParticipantManagement/ppm_translation.h>
 #include <Services/AreaEffectSimulation/aes_translation.h>

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


 namespace Timeline
@@ -12,10 +12,10 @@
 #include <ProjectDataManagement/pdm_enums.hpp>
 #include <ProjectDataManagement/pdm_translation.h>

-#include <QLabel>
-#include <QImage>
-#include <QPixmap>
-#include <QPainter>
+#include <QtWidgets/QLabel>
+#include <QtGui/QImage>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>

 namespace Timeline
 {
@@ -17,10 +17,10 @@
 #include <Plugins/MarkerManagement/Gui/Common/mrk_apply_filter.h>
 #include <Plugins/SituationReplay/srp_gui_plugin_interface.h>

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



@@ -12,7 +12,7 @@
 #include <LtsSession/lts_session_manager.h>
 #include <LtsSession/lts_session_data.h>

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

 namespace Timeline
 {