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
@@ -5,8 +5,8 @@
|
||||
#include "topic_preview_widget.h"
|
||||
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <QDebug>
|
||||
#include <QMessageBox>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtWidgets/QMessageBox>
|
||||
|
||||
namespace TopicEditorBase
|
||||
{
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/promise.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace LtsUtils
|
||||
{
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
#include "topic_editor_utils.h"
|
||||
|
||||
#include <QColor>
|
||||
#include <QHash>
|
||||
#include <QIcon>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QLabel>
|
||||
#include <QString>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtGui/QIcon>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace TopicEditorBase
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include "topiceditorbase_export.h"
|
||||
|
||||
#include <LtsScriptTimeline/track_entry.h>
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
class QColor;
|
||||
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <QContextMenuEvent>
|
||||
#include <QJsonDocument>
|
||||
#include <QMenu>
|
||||
#include <QTextEdit>
|
||||
#include <QtGui/QContextMenuEvent>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtWidgets/QTextEdit>
|
||||
|
||||
namespace TopicEditorBase
|
||||
{
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
#include "topic_editor_utils.h"
|
||||
#include "topiceditorbase_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
#include "topic_previewer.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QDrag>
|
||||
#include <QMimeData>
|
||||
#include <QMouseEvent>
|
||||
#include <QPainter>
|
||||
#include <QtGui/QMouseEvent>
|
||||
#include <QtGui/QPainter>
|
||||
|
||||
namespace TopicEditorBase
|
||||
{
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
#include "topic_editor_utils.h"
|
||||
#include "topiceditorbase_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QWidget>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
namespace TopicEditorBase
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user