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/Map/abstract_map_object.h
+3 -3
View File
@@ -19,9 +19,9 @@
// Qt
#include <QString>
#include <QColor>
#include <QList>
#include <QtCore/QString>
#include <QtGui/QColor>
#include <QtCore/QList>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/camera.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
// Qt
#include <QJsonObject>
#include <QtCore/QJsonObject>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/camera.h
+1 -1
View File
@@ -14,7 +14,7 @@
#include <situation_map_export.h>
// Qt
#include <QString>
#include <QtCore/QString>
class QJsonObject;
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/coord_translation_functor.h
+1 -1
View File
@@ -16,7 +16,7 @@
// Qt
#include <QString>
#include <QtCore/QString>
namespace Esri
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/fill_style.h
+1 -1
View File
@@ -14,7 +14,7 @@
// Qt
#include <QColor>
#include <QtGui/QColor>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/geometry_model_renderer.cpp
+2 -2
View File
@@ -9,8 +9,8 @@
#include "geometry_model_renderer.h"
#include <QFile>
#include <QTime>
#include <QtCore/QFile>
#include <QtCore/QTime>
namespace SituationMap
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/geometry_model_renderer.h
+2 -2
View File
@@ -20,8 +20,8 @@
// Qt
#include <QElapsedTimer>
#include <QObject>
#include <QPointer>
#include <QtCore/QObject>
#include <QtCore/QPointer>
class PESettings;
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/grid.h
+1 -1
View File
@@ -10,7 +10,7 @@
#include "situation_map_types.h"
#include <situation_map_export.h>
#include <QColor>
#include <QtGui/QColor>
//----------------------------------------------------------------------------
namespace SituationMap
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/layer_parameter.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
// Qt
#include <QJsonObject>
#include <QtCore/QJsonObject>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/layer_parameter.h
+2 -2
View File
@@ -14,8 +14,8 @@
#include <situation_map_export.h>
// Qt
#include <QString>
#include <QUrl>
#include <QtCore/QString>
#include <QtCore/QUrl>
class QJsonObject;
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/line_style.h
+1 -1
View File
@@ -14,7 +14,7 @@
// Qt
#include <QColor>
#include <QtGui/QColor>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/location_display.h
+1 -1
View File
@@ -10,7 +10,7 @@
#include "situation_map_types.h"
#include <situation_map_export.h>
#include <QColor>
#include <QtGui/QColor>
//----------------------------------------------------------------------------
namespace SituationMap
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map.h
+1 -1
View File
@@ -16,7 +16,7 @@
#include <Common/ref_pointer.h>
#include <situation_map_export.h>
#include <QPointer>
#include <QtCore/QPointer>
// forward
class QGraphicsView;
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_initializer.cpp
+5 -5
View File
@@ -20,12 +20,12 @@
#include <arcgis/arcgisversion.h> // This file is created by RME, not ESRI
#include <QCoreApplication>
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonArray>
#include <QtCore/QCoreApplication>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonArray>
#include <QNetworkProxy>
#include <QMessageBox>
#include <QtWidgets/QMessageBox>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_initializer.h
+2 -2
View File
@@ -17,8 +17,8 @@
// Qt
#include <QString>
#include <QJsonObject>
#include <QtCore/QString>
#include <QtCore/QJsonObject>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_notifier.h
+3 -3
View File
@@ -14,9 +14,9 @@
// Qt
#include <QObject>
#include <QPointer>
#include <QTimer>
#include <QtCore/QObject>
#include <QtCore/QPointer>
#include <QtCore/QTimer>
namespace SituationMap
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_settings.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
//Qt
#include <QFile>
#include <QtCore/QFile>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/map_settings.h
+2 -2
View File
@@ -15,8 +15,8 @@
#include <Symbology/symbol_dictionary.h>
// Qt
#include <QString>
#include <QSettings>
#include <QtCore/QString>
#include <QtCore/QSettings>
//----------------------------------------------------------------------------
namespace SituationMap
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/measurement.h
+2 -2
View File
@@ -13,8 +13,8 @@
// Qt
#include <QPointF>
#include <QString>
#include <QtCore/QPointF>
#include <QtCore/QString>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_container.h
+2 -2
View File
@@ -15,8 +15,8 @@
// Qt
#include <QMap>
#include <QSharedPointer>
#include <QtCore/QMap>
#include <QtCore/QSharedPointer>
#include <typeindex>
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_factory.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
// Qt
#include <QCoreApplication>
#include <QtCore/QCoreApplication>
namespace SituationMap
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_factory.h
+1 -1
View File
@@ -20,7 +20,7 @@
// Qt
#include <QMap>
#include <QtCore/QMap>
#include <typeindex>
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/object_indicator.h
+1 -1
View File
@@ -14,7 +14,7 @@
// Qt
#include <QPointF>
#include <QtCore/QPointF>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/operator_map_settings.cpp
+3 -3
View File
@@ -12,9 +12,9 @@
//Qt
#include <QListIterator>
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonArray>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonArray>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/operator_map_settings.h
+4 -4
View File
@@ -17,10 +17,10 @@
// Qt
#include <QList>
#include <QPair>
#include <QString>
#include <QVector>
#include <QtCore/QList>
#include <QtCore/QPair>
#include <QtCore/QString>
#include <QtCore/QVector>
class QJsonObject;
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/overlay_handler.h
+1 -1
View File
@@ -14,7 +14,7 @@
// Qt
#include <QMap>
#include <QtCore/QMap>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/party_id_to_color_functor.h
+3 -3
View File
@@ -16,9 +16,9 @@
// Qt
#include <QColor>
#include <QIcon>
#include <QTimer>
#include <QtGui/QColor>
#include <QtGui/QIcon>
#include <QtCore/QTimer>
namespace SituationMap
{
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/pixel_based_textbox_handler.h
+3 -3
View File
@@ -15,9 +15,9 @@
// Qt
#include <QObject>
#include <QString>
#include <QPointF>
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QtCore/QPointF>
class QTextEdit;
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/sidc_symbol.h
+1 -1
View File
@@ -35,7 +35,7 @@
#include "line_style.h"
#include "fill_style.h"
#include <QString>
#include <QtCore/QString>
namespace SituationMap
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_types.h
+4 -4
View File
@@ -15,10 +15,10 @@
// Qt
#include <QString>
#include <QColor>
#include <QList>
#include <QPointF>
#include <QtCore/QString>
#include <QtGui/QColor>
#include <QtCore/QList>
#include <QtCore/QPointF>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.cpp
+3 -3
View File
@@ -26,9 +26,9 @@
// Qt
#include <QString>
#include <QPointF>
#include <QRect>
#include <QtCore/QString>
#include <QtCore/QPointF>
#include <QtCore/QRect>
#include <sstream>
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/situation_map_utils.h
+3 -3
View File
@@ -18,9 +18,9 @@
// Qt
#include <QPointF>
#include <QSize>
#include <QRectF>
#include <QtCore/QPointF>
#include <QtCore/QSize>
#include <QtCore/QRectF>
#include <iosfwd>
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile.h
+2 -2
View File
@@ -15,8 +15,8 @@
// Qt
#include <QString>
#include <QPointF>
#include <QtCore/QString>
#include <QtCore/QPointF>
#include <functional>
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile_parameter.cpp
+3 -3
View File
@@ -12,9 +12,9 @@
//Qt
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonArray>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonArray>
#include <sstream>
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/terrain_profile_parameter.h
+2 -2
View File
@@ -14,8 +14,8 @@
// Qt
#include <QString>
#include <QPointF>
#include <QtCore/QString>
#include <QtCore/QPointF>
class QJsonObject;
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/text_style.h
+1 -1
View File
@@ -13,7 +13,7 @@
#include <situation_map_export.h>
// Qt
#include <QColor>
#include <QtGui/QColor>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewpoint2D.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
// Qt
#include <QJsonObject>
#include <QtCore/QJsonObject>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewpoint2D.h
+1 -1
View File
@@ -14,7 +14,7 @@
#include <situation_map_export.h>
// Qt
#include <QString>
#include <QtCore/QString>
class QJsonObject;
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed.h
+3 -3
View File
@@ -15,9 +15,9 @@
// Qt
#include <QObject>
#include <QString>
#include <QPointF>
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QtCore/QPointF>
//----------------------------------------------------------------------------
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed_parameter.cpp
+3 -3
View File
@@ -12,9 +12,9 @@
//Qt
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonArray>
#include <QtCore/QJsonDocument>
#include <QtCore/QJsonObject>
#include <QtCore/QJsonArray>
#include <sstream>
qt6-after/qt6-migrated-legatus/Lts/Viewer/SituationMap/Map/viewshed_parameter.h
+2 -2
View File
@@ -14,8 +14,8 @@
#include <MathUtils/math_const.h>
// Qt
#include <QString>
#include <QPointF>
#include <QtCore/QString>
#include <QtCore/QPointF>
class QJsonObject;