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
-5
@@ -9,11 +9,11 @@
|
||||
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QTest>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <LtsUtilsCore/json_object.h>
|
||||
|
||||
/* Module tests for ExerciseEventManagement
|
||||
|
||||
+3
-3
@@ -11,9 +11,9 @@
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <iostream>
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QJsonValue>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonValue>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace ExerciseEventManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -8,11 +8,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QQueue>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <memory>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include "../logger.h"
|
||||
|
||||
namespace ExerciseEventManagement
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "dds_handler.h"
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace ExerciseEventManagement
|
||||
{
|
||||
|
||||
+5
-5
@@ -15,14 +15,14 @@
|
||||
#include "web_socket_server.h"
|
||||
#include "settings.h"
|
||||
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QThread>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <LtsUtilsCore/json_object.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
using namespace ExerciseEventManagement;
|
||||
|
||||
|
||||
+5
-5
@@ -15,13 +15,13 @@
|
||||
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QThread>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
using namespace ExerciseEventManagement;
|
||||
|
||||
|
||||
+3
-3
@@ -13,9 +13,9 @@
|
||||
#include "settings.h"
|
||||
#include <ProjectDataManagement/pdm_enums.hpp>
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
using namespace ExerciseEventManagement;
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "settings.h"
|
||||
|
||||
#include <QtCore/QSettings>
|
||||
#include <QPoint>
|
||||
#include <QtCore/QPoint>
|
||||
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QPair>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QPair>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
+3
-3
@@ -15,10 +15,10 @@
|
||||
|
||||
#include <ExerciseEventManagement/eem_db.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <ngldb/nsqlquery.h>
|
||||
|
||||
|
||||
|
||||
+3
-3
@@ -9,9 +9,9 @@
|
||||
#pragma once
|
||||
|
||||
#include <QAbstractSocket>
|
||||
#include <QTimer>
|
||||
#include <QVector>
|
||||
#include <QSharedPointer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QSharedPointer>
|
||||
#include "logger.h"
|
||||
|
||||
#include "dds_handler.h"
|
||||
|
||||
+6
-6
@@ -10,12 +10,12 @@
|
||||
#include "web_socket_server.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QSqlError>
|
||||
#include <QTimer>
|
||||
#include <QUrlQuery>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtSql/QSqlError>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QUrlQuery>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QtWebSockets/QWebSocketServer>
|
||||
#include <ngldb/nsqlquery.h>
|
||||
|
||||
+5
-5
@@ -8,11 +8,11 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QObject>
|
||||
#include <QSet>
|
||||
#include <QSqlDatabase>
|
||||
#include <QVector>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtSql/QSqlDatabase>
|
||||
#include <QtCore/QVector>
|
||||
#include <ExerciseEventManagement/eem_db_structs.h>
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
Reference in new issue
Block a user