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
+1
-1
@@ -8,7 +8,7 @@
|
||||
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
+3
-3
@@ -5,10 +5,10 @@
|
||||
#include <InfrastructureManagement/ism_data_plugin_interface.h>
|
||||
#include <InfrastructureManagement/ism_translation.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
+8
-8
@@ -11,14 +11,14 @@
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QFileDialog>
|
||||
#include <QTreeView>
|
||||
#include <QTextStream>
|
||||
#include <QMenu>
|
||||
#include <QAction>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtWidgets/QFileDialog>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QtCore/QTextStream>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtGui/QAction>
|
||||
#include <QtCore/QTimer>
|
||||
#include <vector>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include "ism_edit_asset_dialog.h"
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+5
-5
@@ -7,11 +7,11 @@
|
||||
#include <InfrastructureManagement/Shared/ism_mounting_point.h>
|
||||
#include <ComponentMonitor/cmo_data_plugin_interface.h>
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
#include <QDateTime>
|
||||
#include <QBrush>
|
||||
#include <QSet>
|
||||
#include <QTimer>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtGui/QBrush>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include "ism_plan_dialog_model.h"
|
||||
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
+3
-3
@@ -15,9 +15,9 @@
|
||||
#include <LtsWidgets/lts_overlay_loading.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
using namespace LtsUtils;
|
||||
using namespace LtsWidgets;
|
||||
|
||||
+3
-3
@@ -4,11 +4,11 @@
|
||||
#include "ism_exercise_assignment_dialog_model.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QFont>
|
||||
#include <QGuiApplication>
|
||||
#include <QtGui/QFont>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <InfrastructureManagement/ism_translation.h>
|
||||
#ifdef LTS_DEBUG
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -5,8 +5,8 @@
|
||||
|
||||
#include <InfrastructureManagement/logger.h>
|
||||
#include <ExerciseManagement/exm.hpp>
|
||||
#include <QAbstractItemModel>
|
||||
#include <QSet>
|
||||
#include <QtCore/QAbstractItemModel>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <InfrastructureManagement/logger.h>
|
||||
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QtCore/QSortFilterProxyModel>
|
||||
#include <LtsUtilsCore/json_object.h>
|
||||
|
||||
using namespace LtsUtils;
|
||||
|
||||
+3
-3
@@ -4,11 +4,11 @@
|
||||
#include "ism_exercise_assignment_dialog_requesters.h"
|
||||
#include "ism_exercise_assignment_dialog_model.h"
|
||||
|
||||
#include <QFont>
|
||||
#include <QGuiApplication>
|
||||
#include <QtGui/QFont>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QMimeData>
|
||||
#ifdef LTS_DEBUG
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
+3
-3
@@ -7,9 +7,9 @@
|
||||
|
||||
#include <InfrastructureManagement/ism_ftc.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
#include <QPair>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QPair>
|
||||
|
||||
|
||||
namespace InfrastructureManagement
|
||||
|
||||
+3
-3
@@ -11,9 +11,9 @@
|
||||
#include <AudioVideoManagement/ava_session.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
+7
-7
@@ -20,13 +20,13 @@
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
|
||||
#include <QItemDelegate>
|
||||
#include <QTreeView>
|
||||
#include <QListWidget>
|
||||
#include <QMenu>
|
||||
#include <QHeaderView>
|
||||
#include <QScrollBar>
|
||||
#include <QTimer>
|
||||
#include <QtWidgets/QItemDelegate>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QtWidgets/QListWidget>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtWidgets/QHeaderView>
|
||||
#include <QtWidgets/QScrollBar>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
using namespace LtsWidgets;
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
#include <LtsDataView/check_state_proxy_model.h>
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
|
||||
#include <QItemDelegate>
|
||||
#include <QtWidgets/QItemDelegate>
|
||||
|
||||
|
||||
class QCheckBox;
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
#include "ism_mounting_point_list_dialog_checkbox_delegate.h"
|
||||
#include "ism_mounting_point_list_dialog_model.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
|
||||
|
||||
namespace InfrastructureManagement
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "ism_mounting_point_list_dialog_checkbox_delegate.h"
|
||||
|
||||
#include <QItemDelegate>
|
||||
#include <QtWidgets/QItemDelegate>
|
||||
|
||||
|
||||
namespace InfrastructureManagement
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
|
||||
namespace InfrastructureManagement
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include <InfrastructureManagement/ism_translation.h>
|
||||
#include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <InfrastructureManagement/logger.h>
|
||||
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
#include <nglwidgets/ngltreemodel.h>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <QApplication>
|
||||
#include <QtWidgets/QApplication>
|
||||
|
||||
using namespace InfrastructureManagement;
|
||||
|
||||
|
||||
+5
-5
@@ -7,11 +7,11 @@
|
||||
|
||||
#include <InfrastructureManagement/ism_translation.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <QMenu>
|
||||
#include <QAction>
|
||||
#include <QTreeView>
|
||||
#include <QHeaderView>
|
||||
#include <QScrollBar>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtGui/QAction>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QtWidgets/QHeaderView>
|
||||
#include <QtWidgets/QScrollBar>
|
||||
|
||||
using namespace InfrastructureManagement;
|
||||
ConflictsDialog::ConflictsDialog(const QString &menuGroup, QWidget *parent)
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "ism_overview_conflicts_model.h"
|
||||
#include <InfrastructureManagement/ism_translation.h>
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QElapsedTimer>
|
||||
|
||||
|
||||
|
||||
+4
-4
@@ -11,10 +11,10 @@
|
||||
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
|
||||
#include <QSet>
|
||||
#include <QList>
|
||||
#include <QHash>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace LtsSession
|
||||
{
|
||||
|
||||
+4
-4
@@ -13,10 +13,10 @@
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
|
||||
#include <QTreeView>
|
||||
#include <QDateTime>
|
||||
#include <QComboBox>
|
||||
#include <QTimer>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtCore/QTimer>
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
|
||||
+5
-5
@@ -4,16 +4,16 @@
|
||||
#include "ism_overview_mounting_point_list_dialog.h"
|
||||
#include "ui_ism_overview_mounting_point_list_dialog.h"
|
||||
|
||||
#include <QTreeView>
|
||||
#include <QListWidget>
|
||||
#include <QMenu>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QtWidgets/QListWidget>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <qlabel.h>
|
||||
#include <InfrastructureManagement/ism_translation.h>
|
||||
#include <InfrastructureManagement/Shared/ism_mounting_point.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <QMessageBox>
|
||||
#include <QHeaderView>
|
||||
#include <QtWidgets/QMessageBox>
|
||||
#include <QtWidgets/QHeaderView>
|
||||
#include <qscrollbar.h>
|
||||
|
||||
using namespace InfrastructureManagement;
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
|
||||
#include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
|
||||
|
||||
#include <QDebug>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <InfrastructureManagement/logger.h>
|
||||
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
#include <nglwidgets/ngltreemodel.h>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "new_plan_dialog.h"
|
||||
#include "ui_new_plan_dialog.h"
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <InfrastructureManagement/ism_combobox_gui_plugin_interface.h>
|
||||
#include <Plugins/InfrastructureManagement/Data/ism_data_plugin.h>
|
||||
#include <Plugins/InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
|
||||
#include <QDialog>
|
||||
#include <QtWidgets/QDialog>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+2
-2
@@ -12,8 +12,8 @@
|
||||
#include <ConnectDialog/connect_dialog_nt.h>
|
||||
#include <LtsWidgets/lts_global_wait_dialog.h>
|
||||
|
||||
#include <QCloseEvent>
|
||||
#include <QPushButton>
|
||||
#include <QtGui/QCloseEvent>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
#define DEVEL
|
||||
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
|
||||
#include <InfrastructureManagement/logger.h>
|
||||
|
||||
#include <QDialog>
|
||||
#include <QtWidgets/QDialog>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include <InfrastructureManagement/ism_translation.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
using namespace InfrastructureManagement;
|
||||
ScheduleDifferencesListDialog::ScheduleDifferencesListDialog(const QString &menuGroup, QWidget *parent)
|
||||
|
||||
+3
-3
@@ -2,9 +2,9 @@
|
||||
|
||||
#include <LtsTimeline/timeline_header_view.h>
|
||||
|
||||
#include <QGuiApplication>
|
||||
#include <QModelIndex>
|
||||
#include <QPainter>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QStyleOptionViewItem>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <InfrastructureManagement/ism_enums.hpp>
|
||||
#include <InfrastructureManagement/settings.h>
|
||||
#include <QScrollBar>
|
||||
#include <QtWidgets/QScrollBar>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@
|
||||
#include <Plugins/InfrastructureManagement/Data/ism_data_plugin.h>
|
||||
#include <Plugins/InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "ism_plan_tln_model.h"
|
||||
#include <utility>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
|
||||
using namespace LtsTimeline;
|
||||
|
||||
+3
-3
@@ -9,9 +9,9 @@
|
||||
#include <InfrastructureManagement/ism_operator_rights.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <QFileDialog>
|
||||
#include <QMenu>
|
||||
#include <QTextStream>
|
||||
#include <QtWidgets/QFileDialog>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtCore/QTextStream>
|
||||
|
||||
using namespace InfrastructureManagement;
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <InfrastructureManagement/logger.h>
|
||||
#include <InfrastructureManagement/ism_resource_management_gui_plugin_interface.h>
|
||||
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#include "ism_building_mount_point_model.h"
|
||||
#include <utility>
|
||||
#include <QDataStream>
|
||||
#include <QVector>
|
||||
#include <QtCore/QDataStream>
|
||||
#include <QtCore/QVector>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
#include <InfrastructureManagement/ism_translation.h>
|
||||
#include <InfrastructureManagement/Shared/ism_mounting_point.h>
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <InfrastructureManagement/logger.h>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QSet>
|
||||
#include <QtCore/QSortFilterProxyModel>
|
||||
#include <QtCore/QSet>
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
struct StructureElementTreeItem : public NGLTreeItem
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
|
||||
namespace InfrastructureManagement
|
||||
|
||||
Reference in new issue
Block a user