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
@@ -9,7 +9,7 @@
|
||||
*/
|
||||
|
||||
#include "abstract_display_widget.h"
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
|
||||
namespace LtsDataView
|
||||
{
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
#include "lts_data_view_export.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
class QModelIndex;
|
||||
|
||||
namespace LtsDataView
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
|
||||
namespace LtsDataView
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
* Created by Mike Wille, NLE, 2020-09-09
|
||||
*/
|
||||
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
|
||||
|
||||
namespace LtsDataView
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#include "icon_view_delegate.h"
|
||||
|
||||
#include <QGraphicsDropShadowEffect>
|
||||
#include <QGraphicsScene>
|
||||
#include <QtWidgets/QGraphicsScene>
|
||||
#include <QGraphicsPixmapItem>
|
||||
#include <QPainter>
|
||||
#include <QDebug>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
namespace LtsDataView
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "abstract_display_widget.h"
|
||||
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
|
||||
namespace LtsDataView
|
||||
{
|
||||
|
||||
@@ -13,9 +13,9 @@
|
||||
|
||||
#include "LtsWidgets/lts_frameless_dialog.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QDialog>
|
||||
#include <QAbstractTableModel>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtWidgets/QDialog>
|
||||
#include <QtCore/QAbstractTableModel>
|
||||
|
||||
namespace Ui {
|
||||
class LtsColumnsSetting;
|
||||
|
||||
@@ -21,20 +21,20 @@
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
|
||||
#include <QClipboard>
|
||||
#include <QComboBox>
|
||||
#include <QFile>
|
||||
#include <QFileDialog>
|
||||
#include <QKeyEvent>
|
||||
#include <QLineEdit>
|
||||
#include <QPushButton>
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QTimer>
|
||||
#include <QtGui/QClipboard>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtWidgets/QFileDialog>
|
||||
#include <QtGui/QKeyEvent>
|
||||
#include <QtWidgets/QLineEdit>
|
||||
#include <QtWidgets/QPushButton>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QScroller>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
/// get the list of visual index as they are display
|
||||
namespace LtsDataView
|
||||
|
||||
@@ -13,9 +13,9 @@
|
||||
#include <LtsDataView/lts_data_view_export.h>
|
||||
#include <LtsDataView/lts_columns_setting.h>
|
||||
|
||||
#include <QWidget>
|
||||
#include <QAbstractItemView>
|
||||
#include <QLineEdit>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtWidgets/QAbstractItemView>
|
||||
#include <QtWidgets/QLineEdit>
|
||||
#include <functional>
|
||||
|
||||
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
|
||||
#include "search_model.h"
|
||||
|
||||
#include <QFont>
|
||||
#include <QGuiApplication>
|
||||
#include <QIcon>
|
||||
#include <QtGui/QFont>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QtGui/QIcon>
|
||||
#include <QPalette>
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
|
||||
#include <LtsDataView/lts_data_view_export.h>
|
||||
|
||||
#include <QAbstractItemModel>
|
||||
#include <QSet>
|
||||
#include <QString>
|
||||
#include <QPointer>
|
||||
#include <QtCore/QAbstractItemModel>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QPointer>
|
||||
|
||||
|
||||
namespace LtsDataView
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
#include <lts_data_view.h>
|
||||
|
||||
#include <QApplication>
|
||||
#include <QDebug>
|
||||
#include <QLabel>
|
||||
#include <QStandardItem>
|
||||
#include <QStandardItemModel>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtGui/QStandardItem>
|
||||
#include <QtGui/QStandardItemModel>
|
||||
#include <QElapsedTimer>
|
||||
#include <QScrollArea>
|
||||
#include <QtWidgets/QScrollArea>
|
||||
#include <QScroller>
|
||||
|
||||
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
|
||||
#include "tree_view.h"
|
||||
|
||||
#include <QGuiApplication>
|
||||
#include <QKeyEvent>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QtGui/QKeyEvent>
|
||||
|
||||
namespace LtsDataView
|
||||
{
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
|
||||
namespace LtsDataView
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
#include "tree_view_delegate.h"
|
||||
#include "search_model.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QComboBox>
|
||||
#include <QTimer>
|
||||
//#include <QDebug>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtCore/QTimer>
|
||||
//#include <QtCore/QDebug>
|
||||
|
||||
namespace LtsDataView
|
||||
{
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
#include <LtsWidgets/lts_column_filter_proxy_model.h>
|
||||
|
||||
#include <QStyledItemDelegate>
|
||||
#include <QStyle>
|
||||
#include <QtWidgets/QStyledItemDelegate>
|
||||
#include <QtWidgets/QStyle>
|
||||
|
||||
|
||||
namespace LtsDataView
|
||||
|
||||
Reference in new issue
Block a user