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
+2
-2
@@ -8,8 +8,8 @@
|
||||
#pragma once
|
||||
|
||||
|
||||
#include <QMap>
|
||||
#include <QString>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QString>
|
||||
#include <QStringView>
|
||||
|
||||
namespace SymbologyXML
|
||||
|
||||
+4
-4
@@ -10,10 +10,10 @@
|
||||
#include "symbol_table.h"
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QPainter>
|
||||
#include <QGraphicsScene>
|
||||
#include <QMap>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtWidgets/QGraphicsScene>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
|
||||
namespace SymbologyXML
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
#include <iostream>
|
||||
#include <list>
|
||||
|
||||
#include <QList>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QPointF>
|
||||
#include <QTransform>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
#pragma once
|
||||
|
||||
#include <list>
|
||||
#include <QMap>
|
||||
#include <QPair>
|
||||
#include <QString>
|
||||
#include <QRectF>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QPair>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QRectF>
|
||||
|
||||
#include <ngltools/ngltools_bitset.h>
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "symbol_custom_graphics_item_group.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QtGui/QPainter>
|
||||
|
||||
namespace SymbologyXML {
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QGraphicsItem>
|
||||
#include <QtWidgets/QGraphicsItem>
|
||||
|
||||
namespace SymbologyXML {
|
||||
|
||||
|
||||
+8
-8
@@ -14,17 +14,17 @@
|
||||
// test #include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QtDebug>
|
||||
#include <QBrush>
|
||||
#include <QBuffer>
|
||||
#include <QFont>
|
||||
#include <QFontDatabase>
|
||||
#include <QtGui/QBrush>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtGui/QFont>
|
||||
#include <QtGui/QFontDatabase>
|
||||
#include <QFontMetrics>
|
||||
#include <QGraphicsPathItem>
|
||||
#include <QGraphicsScene>
|
||||
#include <QMetaType>
|
||||
#include <QPainter>
|
||||
#include <QtWidgets/QGraphicsScene>
|
||||
#include <QtCore/QMetaType>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QPainterPath>
|
||||
#include <QPen>
|
||||
#include <QtGui/QPen>
|
||||
|
||||
#include <cmath>
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
#include "primitive.h"
|
||||
|
||||
#include <QPainterPath>
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
class QGraphicsItem;
|
||||
class QGraphicsItemGroup;
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
#include "symbol_reader.h"
|
||||
#include "attribute_data.h"
|
||||
|
||||
#include <QBuffer>
|
||||
#include <QFile>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtCore/QFile>
|
||||
#include <QStringView>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
|
||||
@@ -12,9 +12,9 @@
|
||||
#include "symbol.h"
|
||||
#include "primitive.h"
|
||||
|
||||
#include <QColor>
|
||||
#include <QString>
|
||||
#include <QXmlStreamReader>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QXmlStreamReader>
|
||||
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
#include <QRectF>
|
||||
#include <QColor>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QRectF>
|
||||
#include <QtGui/QColor>
|
||||
|
||||
#include "symbology_xml_export.h"
|
||||
#include "symbol_id_t.h"
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
#include "primitive.h"
|
||||
#include "attribute_data.h"
|
||||
|
||||
#include <QFile>
|
||||
#include <QXmlStreamWriter>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QXmlStreamWriter>
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
namespace SymbologyXML
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "symbology_xml_export.h"
|
||||
#include "symbol.h"
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
|
||||
|
||||
Reference in new issue
Block a user