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
@@ -43,18 +43,18 @@
|
||||
#ifdef BUILD_FILTERMANAGEMENT
|
||||
#include <Lts/Plugins/OnlineHelp/ohp_online_help_viewer_gui_plugin_interface.h> // XXX: grrr..
|
||||
#endif
|
||||
#include <QApplication>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QHostInfo>
|
||||
#include <QLabel>
|
||||
#include <QMessageBox>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtWidgets/QMessageBox>
|
||||
#include <QNetworkInterface>
|
||||
#include <QPainter>
|
||||
#include <QScreen>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QSvgRenderer>
|
||||
#include <QTimer>
|
||||
#include <QUuid>
|
||||
#include <QWidget>
|
||||
// #include <QDebug>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QUuid>
|
||||
#include <QtWidgets/QWidget>
|
||||
// #include <QtCore/QDebug>
|
||||
|
||||
using namespace LtsWidgets;
|
||||
|
||||
|
||||
@@ -18,12 +18,12 @@
|
||||
#include <LtsAppDescriptor/lts_app_descriptor.h>
|
||||
#include <LtsSession/ltssession_export.h>
|
||||
#include <LtsWidgets/lts_base.h>
|
||||
#include <QDebug>
|
||||
#include <QJsonObject>
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
#include <QPointer>
|
||||
#include <QVector>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QPointer>
|
||||
#include <QtCore/QVector>
|
||||
#include <memory>
|
||||
|
||||
namespace LtsWidgets
|
||||
|
||||
@@ -3,12 +3,12 @@
|
||||
#include <Lts/Common/ProjectConfig/project_defines.h>
|
||||
#include <LtsAppDescriptor/lts_app_descriptor.h>
|
||||
#include <LtsSession/ltssessiondata_export.h>
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
#include <QPixmap>
|
||||
#include <QSet>
|
||||
#include <QUrl>
|
||||
#include <QVariant>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QUrl>
|
||||
#include <QtCore/QVariant>
|
||||
#include <QtCore/qglobal.h>
|
||||
|
||||
namespace LtsSessionData
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
#include <DDS/DTC/generic_dtc_impl.h>
|
||||
#include <DDS/QosProfile/DDS_DefaultQos>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <QDebug>
|
||||
#include <QSet>
|
||||
#include <QVector>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
namespace LtsSession
|
||||
{
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QStringList>
|
||||
#include <QUrl>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QUrl>
|
||||
#include <memory>
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
// Export macro for shared library
|
||||
#include "ltssessiondatadds_export.h"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "lts_session_lock_handler.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
namespace LtsSession
|
||||
{
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
// This stub provides minimal functionality for building without RTI Connext DDS
|
||||
|
||||
#include <LtsSession/ltssession_export.h>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QString>
|
||||
#include <memory>
|
||||
|
||||
// Forward declaration - actual type from LtsWidgets
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#endif
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
namespace LtsSession
|
||||
{
|
||||
|
||||
@@ -16,10 +16,10 @@
|
||||
#include <LtsPluginManager/lts_plugin_loader.h>
|
||||
#include <LtsPluginManager/lts_plugin_manager.h>
|
||||
#include <LtsSession/ltssession_export.h>
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
#include <memory>
|
||||
|
||||
namespace NGL
|
||||
|
||||
Reference in new issue
Block a user