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/ReportManagement/Generator/handler_charge_administration.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
#include <ngldb/dbtransaction.h>
#include <ngldb/nsqlquery.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_medevac_nine_liner.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_building_damage.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
#include <QJsonDocument>
#include <QtCore/QJsonDocument>
using namespace ReportManagement;
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_charge_resupply.cpp
+2 -2
View File
@@ -12,8 +12,8 @@
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
#include <QVariant>
#include <QSet>
#include <QtCore/QVariant>
#include <QtCore/QSet>
using namespace ReportManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.cpp
+4 -4
View File
@@ -15,10 +15,10 @@
#include <ProjectDataManagement/pdm.hpp>
#include <QSet>
#include <QJsonArray>
#include <QJsonObject>
#include <QJsonDocument>
#include <QtCore/QSet>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonDocument>
#include <DDS/Core/pacemaker.h>
using namespace ReportManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_data.h
+2 -2
View File
@@ -17,8 +17,8 @@
#include <ParticipantManagement/ppm.hpp>
#include <QElapsedTimer>
#include <QMap>
#include <QObject>
#include <QtCore/QMap>
#include <QtCore/QObject>
// ----------------------------------------------------------------------------------------------------------------------
namespace ReportManagement
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_get_data.cpp
+4 -4
View File
@@ -14,10 +14,10 @@
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <ProjectDataManagement/pdm.hpp>
#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>
#include <QSet>
#include <QtCore/QJsonArray>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtCore/QSet>
#include <ngldb/nsqlquery.h>
using namespace ReportManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_maintenance.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_mine_area.cpp
+2 -2
View File
@@ -11,8 +11,8 @@
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
#include <QPair>
#include <QVariant>
#include <QtCore/QPair>
#include <QtCore/QVariant>
using namespace ReportManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_nbc.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_participant_distance.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QtCore/qmath.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include <ngldb/dbtransaction.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_treatment_timeline.cpp
+2 -2
View File
@@ -13,8 +13,8 @@
#include <ngldb/dbtransaction.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <QVariant>
#include <QJsonDocument>
#include <QtCore/QVariant>
#include <QtCore/QJsonDocument>
using namespace ReportManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_report_unit_power.cpp
+3 -3
View File
@@ -13,9 +13,9 @@
#include <ProjectDataManagement/pdm.hpp>
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
#include <QSet>
#include <QVector>
#include <QVariant>
#include <QtCore/QSet>
#include <QtCore/QVector>
#include <QtCore/QVariant>
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/handler_sanitation_material.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
#include <ngldb/nsqlquery.h>
#include <ngldb/dbtransaction.h>
#include <QVariant>
#include <QtCore/QVariant>
using namespace ReportManagement;
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/main_handler.h
+1 -1
View File
@@ -6,7 +6,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include "handler_report_data.h"
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.cpp
+4 -4
View File
@@ -10,10 +10,10 @@
#include "dds_handler.h"
#include "logger.h"
#include <QJsonObject>
#include <QJsonDocument>
#include <QJsonArray>
#include <QSet>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonArray>
#include <QtCore/QSet>
//------------------------------------------------------------------------------
namespace ReportManagement
qt6-after/qt6-migrated-legatus/Lts/Services/ReportManagement/Generator/object_report_info.h
+1 -1
View File
@@ -7,7 +7,7 @@
*/
#pragma once
#include <QObject>
#include <QtCore/QObject>
#include "dds_handler.h"
#include <Core/core_types.h>