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:
1 parent
3d3c3b48fe
commit
7a6be7474e
2839 files changed
+6495
-6513
No files matched your search
+3
-3
@@ -4,9 +4,9 @@
|
||||
#include "ltsutilsguiconnectdialog_export.h"
|
||||
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <functional>
|
||||
|
||||
namespace Ui
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "ltsutilsguiconnectdialog_export.h"
|
||||
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <functional>
|
||||
|
||||
class QTimer;
|
||||
|
||||
+6
-6
@@ -2,12 +2,12 @@
|
||||
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/dds_vector_to_pixmap.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <QBuffer>
|
||||
#include <QFile>
|
||||
#include <QIcon>
|
||||
#include <QImage>
|
||||
#include <QPainter>
|
||||
#include <QPixmap>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtGui/QIcon>
|
||||
#include <QtGui/QImage>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <QSvgRenderer>
|
||||
|
||||
namespace LtsUtils
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/ltsutilscore_export.h>
|
||||
|
||||
#include <QSize>
|
||||
#include <QString>
|
||||
#include <QtCore/QSize>
|
||||
#include <QtCore/QString>
|
||||
#include <cstdint>
|
||||
#include <vector>
|
||||
|
||||
|
||||
+4
-4
@@ -5,13 +5,13 @@
|
||||
#ifdef REQUEST_HELPER_WITH_GUI
|
||||
#include <LtsWidgets/lts_global_wait_dialog.h>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
#endif
|
||||
|
||||
#include <QEventLoop>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <memory>
|
||||
|
||||
#define DEBUG
|
||||
|
||||
+3
-3
@@ -11,9 +11,9 @@
|
||||
#endif
|
||||
|
||||
#include <Core/core_types.h>
|
||||
#include <QObject>
|
||||
#include <QPair>
|
||||
#include <QVector>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QPair>
|
||||
#include <QtCore/QVector>
|
||||
#include <functional>
|
||||
#include <optional>
|
||||
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
|
||||
#include <LtsPluginManager/lts_plugin_loader.h>
|
||||
#include <PluginInterfaces/style_plugin_interface.h>
|
||||
#include <QDebug>
|
||||
#include <QPluginLoader>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QPluginLoader>
|
||||
|
||||
namespace LtsUtils
|
||||
{
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "ltsutilsguistylemanager_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
class QPluginLoader;
|
||||
|
||||
|
||||
Reference in new issue
Block a user