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
+4
-4
@@ -10,10 +10,10 @@
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
|
||||
#include <QCloseEvent>
|
||||
#include <QApplication>
|
||||
#include <QScreen>
|
||||
#include <QDebug>
|
||||
#include <QtGui/QCloseEvent>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
namespace NmeaManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
#pragma once
|
||||
|
||||
#include <PluginInterfaces/data_plugin_interface.h>
|
||||
#include <QDialog>
|
||||
#include <QtWidgets/QDialog>
|
||||
#include <QListWidgetItem>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <Proxies/TrainingAreaBase/tab_dtc.h>
|
||||
#include <Proxies/TrainingAreaBase/tab_ftc.h>
|
||||
|
||||
|
||||
+4
-4
@@ -9,10 +9,10 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsNotification/lts_notification.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
#include <QCoreApplication>
|
||||
#include <QMessageBox>
|
||||
#include <QPainter>
|
||||
#include <QPixmap>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtWidgets/QMessageBox>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPixmap>
|
||||
|
||||
|
||||
namespace NmeaManagement
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include <Proxies/TrainingAreaBase/tab_dtc.h>
|
||||
#include <Proxies/TrainingAreaBase/tab_ftc.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace LtsNotification
|
||||
{
|
||||
|
||||
+4
-4
@@ -11,11 +11,11 @@
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
|
||||
#include <QCloseEvent>
|
||||
#include <QApplication>
|
||||
#include <QtGui/QCloseEvent>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QDesktopWidget>
|
||||
#include <QScreen>
|
||||
#include <QDebug>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
NmeShutdownDialog::NmeShutdownDialog(const std::shared_ptr<TrainingAreaBase::Interface::Ftc> &tabFtc,
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include <Proxies/TrainingAreaBase/tab_ftc.h>
|
||||
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
#include <QDialog>
|
||||
#include <QtWidgets/QDialog>
|
||||
#include <QListWidgetItem>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
|
||||
Reference in new issue
Block a user