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
@@ -11,8 +11,8 @@
 #include <Plugins/OperatorManagement/opm_gui_plugin_interface.h>
 #include <Services/OperatorManagement/logger.h>

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


 namespace OperatorManagement
@@ -12,7 +12,7 @@
 #include <ExerciseManagement/exm_data_plugin_interface.h>
 #include <LtsUtils/dds_vector_to_pixmap.h>

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


 namespace OperatorManagement
@@ -15,16 +15,16 @@
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_global_wait_dialog.h>

-#include <QDebug>
-#include <QMessageBox>
-#include <QGuiApplication>
-#include <QScreen>
-#include <QStyle>
+#include <QtCore/QDebug>
+#include <QtWidgets/QMessageBox>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
+#include <QtWidgets/QStyle>
 #include <QGraphicsDropShadowEffect>
-#include <QProcess>
-#include <QMenu>
-#include <QFile>
-#include <QUdpSocket>
+#include <QtCore/QProcess>
+#include <QtWidgets/QMenu>
+#include <QtCore/QFile>
+#include <QtNetwork/QUdpSocket>

 #ifdef Q_OS_LINUX
 #include <X11/Xlib.h>
@@ -4,8 +4,8 @@

 #pragma once

-#include <QDialog>
-#include <QTimer>
+#include <QtWidgets/QDialog>
+#include <QtCore/QTimer>
 #define DEVEL

 class QProcess;
@@ -36,20 +36,20 @@
 #include <Plugins/OperatorManagement/Data/opm_data_plugin.h>
 #include <Plugins/AssetManagement/Data/asm_data_plugin.h>

-#include <QApplication>
-#include <QProcess>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
+#include <QtWidgets/QApplication>
+#include <QtCore/QProcess>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QJsonArray>
 #include <QJsonParseError>
 #include <QHostInfo>
-#include <QRect>
-#include <QScreen>
+#include <QtCore/QRect>
+#include <QtGui/QScreen>




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



@@ -3,7 +3,7 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <PluginInterfaces/gui_plugin_interface.h>
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
 #include <Plugins/OperatorManagement/opm_gui_plugin_interface.h>
@@ -9,12 +9,12 @@
 #include <LtsSession/lts_session.h>
 #include <LtsSession/lts_session_data.h>

-#include <QGuiApplication>
-#include <QScreen>
-#include <QStyle>
-#include <QDebug>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
+#include <QtWidgets/QStyle>
+#include <QtCore/QDebug>
 #include <QGraphicsDropShadowEffect>
-#include <QPushButton>
+#include <QtWidgets/QPushButton>
 #include <vector>


@@ -4,8 +4,8 @@

 #pragma once

-#include <QDialog>
-#include <QTimer>
+#include <QtWidgets/QDialog>
+#include <QtCore/QTimer>
 #include <QMoveEvent>


@@ -8,7 +8,7 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
 #include <LtsSession/lts_session_data.h>

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

 namespace OperatorManagement
 {
@@ -3,7 +3,7 @@

 #pragma once

-#include <QObject>
+#include <QtCore/QObject>
 #include <LtsWidgets/lts_dialog.h>
 #include <OperatorManagement/logger.h>
 #include <Plugins/AssetManagement/Data/asm_data_plugin.h>
@@ -3,7 +3,7 @@

 #pragma once

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

 namespace OperatorManagement
 {
@@ -3,7 +3,7 @@

 #pragma once

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

 #include "acl_dialog_model.h"

@@ -6,7 +6,7 @@

 #include "group_edit_member_of_model.h"

-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <OperatorManagement/opm_translation.h>

@@ -9,7 +9,7 @@
 #include <OperatorManagement/opm_dtc.h>
 #include <OperatorManagement/opm_ftc.h>

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

 namespace Ui
 {
@@ -5,9 +5,9 @@
 #include <nglwidgets/ngltreeitem.h>
 #include <LtsUtilsSettings/settings.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <QCoreApplication>
-#include <QSet>
-#include <QVector>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QSet>
+#include <QtCore/QVector>

 namespace OperatorManagement
 {
@@ -6,7 +6,7 @@

 #include <ngltools/ngltools_dtg.h>
 #include <OperatorManagement/opm_translation.h>
-#include <QIcon>
+#include <QtGui/QIcon>

 namespace OperatorManagement
 {
@@ -12,7 +12,7 @@
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>

 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>

 namespace OperatorManagement
 {
@@ -14,7 +14,7 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>

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


 namespace Ui
@@ -16,12 +16,12 @@
 #include <ParticipantManagement/Data/ppm_data_plugin.h>
 #include <Plugins/ExerciseManagement/Data/exm_data_plugin.h>

-#include <QListWidget>
-#include <QImage>
-#include <QFile>
-#include <QTimer>
-#include <QFileDialog>
-#include <QMenu>
+#include <QtWidgets/QListWidget>
+#include <QtGui/QImage>
+#include <QtCore/QFile>
+#include <QtCore/QTimer>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMenu>

 #include "group_edit_dialog.h"

@@ -8,7 +8,7 @@

 #include <LtsWidgets/lts_checkable_table_model.h>

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

 namespace OperatorManagement
 {
@@ -3,7 +3,7 @@

 #pragma once

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

 #include "group_model.h"

@@ -12,7 +12,7 @@
 #include <Plugins/OperatorManagement/opm_data_plugin_interface.h>

 #include <LtsPrinting/printing.h>
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 namespace OperatorManagement
 {
 OperatorOverviewDialog::OperatorOverviewDialog(const QString &windowTitle, QWidget *parent)
@@ -3,7 +3,7 @@

 #include "opm_settings_group.h"

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

 #include <LtsUtilsSettings/settings.h>
@@ -3,8 +3,8 @@

 #pragma once

-#include <QJsonObject>
-#include <QVector>
+#include <QtCore/QJsonObject>
+#include <QtCore/QVector>
 #include <OperatorManagement/logger.h>

 namespace LtsUtils { class OperatorSettings; }
@@ -4,7 +4,7 @@
 #include "operator_settings_create_new_dialog.h"
 #include "ui_operator_settings_create_new_dialog.h"
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QComboBox>
+#include <QtWidgets/QComboBox>

 namespace OperatorManagement
 {
@@ -21,13 +21,13 @@
 #include <OperatorManagement/opm_operator_rights.h>
 #include <ngltools/ngltools_dtg.h>

-#include <QBrush>
-#include <QFileDialog>
-#include <QKeyEvent>
-#include <QPainter>
-#include <QPen>
-#include <QTimer>
-#include <QUuid>
+#include <QtGui/QBrush>
+#include <QtWidgets/QFileDialog>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+#include <QtCore/QTimer>
+#include <QtCore/QUuid>


 static const char* DISABLE_FAST_CLICKS_PROPERTY = "DisableFastClicks";
@@ -12,8 +12,8 @@
 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>

 #include <QBasicTimer>
-#include <QPointer>
-#include <QLabel>
+#include <QtCore/QPointer>
+#include <QtWidgets/QLabel>

 enum LtsDate
 {
@@ -21,11 +21,11 @@

 #include <Common/LtsProjectionWorkstation/lts_projection_workstation.h>

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

 namespace OperatorManagement
 {
@@ -3,7 +3,7 @@

 #pragma once

-#include <QSet>
+#include <QtCore/QSet>
 #include <functional>

 class QWidget;