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
@@ -6,9 +6,9 @@
|
||||
#include "lts_plugin_manager_widget.h"
|
||||
#include "ui_lts_plugin_manager_dialog.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QDebug>
|
||||
#include <QString>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace LtsPluginManager
|
||||
{
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
#include "lts_plugin_manager_widget.h"
|
||||
#include "ltspluginmanager_export.h"
|
||||
|
||||
#include <QDialog>
|
||||
#include <QObject>
|
||||
#include <QtWidgets/QDialog>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
|
||||
|
||||
#pragma once
|
||||
#include <QObject>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <lts_plugin_manager.h>
|
||||
|
||||
namespace Ui
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
#include <LtsAppDescriptor/lts_app_descriptor.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <QCoreApplication>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QDirIterator>
|
||||
#include <QFileInfo>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QFileInfo>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QMutableListIterator>
|
||||
#include <QPluginLoader>
|
||||
#include <QtCore/QPluginLoader>
|
||||
#include <utility>
|
||||
|
||||
namespace LtsPluginManager
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#define PLUGIN_LOADER_VERSION 3
|
||||
|
||||
#include <QMap>
|
||||
#include <QPair>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QPair>
|
||||
#include <functional>
|
||||
#include <qglobal.h>
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <PluginInterfaces/data_plugin_interface.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QDebug>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QTimer>
|
||||
#include <utility>
|
||||
|
||||
namespace LtsPluginManager
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
#include <LtsAppDescriptor/lts_app_descriptor.h>
|
||||
#include <LtsPluginManager/lts_plugin_loader.h>
|
||||
#include <ProjectConfig/project_defines.h>
|
||||
#include <QFlags>
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QtCore/QFlags>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user