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,9 +6,9 @@
 #include <vector>
 #include <map>
 #include <string>
-#include <QJsonValue>
-#include <QList>
-#include <QString>
+#include <QtCore/QJsonValue>
+#include <QtCore/QList>
+#include <QtCore/QString>
 #include <exccommands.h>

 class QWidget;
@@ -28,15 +28,15 @@
 #include <osgViewer/CompositeViewer>
 #include <osgQt/GraphicsWindowQt>
 #include <QDesktopWidget>
-#include <QApplication>
+#include <QtWidgets/QApplication>

 #include "buildingmanager.h"
 #include "viewwidget.h"

-#include <QJsonArray>
-#include <QMessageBox>
+#include <QtCore/QJsonArray>
+#include <QtWidgets/QMessageBox>
 #include <QDirIterator>
-#include <QScreen>
+#include <QtGui/QScreen>

 #ifdef BUILD_WITH_GSTREAMER
 #include "videocomponent.h"
@@ -7,8 +7,8 @@
 #include "viewwidgetcontainer.h"
 #include "viewwidgetstate.h"

-#include <QPointer>
-#include <QWidget>
+#include <QtCore/QPointer>
+#include <QtWidgets/QWidget>
 #include <algorithm>
 #include <dtEntity/commandmessages.h>
 #include <dtEntity/core.h>
@@ -2,9 +2,9 @@
 #include "viewwidget.h"
 #include "viewerinterfaceimpl.h"

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


 namespace VCtrl
@@ -2,10 +2,10 @@
 #define VCTRL_CTRLMAINWINDOW_H


-#include <QDialog>
-#include <QSlider>
-#include <QTimer>
-#include <QHash>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QSlider>
+#include <QtCore/QTimer>
+#include <QtCore/QHash>

 #include "viewerinterface.h"

@@ -1,8 +1,8 @@
 #include "viewwidget.h"
 #include "viewwidgetstate.h"
-#include <QApplication>
-#include <QVBoxLayout>
-#include <QEvent>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QVBoxLayout>
+#include <QtCore/QEvent>
 #include <QGLWidget>
 #include <QWindow>
 #include <dtEntity/log.h>
@@ -1,9 +1,9 @@
 #pragma once

-#include <QFrame>
-#include <QColor>
-#include <QWidget>
-#include <QDockWidget>
+#include <QtWidgets/QFrame>
+#include <QtGui/QColor>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QDockWidget>
 #include "ui_viewwidget.h"
 #include "viewerinterface.h"

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

 #include <string>

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

 #include "cameraviewposition.h"

@@ -5,7 +5,7 @@
 #include <osg/BlendFunc>
 #include <osg/BlendColor>
 #include <QStringRef>
