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
@@ -12,14 +12,14 @@
 #include "qpoint3d.h"
 #include "sfm_bytemessage_converter.h"

-#include <QCoreApplication>
-#include <QDebug>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QMap>
-#include <QString>
-#include <QTest>
-#include <QVector>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtTest/QTest>
+#include <QtCore/QVector>

 #define SUPPORT_QBITARRAY
 #include "dds_bitarray.h"
@@ -2,7 +2,7 @@

 #pragma once

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

 class LtsUtilsTest : public QObject
 {
@@ -1,8 +1,8 @@
 #pragma once

 #include <QEventLoop>
-#include <QObject>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
 #include <memory>

 namespace LtsUtils
@@ -2,9 +2,9 @@

 #pragma once

-#include <QMetaObject>
-#include <QObject>
-#include <QPointer>
+#include <QtCore/QMetaObject>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 #include <QtGlobal>
 #include <type_traits>

@@ -2,8 +2,8 @@

 #pragma once

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

 namespace LtsUtils
 {
@@ -2,14 +2,14 @@

 #pragma once

-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QJsonValue>
-#include <QMap>
-#include <QString>
-#include <QVector>
+#include <QtCore/QJsonValue>
+#include <QtCore/QMap>
+#include <QtCore/QString>
+#include <QtCore/QVector>
 #include <cstdint>
 #include <exception>
 #include <limits>
@@ -2,8 +2,8 @@

 #include "ltsutilscore_export.h"

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

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

 #include "lts_translatable_identifier.h"

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

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

 #include "ltsutilscore_export.h"

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

 namespace LtsUtils
 {
@@ -2,9 +2,9 @@

 #include "pgarray.h"

-#include <QDebug>
+#include <QtCore/QDebug>
 #include <QStringView>
-#include <QVector>
+#include <QtCore/QVector>
 #include <functional>
 #include <ltsutilscore_export.h>

@@ -1,7 +1,7 @@


 #pragma once
-#include <QString>
+#include <QtCore/QString>
 #include <cstdint>
 #include <map>
 #include <vector>
@@ -2,7 +2,7 @@

 #include "promise.h"

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

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

 #include "ltsutilscore_export.h"

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

 class QTimer;
@@ -2,9 +2,9 @@

 #include "promise.h"

-#include <QDebug>
-#include <QTest>
-#include <QTimer>
+#include <QtCore/QDebug>
+#include <QtTest/QTest>
+#include <QtCore/QTimer>

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

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

 namespace LtsUtils
 {
@@ -5,8 +5,8 @@
 #include "ltsutilscore_export.h"
 #include "qpoint3d.h"

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

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

 #include "qpoint3d.h"

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

 using namespace LtsUtils;

@@ -4,7 +4,7 @@

 #include "ltsutilscore_export.h"

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

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

-#include <QDateTime>
-#include <QVariant>
+#include <QtCore/QDateTime>
+#include <QtCore/QVariant>
 #include <ngltools/ngltools_dtg.h>

 namespace LtsUtils
@@ -4,9 +4,9 @@
 #include "ltsutilsguiconnectdialog_export.h"

 #include <LtsWidgets/lts_frameless_dialog.h>
-#include <QObject>
-#include <QTimer>
-#include <QWidget>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtWidgets/QWidget>
 #include <functional>

 namespace Ui
@@ -4,7 +4,7 @@
 #include "ltsutilsguiconnectdialog_export.h"

 #include <LtsWidgets/lts_frameless_dialog.h>
-#include <QObject>
+#include <QtCore/QObject>
 #include <functional>

 class QTimer;
@@ -2,12 +2,12 @@

 #include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
 #include <LtsUtils/LtsUtilsCore/dds_vector.h>
-#include <QBuffer>
-#include <QFile>
-#include <QIcon>
-#include <QImage>
-#include <QPainter>
-#include <QPixmap>
+#include <QtCore/QBuffer>
+#include <QtCore/QFile>
+#include <QtGui/QIcon>
+#include <QtGui/QImage>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>
 #include <QSvgRenderer>

 namespace LtsUtils
@@ -4,8 +4,8 @@

 #include <LtsUtils/LtsUtilsCore/ltsutilscore_export.h>

-#include <QSize>
-#include <QString>
+#include <QtCore/QSize>
+#include <QtCore/QString>
 #include <cstdint>
 #include <vector>

@@ -5,13 +5,13 @@
 #ifdef REQUEST_HELPER_WITH_GUI
 #include <LtsWidgets/lts_global_wait_dialog.h>
 #include <LtsWidgets/lts_message_dialog.h>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #endif

 #include <QEventLoop>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QTimer>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QTimer>
 #include <memory>

 #define DEBUG
@@ -11,9 +11,9 @@
 #endif

 #include <Core/core_types.h>
-#include <QObject>
-#include <QPair>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QPair>
+#include <QtCore/QVector>
 #include <functional>
 #include <optional>

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

 #include <LtsPluginManager/lts_plugin_loader.h>
 #include <PluginInterfaces/style_plugin_interface.h>
-#include <QDebug>
-#include <QPluginLoader>
+#include <QtCore/QDebug>
+#include <QtCore/QPluginLoader>

 namespace LtsUtils
 {
@@ -4,7 +4,7 @@

 #include "ltsutilsguistylemanager_export.h"

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

 class QPluginLoader;

@@ -2,16 +2,16 @@

 #include "settings.h"

-#include <QByteArray>
-#include <QCoreApplication>
-#include <QDataStream>
-#include <QDebug>
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QRegularExpression>
-#include <QVector>
+#include <QtCore/QByteArray>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDataStream>
+#include <QtCore/QDebug>
+#include <QtCore/QFile>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
+#include <QtCore/QRegularExpression>
+#include <QtCore/QVector>

 namespace LtsUtils
 {
@@ -3,9 +3,9 @@

 #include <ltsutilssettings_export.h>

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

 class QJsonObject;