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/Viewer/SituationMap/SymbologyImpl/base_symbol_model.cpp
+6 -6
View File
@@ -23,13 +23,13 @@
// Qt
#include <QGuiApplication>
#include <QString>
#include <QUuid>
#include <QByteArray>
#include <QBuffer>
#include <QtGui/QGuiApplication>
#include <QtCore/QString>
#include <QtCore/QUuid>
#include <QtCore/QByteArray>
#include <QtCore/QBuffer>
#include <QMimeData>
#include <QTimer>
#include <QtCore/QTimer>
namespace AdvancedSymbology
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/base_symbol_model.h
+2 -2
View File
@@ -31,8 +31,8 @@
#include <SymbologyXML/symbol.h>
//Qt
#include <QObject>
#include <QPixmap>
#include <QtCore/QObject>
#include <QtGui/QPixmap>
namespace AdvancedSymbology
{
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
// Qt
#include <QtConcurrent>
#include <QFuture>
#include <QtCore/QFuture>
#define CREATE_ESRI_SYMBOL_ON_DEMAND // save time on startup
// REGG-3483 - EsriDictionaryProcessor::syncTableWithinMainThread verzögert Applikations-Start um mehrere Sekunden
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor.h
+1 -1
View File
@@ -15,7 +15,7 @@
// Qt
#include <QImage>
#include <QtGui/QImage>
// Esri
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_app6.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
// Qt
#include <QtConcurrent>
#include <QFuture>
#include <QtCore/QFuture>
namespace AdvancedSymbology
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_app6d.cpp
+1 -1
View File
@@ -34,7 +34,7 @@
// Qt
#include <QThread>
#include <QtCore/QThread>
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/esri_dictionary_processor_mil2525d.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
// Qt
#include <QThread>
#include <QtCore/QThread>
namespace AdvancedSymbology
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_dictionary_impl.cpp
+12 -12
View File
@@ -42,20 +42,20 @@
// Qt
#include <QHash>
#include <QStringList>
#include <QStandardItemModel>
#include <QTreeView>
#include <QHBoxLayout>
#include <QDialog>
#include <QRegExp>
#include <QDir>
#include <QThread>
#include <QPainter>
#include <QTime>
#include <QtCore/QHash>
#include <QtCore/QStringList>
#include <QtGui/QStandardItemModel>
#include <QtWidgets/QTreeView>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QDialog>
#include <QtCore/QRegExp>
#include <QtCore/QDir>
#include <QtCore/QThread>
#include <QtGui/QPainter>
#include <QtCore/QTime>
#include <QtConcurrent>
#include <QFuture>
#include <QtCore/QFuture>
#include <sstream>
#include <type_traits>
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_extension_renderer.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
// Qt
#include <QPainter>
#include <QtGui/QPainter>
#include <iostream>
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/SymbologyImpl/symbol_extension_renderer.h
+2 -2
View File
@@ -15,8 +15,8 @@
// ESRI
// Qt
#include <QColor>
#include <QImage>
#include <QtGui/QColor>
#include <QtGui/QImage>
namespace AdvancedSymbology