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>
This commit is contained in:
torstenandCopilot committed
1 parent
3d3c3b48fe
commit
7a6be7474e
2839 files changed
+6495
-6513
No files matched your search
+2
-2
@@ -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>
|
||||
|
||||
+2
-2
@@ -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>
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <Services/InfrastructureManagement/ism.hpp>
|
||||
|
||||
namespace BuildingViewer
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -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
|
||||
{
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <Common/TopicEditorBase/topic_editor_base.h>
|
||||
#include <QElapsedTimer>
|
||||
#include <QThread>
|
||||
#include <QtCore/QThread>
|
||||
#include <utility>
|
||||
|
||||
namespace BuildingViewer
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+4
-4
@@ -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
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
+2
-2
@@ -3,9 +3,9 @@
|
||||
|
||||
#include "bdv_viewer_data_model.h"
|
||||
|
||||
#include <QColor>
|
||||
#include <QtGui/QColor>
|
||||
#include <QPalette>
|
||||
#include <QGuiApplication>
|
||||
#include <QtGui/QGuiApplication>
|
||||
|
||||
|
||||
namespace BuildingViewer
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <Common/bdv_controller.h>
|
||||
|
||||
#include <QKeyEvent>
|
||||
#include <QtGui/QKeyEvent>
|
||||
|
||||
namespace BuildingViewer
|
||||
{
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <Common/logger.h>
|
||||
#include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+2
-2
@@ -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"
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+3
-3
@@ -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>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <QJsonValue>
|
||||
#include <QtCore/QJsonValue>
|
||||
|
||||
namespace BuildingViewer
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user