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,7 +5,7 @@
|
||||
#include "ltswebsocketserver_export.h"
|
||||
#include "reply_message.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QQueue>
|
||||
#include <QtCore/QThread>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "json_keys.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace LtsWebSocket
|
||||
{
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
#include "ltswebsocketcommon_export.h"
|
||||
#include "reply_message.h"
|
||||
|
||||
#include <QJsonValue>
|
||||
#include <QString>
|
||||
#include <QtCore/QJsonValue>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace LtsWebSocket
|
||||
{
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "client_connection.h"
|
||||
#include "json_keys.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace LtsWebSocket
|
||||
{
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "reply_message.h"
|
||||
|
||||
#include <QJsonParseError>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#pragma once
|
||||
#include "logger.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtNetwork/QHostAddress>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <QtWebSockets/qwebsocketprotocol.h>
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "client_connection.h"
|
||||
|
||||
#include <QThread>
|
||||
#include <QUrl>
|
||||
#include <QtCore/QThread>
|
||||
#include <QtCore/QUrl>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
|
||||
namespace LtsWebSocket
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "ltswebsocketclient_export.h"
|
||||
|
||||
#include <QAbstractSocket>
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
class QThread;
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "client_connection.h"
|
||||
#include "connection_handler.h"
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace LtsWebSocket
|
||||
{
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "logger.h"
|
||||
#include "ltswebsocketserver_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QQueue>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "json_keys.h"
|
||||
|
||||
#include <QUuid>
|
||||
#include <QtCore/QUuid>
|
||||
|
||||
namespace LtsWebSocket
|
||||
{
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
|
||||
#include "ltswebsocketcommon_export.h"
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QJsonParseError>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace LtsWebSocket
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user