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
@@ -9,8 +9,8 @@
|
||||
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <QDateTime>
|
||||
#include <QInputDialog>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtWidgets/QInputDialog>
|
||||
#include <SituationMap/GeometryModel/geometry_model.h>
|
||||
#include <SituationMap/GeometryModel/geometry_model_factory.h>
|
||||
|
||||
|
||||
+6
-6
@@ -5,12 +5,12 @@
|
||||
#include <GeometryModel/geometry_model.h>
|
||||
#include <GeometryModel/geometry_model_factory.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QHash>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QPointF>
|
||||
#include <QString>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QtCore/QString>
|
||||
#include <optional>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
+6
-6
@@ -4,13 +4,13 @@
|
||||
#include <FileManagement/flm_enums.hpp>
|
||||
#include <FileManagement/logger.h>
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
#include <QAbstractListModel>
|
||||
#include <QByteArray>
|
||||
#include <QDataStream>
|
||||
#include <QList>
|
||||
#include <QtCore/QAbstractListModel>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QDataStream>
|
||||
#include <QtCore/QList>
|
||||
#include <QMimeData>
|
||||
#include <QObject>
|
||||
#include <QStandardItemModel>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtGui/QStandardItemModel>
|
||||
|
||||
namespace FileManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QHash>
|
||||
#include <QString>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QString>
|
||||
#include <memory>
|
||||
|
||||
#include "flm_hq_report_symbol_creator.h"
|
||||
|
||||
+3
-3
@@ -3,9 +3,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QLabel>
|
||||
#include <QObject>
|
||||
#include <QPixmap>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtGui/QPixmap>
|
||||
|
||||
|
||||
class RatioAwareLabel : public QLabel
|
||||
|
||||
+3
-3
@@ -11,9 +11,9 @@
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <Plugins/PresentationManagement/Gui/Script/Common/topic_designer.h>
|
||||
#include <QInputDialog>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtWidgets/QInputDialog>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QJsonParseError>
|
||||
#include <TopicEditorBase/topic_previewer.h>
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <Plugins/FileManagement/Gui/Explorer/flm_preview_playback.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <QPointer>
|
||||
#include <QtCore/QPointer>
|
||||
#include <TopicEditorBase/topic_editor_base.h>
|
||||
|
||||
namespace Ui
|
||||
|
||||
+3
-3
@@ -24,9 +24,9 @@
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
|
||||
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
|
||||
#include <QFileDialog>
|
||||
#include <QFileInfo>
|
||||
#include <QMenu>
|
||||
#include <QtWidgets/QFileDialog>
|
||||
#include <QtCore/QFileInfo>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
#include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
|
||||
#include <QDateTime>
|
||||
#include <QGuiApplication>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QPalette>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
|
||||
namespace FileManagement
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#include <ParticipantManagement/ppm_dtc.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QtCore/QSortFilterProxyModel>
|
||||
#include <nglwidgets/ngltreemodel.h>
|
||||
|
||||
class QTableWidget;
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <FileManagement/flm_translation.h>
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace FileManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
|
||||
namespace Ui
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <Services/FileManagement/flm_ftc.h>
|
||||
#include <Services/FileManagement/logger.h>
|
||||
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+8
-8
@@ -29,14 +29,14 @@
|
||||
|
||||
#include <TopicEditor/topic_editor.h>
|
||||
|
||||
#include <QBuffer>
|
||||
#include <QCoreApplication>
|
||||
#include <QPointer>
|
||||
#include <QFileInfo>
|
||||
#include <QTextStream>
|
||||
#include <QJsonDocument>
|
||||
#include <QVector>
|
||||
#include <QUrlQuery>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QPointer>
|
||||
#include <QtCore/QFileInfo>
|
||||
#include <QtCore/QTextStream>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QUrlQuery>
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include <FileManagement/logger.h>
|
||||
#include <Services/FileManagement/flm_ftc.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace FileManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <FileManagement/flm_ftc.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace FileManagement
|
||||
|
||||
+3
-3
@@ -8,9 +8,9 @@
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
#include "settings.h"
|
||||
|
||||
#include <QFileInfo>
|
||||
#include <QProcess>
|
||||
#include <QTemporaryFile>
|
||||
#include <QtCore/QFileInfo>
|
||||
#include <QtCore/QProcess>
|
||||
#include <QtCore/QTemporaryFile>
|
||||
|
||||
namespace FileManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
#include "flm_get_content.h"
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <settings.h>
|
||||
|
||||
#include <QScreen>
|
||||
#include <QtGui/QScreen>
|
||||
|
||||
#define PREVIEW_MIN_WIDTH 1200
|
||||
#define PREVIEW_MIN_HEIGHT 800
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
#include <FileManagement/logger.h>
|
||||
#include <Services/FileManagement/flm_ftc.h>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
#define ZOOM_MIN 0.5
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
#include <FileManagement/logger.h>
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
class QLineEdit;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "settings.h"
|
||||
|
||||
#include <QSettings>
|
||||
#include <QtCore/QSettings>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#include <Plugins/FileManagement/flm_combobox_gui_plugin_interface.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
|
||||
#include <QComboBox>
|
||||
#include <QtWidgets/QComboBox>
|
||||
|
||||
namespace FileManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace LtsWidgets
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user