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:
torstenandCopilot committed
1 parent
3d3c3b48fe
commit
7a6be7474e
2839 files changed
+6495
-6513
No files matched your search
+1
-1
@@ -3,7 +3,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
#include <QVariant>
|
||||
#include <QtCore/QVariant>
|
||||
|
||||
class Ui_SelectTextDialog;
|
||||
|
||||
|
||||
+5
-5
@@ -5,14 +5,14 @@
|
||||
|
||||
#include <QGraphicsLineItem>
|
||||
#include <QGraphicsSceneMouseEvent>
|
||||
#include <QKeyEvent>
|
||||
#include <QLabel>
|
||||
#include <QList>
|
||||
#include <QtGui/QKeyEvent>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtCore/QList>
|
||||
#include <QLocale>
|
||||
#include <QPolygonF>
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QPainterPath>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include "asb_symbol_edit_scene.h"
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QGraphicsScene>
|
||||
#include <QPen>
|
||||
#include <QtWidgets/QGraphicsScene>
|
||||
#include <QtGui/QPen>
|
||||
|
||||
#include <SymbologyXML/primitive.h>
|
||||
|
||||
|
||||
+8
-8
@@ -15,15 +15,15 @@
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <QButtonGroup>
|
||||
#include <QColorDialog>
|
||||
#include <QDateTime>
|
||||
#include <QGraphicsItem>
|
||||
#include <QtWidgets/QButtonGroup>
|
||||
#include <QtWidgets/QColorDialog>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtWidgets/QGraphicsItem>
|
||||
#include <QGraphicsPixmapItem>
|
||||
#include <QJsonDocument>
|
||||
#include <QKeyEvent>
|
||||
#include <QScrollBar>
|
||||
#include <QStandardItemModel>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtGui/QKeyEvent>
|
||||
#include <QtWidgets/QScrollBar>
|
||||
#include <QtGui/QStandardItemModel>
|
||||
#include <SymbologyXML/attribute_data.h>
|
||||
#include <SymbologyXML/symbol.h>
|
||||
#include <SymbologyXML/symbol_exporter.h>
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace AdvancedSymbology
|
||||
{
|
||||
|
||||
+2
-2
@@ -5,8 +5,8 @@
|
||||
#include <getopt.h>
|
||||
#include <string>
|
||||
#include <nglapplication/nglapplication.h>
|
||||
#include <QString>
|
||||
#include <QDir>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QDir>
|
||||
|
||||
#include "symboleditor.h"
|
||||
#include "nglsettings.h"
|
||||
|
||||
+8
-8
@@ -8,15 +8,15 @@
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
|
||||
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
|
||||
#include <QDomDocument>
|
||||
#include <QImage>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QPainter>
|
||||
#include <QPointer>
|
||||
#include <QSet>
|
||||
#include <QtXml/QDomDocument>
|
||||
#include <QtGui/QImage>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtCore/QPointer>
|
||||
#include <QtCore/QSet>
|
||||
#include <QSvgRenderer>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
#include <Symbology/sidc_codec.h>
|
||||
#include <Symbology/symbol_dictionary.h>
|
||||
#include <utility>
|
||||
|
||||
+3
-3
@@ -6,9 +6,9 @@
|
||||
|
||||
|
||||
|
||||
#include <QHash>
|
||||
#include <QString>
|
||||
#include <QImage>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QString>
|
||||
#include <QtGui/QImage>
|
||||
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
|
||||
#include <AdvancedSymbology/asb_data_plugin_interface.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include <QAbstractItemModel>
|
||||
#include <QPointer>
|
||||
#include <QtCore/QAbstractItemModel>
|
||||
#include <QtCore/QPointer>
|
||||
|
||||
namespace AdvancedSymbology
|
||||
{
|
||||
|
||||
+4
-4
@@ -4,10 +4,10 @@
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include <QColor>
|
||||
#include <QHash>
|
||||
#include <QIcon>
|
||||
#include <QSharedPointer>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtGui/QIcon>
|
||||
#include <QtCore/QSharedPointer>
|
||||
|
||||
class QAbstractItemModel;
|
||||
class QModelIndex;
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QColor>
|
||||
#include <QtGui/QColor>
|
||||
#include <Symbology/symbol_dictionary.h>
|
||||
#include <PluginInterfaces/data_plugin_interface.h>
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace AdvancedSymbology
|
||||
{
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <Symbology/symbol_dictionary_types.h>
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user