lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 migration: Fix BUILD_RTI=OFF build errors in TrainingAreaBase

Browse Source 
- 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 2026-08-23 20:49:23 +02:00
1 parent 3d3c3b48fe
commit 7a6be7474e
2839 files changed
+6495 -6513
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.cpp
+7 -7
View File
@@ -16,13 +16,13 @@
#include <nglapplication/nglcoreapplication.h>
#include <LtsCommandLineParser/LtsCommandLineParser.h>
#include <QTimer>
#include <QDateTime>
#include <QTest>
#include <QSet>
#include <QVector>
#include <QJsonObject>
#include <QJsonDocument>
#include <QtCore/QTimer>
#include <QtCore/QDateTime>
#include <QtTest/QTest>
#include <QtCore/QSet>
#include <QtCore/QVector>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonDocument>
#include <LtsUtils/pgarray.h>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/ModuleTests/flm_tests.h
+1 -1
View File
@@ -21,7 +21,7 @@
#include <DDS/DDSConnector/dds_connector.h>
#include <FileManagement/logger.h>
#include <QPixmap>
#include <QtGui/QPixmap>
#include <ngldb/db_service_handler.h>
namespace FileManagement
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/Messages/reply_message.h
+2 -2
View File
@@ -10,8 +10,8 @@
#include <LtsWebSocket/reply_message.h>
#include <QJsonArray>
#include <QString>
#include <QtCore/QJsonArray>
#include <QtCore/QString>
namespace FileManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/WebSocketInterface/json_keys.h
+1 -1
View File
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QString>
#include <QtCore/QString>
#include <OcBaseDownload/WebSocketInterface/json_keys.h>
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_db_impl_custom.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include "flm_db_impl_custom.h"
#include <ngldb/nsqlquery.h>
#include <ngldb/sql_query_janitor.h>
#include <QRegularExpression>
#include <QtCore/QRegularExpression>
namespace FileManagement
{
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/flm_dtc_impl_custom.cpp
+2 -2
View File
@@ -12,8 +12,8 @@
#include <DDS/DTC/generic_dtc.h>
#include <DDS/Generic/generic_data_reader.h>
#include <QSet>
#include <QVector>
#include <QtCore/QSet>
#include <QtCore/QVector>
#include <unordered_map>
//---------------------------------------------------------------------------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_content.cpp
+2 -2
View File
@@ -14,8 +14,8 @@
#include "flm_db.h"
#include "convert_db_to_dds.h"
#include <QDir>
#include <QFile>
#include <QtCore/QDir>
#include <QtCore/QFile>
//----------------------------------------------------------------------------------------------------------------------------
namespace FileManagement
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_content.h
+2 -2
View File
@@ -9,8 +9,8 @@
#pragma once
#include <QMap>
#include <QVariant>
#include <QtCore/QMap>
#include <QtCore/QVariant>
#include "base.h"
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_file_type_info.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QMap>
#include <QtCore/QMap>
#include "base.h"
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/handler_folder.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QMap>
#include <QtCore/QMap>
#include "base.h"
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/main_handler.h
+1 -1
View File
@@ -9,7 +9,7 @@
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "flm_db.h"
#include "logger.h"
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/pdf_server.h
+1 -1
View File
@@ -8,7 +8,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include <tcpserver/tcpserver.h>
#include "logger.h"
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/settings.h
+2 -2
View File
@@ -8,8 +8,8 @@
*/
#pragma once
#include <QString>
#include <QPair>
#include <QtCore/QString>
#include <QtCore/QPair>
namespace NGL
{
qt6-after/qt6-migrated-legatus/Lts/Services/FileManagement/thp_script_httq.cpp
+11 -11
View File
@@ -12,18 +12,18 @@
#include <QtWebSockets/QWebSocket>
#include <QtWebSockets/QWebSocketServer>
#include <QFile>
#include <QtCore/QFile>
#include <QJsonParseError>
#include <QJsonDocument>
#include <QJsonArray>
#include <QJsonObject>
#include <QTemporaryFile>
//#include <QSaveFile>
#include <QDateTime>
#include <QFileInfo>
#include <QDir>
#include <QUrlQuery>
#include <QDebug>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonObject>
#include <QtCore/QTemporaryFile>
//#include <QtCore/QSaveFile>
#include <QtCore/QDateTime>
#include <QtCore/QFileInfo>
#include <QtCore/QDir>
#include <QtCore/QUrlQuery>
#include <QtCore/QDebug>
#define L QStringLiteral