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
@@ -2,8 +2,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QHash>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
#include "dds_handler.h"
|
||||
#include "ism_handler.h"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
+2
-2
@@ -12,8 +12,8 @@
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
|
||||
namespace WirelessLocationSystem
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QQueue>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <memory>
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
#include "wls_sfm_message_converter.h"
|
||||
#include "web_socket_handler.h"
|
||||
|
||||
#include <QTcpSocket>
|
||||
#include <QDateTime>
|
||||
#include <QtNetwork/QTcpSocket>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <web_socket_handler.h>
|
||||
|
||||
namespace WirelessLocationSystem
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTcpServer>
|
||||
#include <QTimer>
|
||||
#include <QtNetwork/QTcpServer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <memory>
|
||||
#include "logger.h"
|
||||
#include "wls_participant_handler.h"
|
||||
|
||||
+4
-4
@@ -2,10 +2,10 @@
|
||||
|
||||
|
||||
#include "wls_json_client_test.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QStringList>
|
||||
#include <QString>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
WlsJsonclientTest::WlsJsonclientTest(const QString &hostname, unsigned short port)
|
||||
: m_socket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this))
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
|
||||
class WlsJsonclientTest : public QObject
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
#include "wls_sfm_message.h"
|
||||
#include "wls_handler.h"
|
||||
#include "settings.h"
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
|
||||
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QObject>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QObject>
|
||||
#include <QQueue>
|
||||
#include <QStringBuilder>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
#include <math.h>
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include "web_socket_handler.h"
|
||||
#include "wls_handler.h"
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace WirelessLocationSystem
|
||||
{
|
||||
|
||||
+3
-3
@@ -5,9 +5,9 @@
|
||||
|
||||
#include "logger.h"
|
||||
#include "wls_participant.h"
|
||||
#include <QHash>
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <unordered_map>
|
||||
#include <unordered_set>
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <WirelessLocationSystem/sfmconverter_export.h>
|
||||
|
||||
namespace WirelessLocationSystem
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#include "wls_sfm_message_converter.h"
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QSharedPointer>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QSharedPointer>
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/sfm_bytemessage_converter.h>
|
||||
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QByteArray>
|
||||
#include <QSharedPointer>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QtCore/QSharedPointer>
|
||||
|
||||
#include "wls_sfm_message.h"
|
||||
|
||||
|
||||
Reference in new issue
Block a user