-#include <QVector>
+#include <QtCore/QVector>

 namespace VCtrl
 {
@@ -1,7 +1,7 @@


 #include "bdv_bgviewer_widget_container.h"
-#include <QGridLayout>
+#include <QtWidgets/QGridLayout>

 namespace BuildingViewer
 {
@@ -3,8 +3,8 @@

 #pragma once

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

 namespace BuildingViewer
 {
@@ -3,7 +3,7 @@
 #include "bdv_communication_interface_internal.h"

 #include <ParticipantManagement/ppm_translation.h>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <cassert>
 #include <utility>

@@ -11,14 +11,14 @@
 #include <InfrastructureManagement/Shared/ism_mounting_point.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include <ParticipantManagement/ppm_data_plugin_interface.h>
-#include <QByteArray>
-#include <QHash>
-#include <QList>
-#include <QMap>
-#include <QObject>
-#include <QString>
+#include <QtCore/QByteArray>
+#include <QtCore/QHash>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <QVector3D>
-#include <QVector>
+#include <QtCore/QVector>
 #include <string>

 namespace VCtrl
@@ -10,8 +10,8 @@
 #include <LtsAppManager/lts_app_manager.h>
 #include <LtsPluginManager/lts_plugin_manager.h>
 #include <LtsSession/lts_session.h>
-#include <QDir>
-#include <QMessageBox>
+#include <QtCore/QDir>
+#include <QtWidgets/QMessageBox>
 #include <ngltools/ngltools_filesystem.h>
 #include <utility>

@@ -10,9 +10,9 @@
 #include <BuildingViewer/share/exccommands.h>
 #include <LtsSession/lts_session_data_dds.h>
 #include <LtsWidgets/lts_dialog.h>
-#include <QObject>
-#include <QString>
-#include <QTimer>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QTimer>
 #include <memory>

 class QWidget;
@@ -14,16 +14,16 @@
 #include <LtsUtilsSettings/settings.h>
 #include <LtsWidgets/lts_message_dialog.h>
 #include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
-#include <QDateTime>
-#include <QDir>
-#include <QFile>
-#include <QJsonArray>
-#include <QJsonDocument>
-#include <QJsonObject>
+#include <QtCore/QDateTime>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QJsonArray>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QJsonParseError>
-#include <QPixmap>
-#include <QTimer>
-#include <QXmlStreamWriter>
+#include <QtGui/QPixmap>
+#include <QtCore/QTimer>
+#include <QtCore/QXmlStreamWriter>
 #include <ngltools/ngltools_filesystem.h>
 #include <utility>

@@ -19,10 +19,10 @@
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
 #include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
 #include <Plugins/SituationReplay/srp_data_plugin_interface.h>
-#include <QHash>
-#include <QObject>
-#include <QTimer>
-#include <QVector>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QTimer>
+#include <QtCore/QVector>
 #include <functional>
 #include <viewerinterface.h>

@@ -3,8 +3,8 @@

 #pragma once

-#include <QString>
-#include <QJsonObject>
+#include <QtCore/QString>
+#include <QtCore/QJsonObject>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
 #include "buildingviewercommon_export.h"

@@ -4,7 +4,7 @@
 #pragma once

 #include <memory>
-#include <QObject>
+#include <QtCore/QObject>
 #include "buildingviewercommon_export.h"

 namespace AdvancedSymbology
@@ -3,9 +3,9 @@
 #include "bdv_edit_model.h"

 #include <Common/logger.h>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QPalette>
-#include <QTableWidget>
+#include <QtWidgets/QTableWidget>
 #include <QtCore/QDebug>
 #include <Services/InfrastructureManagement/ism.hpp>
 #include <nglwidgets/ngltreeitem.h>
@@ -7,8 +7,8 @@
 #include <Common/logger.h>
 #include <Plugins/Buildings/bld_data_plugin_interface.h>
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
-#include <QMap>
-#include <QSortFilterProxyModel>
+#include <QtCore/QMap>
+#include <QtCore/QSortFilterProxyModel>
 #include <functional>
 #include <nglwidgets/ngltreemodel.h>

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

 #pragma once

-#include <QString>
+#include <QtCore/QString>
 #include <Services/InfrastructureManagement/ism.hpp>

 namespace BuildingViewer
@@ -8,7 +8,7 @@
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsAppManager/lts_app_manager.h>
 #include <LtsPluginManager/lts_plugin_manager.h>
-#include <QDebug>
+#include <QtCore/QDebug>


 namespace BuildingViewer
@@ -5,7 +5,7 @@
 #include <Plugins/BuildingViewer/Common/logger.h>
 #include <Plugins/BuildingViewer/bdv_viewer_gui_plugin_interface.h>
 #include <Plugins/SituationReplay/srp_gui_plugin_interface.h>
-#include <QObject>
+#include <QtCore/QObject>

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

 #include <Common/TopicEditorBase/topic_editor_base.h>
 #include <QElapsedTimer>
-#include <QThread>
+#include <QtCore/QThread>
 #include <utility>

 namespace BuildingViewer
@@ -4,7 +4,7 @@

 #include <BuildingViewer/bdv_viewer_gui_plugin_interface.h>
 #include <Common/logger.h>
-#include <QSharedPointer>
+#include <QtCore/QSharedPointer>
 #include <SituationReplay/srp_gui_plugin_interface.h>

 namespace BuildingViewer
@@ -8,8 +8,8 @@

 #include <Common/bdv_controller.h>
 #include <LtsSession/lts_session.h>
-#include <QDir>
-#include <QJsonDocument>
+#include <QtCore/QDir>
+#include <QtCore/QJsonDocument>
 #include <ngltools/ngltools_filesystem.h>
 #include <utility>

@@ -17,9 +17,9 @@
 #include <Common/BgViewer/viewerCtrl/viewwidgetstate.h>
 #include <Common/bdv_helper.h>
 #include <LtsUtils/LtsUtilsCore/qpoint3d.h>
-#include <QFile>
+#include <QtCore/QFile>
 #else
-#include <QThread>
+#include <QtCore/QThread>
 #endif

 namespace BuildingViewer
@@ -4,8 +4,8 @@

 #include <Plugins/BuildingViewer/bdv_viewer_gui_plugin_interface.h>
 #include <Plugins/SituationReplay/srp_gui_plugin_interface.h>
-#include <QObject>
-#include <QVector>
+#include <QtCore/QObject>
+#include <QtCore/QVector>
 #include <memory>

 namespace NGL
@@ -3,9 +3,9 @@

 #include "bdv_viewer_data_model.h"

-#include <QColor>
+#include <QtGui/QColor>
 #include <QPalette>
-#include <QGuiApplication>
+#include <QtGui/QGuiApplication>


 namespace BuildingViewer
@@ -7,7 +7,7 @@

 #include <Common/bdv_controller.h>

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

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

 #include <Common/logger.h>
 #include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
-#include <QWidget>
+#include <QtWidgets/QWidget>

 namespace Ui
 {
@@ -12,8 +12,8 @@
 #include <LtsWidgets/lts_base_layout_widget.h>
 #include <LtsAppManager/lts_app_manager.h>

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

 #include "bdv_viewer_data_dialog.h"
 #include "bdv_viewer_data_view.h"
@@ -10,7 +10,7 @@
 #include <LtsWidgets/lts_dialog.h>
 #include <Common/logger.h>
 #include "TopicEditor/topic_editor.h"
-#include <QTimer>
+#include <QtCore/QTimer>


 class QVBoxLayout;
@@ -7,9 +7,9 @@
 #include <LtsSession/lts_session_manager.h>
 #include <PluginInterfaces/data_plugin_interface.h>

-#include <QJsonArray>
-#include <QKeyEvent>
-#include <QFileDialog>
+#include <QtCore/QJsonArray>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QFileDialog>

 #include "bdv_viewer_state_model.h"
 #include <BuildingViewer/share/exccommands.h>
@@ -4,7 +4,7 @@
 #pragma once

 #include <LtsWidgets/lts_abstract_table_model.h>
-#include <QJsonValue>
+#include <QtCore/QJsonValue>

 namespace BuildingViewer
 {