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
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include "tetra_dispatcher.h"
|
||||
#include "tetra_handler_tx.h"
|
||||
#include <CoPrtCnv/CoPrtCnvTelegramConverter.hpp>
|
||||
#include <QSettings>
|
||||
#include <QtCore/QSettings>
|
||||
|
||||
namespace WlsTetra
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <Core/core_types.h>
|
||||
#include "logger.h"
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include "logger.h"
|
||||
#include <TrainingAreaBase/send_to_tab.h>
|
||||
#include <memory>
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
|
||||
namespace WlsTetra
|
||||
|
||||
+2
-2
@@ -3,10 +3,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <PrtCnv/PrtCnvApplication.hpp>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
+3
-3
@@ -3,9 +3,9 @@
|
||||
|
||||
#include "tetra_handler_rx.h"
|
||||
#include <TrainingAreaBase/training_area_telegrams.h>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace WlsTetra
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <TrainingAreaBase/recv_from_tab.h>
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
+2
-2
@@ -2,8 +2,8 @@
|
||||
|
||||
|
||||
#include "tetra_handler_tx.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace WlsTetra
|
||||
{
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <TrainingAreaBase/send_to_tab.h>
|
||||
#include "logger.h"
|
||||
|
||||
+5
-5
@@ -4,11 +4,11 @@
|
||||
#include "plugin.h"
|
||||
#include "tetra_prtcnv.h"
|
||||
#include <nglsettings/nglsettings_connections.h>
|
||||
#include <QCoreApplication>
|
||||
#include <QFile>
|
||||
#include <QSqlDatabase>
|
||||
#include <QSettings>
|
||||
#include <QTcpServer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtSql/QSqlDatabase>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtNetwork/QTcpServer>
|
||||
#include <ngldb/dbcommon.h>
|
||||
|
||||
namespace WlsTetra
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <PrtCnv/PrtCnvApplication.hpp>
|
||||
|
||||
+2
-2
@@ -5,9 +5,9 @@
|
||||
#include "wls_handler_rx.h"
|
||||
#include "wls_handler_tx.h"
|
||||
|
||||
#include <QSettings>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
|
||||
namespace WlsTetra
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "wls_dispatcher.h"
|
||||
|
||||
#include <TrainingAreaBase/training_area_telegrams.h>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
#include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
|
||||
#include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
|
||||
|
||||
+3
-3
@@ -4,9 +4,9 @@
|
||||
#pragma once
|
||||
|
||||
#include <TrainingAreaBase/recv_from_tab.h>
|
||||
#include <QObject>
|
||||
#include <QSet>
|
||||
#include <QString>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QString>
|
||||
#include <memory>
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#include "wls_handler_tx.h"
|
||||
#include "wls_dispatcher.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
|
||||
#include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include "logger.h"
|
||||
#include <TrainingAreaBase/send_to_tab.h>
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
class QWebSocket;
|
||||
namespace WlsTetra
|
||||
|
||||
Reference in new issue
Block a user