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,9 +1,9 @@
|
||||
#include "lts_dummy_widget.h"
|
||||
|
||||
#include <LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
|
||||
#include <QDebug>
|
||||
#include <QEvent>
|
||||
#include <QIcon>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QEvent>
|
||||
#include <QtGui/QIcon>
|
||||
|
||||
namespace LtsMultiMonitor
|
||||
{
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#pragma once
|
||||
#include "ltsmultimonitor_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
class QEvent;
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
#include "lts_magic_corner.h"
|
||||
|
||||
#include <LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
|
||||
#include <QDebug>
|
||||
#include <QHBoxLayout>
|
||||
#include <QIcon>
|
||||
#include <QLabel>
|
||||
#include <QMouseEvent>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtWidgets/QHBoxLayout>
|
||||
#include <QtGui/QIcon>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtGui/QMouseEvent>
|
||||
#include <QtCore/QTimer>
|
||||
#include <chrono>
|
||||
|
||||
#define SMOL 48
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#pragma once
|
||||
#include "lts_screen_base.h"
|
||||
|
||||
#include <QDialog>
|
||||
#include <QObject>
|
||||
#include <QPixmap>
|
||||
#include <QtWidgets/QDialog>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtGui/QPixmap>
|
||||
|
||||
class QMouseEvent;
|
||||
class QPaintEvent;
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <QDebug>
|
||||
#include <QGuiApplication>
|
||||
#include <QMessageBox>
|
||||
#include <QPointer>
|
||||
#include <QRect>
|
||||
#include <QScreen>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QtWidgets/QMessageBox>
|
||||
#include <QtCore/QPointer>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <utility>
|
||||
#ifdef Q_OS_WIN
|
||||
#include <QtPlatformHeaders/qwindowswindowfunctions.h>
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
#include "ltsmultimonitor_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QVector>
|
||||
#include <memory>
|
||||
|
||||
namespace LtsMultiMonitor
|
||||
|
||||
+9
-9
@@ -8,15 +8,15 @@
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/promise.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
#include <QCloseEvent>
|
||||
#include <QColor>
|
||||
#include <QDebug>
|
||||
#include <QPaintEvent>
|
||||
#include <QPainter>
|
||||
#include <QPen>
|
||||
#include <QRect>
|
||||
#include <QSize>
|
||||
#include <QStyle>
|
||||
#include <QtGui/QCloseEvent>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtGui/QPaintEvent>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPen>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtCore/QSize>
|
||||
#include <QtWidgets/QStyle>
|
||||
|
||||
namespace LtsMultiMonitor
|
||||
{
|
||||
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
#include <QDialog>
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
#include <QtWidgets/QDialog>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
class QScreen;
|
||||
class QPainter;
|
||||
|
||||
+8
-8
@@ -8,14 +8,14 @@
|
||||
#include "lts_screen_normal.h"
|
||||
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
#include <QColor>
|
||||
#include <QDebug>
|
||||
#include <QPaintEvent>
|
||||
#include <QPainter>
|
||||
#include <QPen>
|
||||
#include <QRect>
|
||||
#include <QSize>
|
||||
#include <QStyle>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtGui/QPaintEvent>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPen>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtCore/QSize>
|
||||
#include <QtWidgets/QStyle>
|
||||
|
||||
namespace LtsMultiMonitor
|
||||
{
|
||||
|
||||
+3
-3
@@ -1,9 +1,9 @@
|
||||
#pragma once
|
||||
#include "lts_multi_monitor_selector_base.h"
|
||||
|
||||
#include <QDialog>
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
#include <QtWidgets/QDialog>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
class QScreen;
|
||||
class QPaintEvent;
|
||||
|
||||
+7
-7
@@ -6,13 +6,13 @@
|
||||
#include "lts_screen_container.h"
|
||||
#include "lts_screen_wide.h"
|
||||
|
||||
#include <QColor>
|
||||
#include <QPaintEvent>
|
||||
#include <QPainter>
|
||||
#include <QPen>
|
||||
#include <QRect>
|
||||
#include <QSize>
|
||||
#include <QStyle>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtGui/QPaintEvent>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPen>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtCore/QSize>
|
||||
#include <QtWidgets/QStyle>
|
||||
|
||||
namespace LtsMultiMonitor
|
||||
{
|
||||
|
||||
+3
-3
@@ -1,9 +1,9 @@
|
||||
#pragma once
|
||||
#include "LtsMultiMonitor/lts_multi_monitor_selector_base.h"
|
||||
|
||||
#include <QDialog>
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
#include <QtWidgets/QDialog>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
class QScreen;
|
||||
class QPaintEvent;
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/promise.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
#include <QCloseEvent>
|
||||
#include <QDebug>
|
||||
#include <QHBoxLayout>
|
||||
#include <QSplitter>
|
||||
#include <QtGui/QCloseEvent>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtWidgets/QHBoxLayout>
|
||||
#include <QtWidgets/QSplitter>
|
||||
#ifdef Q_OS_WIN
|
||||
#include <QtPlatformHeaders/qwindowswindowfunctions.h>
|
||||
#endif
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#pragma once
|
||||
#include "ltsmultimonitor_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QRect>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
class QSplitter;
|
||||
class QHBoxLayout;
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
#include "lts_dummy_widget.h"
|
||||
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
#include <QDebug>
|
||||
#include <QHBoxLayout>
|
||||
#include <QRect>
|
||||
#include <QResizeEvent>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtWidgets/QHBoxLayout>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtGui/QResizeEvent>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace LtsMultiMonitor
|
||||
{
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
#include "lts_screen_base.h"
|
||||
#include "ltsmultimonitor_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QRect>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
class QHBoxLayout;
|
||||
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
#include "lts_screen_container.h"
|
||||
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
#include <QDebug>
|
||||
#include <QHBoxLayout>
|
||||
#include <QSplitter>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtWidgets/QHBoxLayout>
|
||||
#include <QtWidgets/QSplitter>
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
#include <QtPlatformHeaders/qwindowswindowfunctions.h>
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
#include "lts_screen_base.h"
|
||||
#include "ltsmultimonitor_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QRect>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
class QSplitter;
|
||||
class QHBoxLayout;
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#include "lts_screen_container.h"
|
||||
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
#include <QDebug>
|
||||
#include <QHBoxLayout>
|
||||
#include <QSplitter>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtWidgets/QHBoxLayout>
|
||||
#include <QtWidgets/QSplitter>
|
||||
#include <QtCore/QTimer>
|
||||
#ifdef Q_OS_WIN
|
||||
#include <QtPlatformHeaders/qwindowswindowfunctions.h>
|
||||
#endif
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
#include "lts_screen_base.h"
|
||||
#include "ltsmultimonitor_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QRect>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
class QSplitter;
|
||||
class QHBoxLayout;
|
||||
|
||||
Reference in new issue
Block a user