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
@@ -13,9 +13,9 @@
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QSharedPointer>
|
||||
#include <QVector>
|
||||
#include <QString>
|
||||
#include <QtCore/QSharedPointer>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QString>
|
||||
|
||||
|
||||
// Forward
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QUuid>
|
||||
#include <QtCore/QUuid>
|
||||
|
||||
|
||||
namespace AdvancedSymbology
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
// forward
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
#include <SymbologyImpl/advanced_symbology_logging.h>
|
||||
|
||||
// Qt
|
||||
#include <QObject>
|
||||
#include <QSharedPointer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QSharedPointer>
|
||||
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "symbol_dictionary.h"
|
||||
|
||||
// Qt
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <SymbologyXML/xml_symbol_codec.h>
|
||||
|
||||
// Qt
|
||||
#include <QRegExp>
|
||||
#include <QtCore/QRegExp>
|
||||
|
||||
|
||||
namespace AdvancedSymbology
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
#include <SymbologyXML/symbol_types.h>
|
||||
|
||||
// Qt
|
||||
#include <QHash>
|
||||
#include <QString>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QString>
|
||||
#include <QStringRef>
|
||||
|
||||
namespace AdvancedSymbology
|
||||
|
||||
@@ -14,10 +14,10 @@
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
#include <QPixmap>
|
||||
#include <QtGui/QPixmap>
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
namespace AdvancedSymbology
|
||||
|
||||
+3
-3
@@ -14,9 +14,9 @@
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QString>
|
||||
#include <QColor>
|
||||
#include <QSet>
|
||||
#include <QtCore/QString>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QCoreApplication>
|
||||
#include <QMap>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QMap>
|
||||
#include <QProcessEnvironment>
|
||||
|
||||
void initResource()
|
||||
|
||||
+3
-3
@@ -16,9 +16,9 @@
|
||||
#include "../SymbologyXML/symbol.h"
|
||||
|
||||
// Qt
|
||||
#include <QImage>
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QtGui/QImage>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QStringList>
|
||||
|
||||
|
||||
// Forward
|
||||
|
||||
+3
-3
@@ -15,9 +15,9 @@
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QColor>
|
||||
#include <QImage>
|
||||
#include <QPixmap>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtGui/QImage>
|
||||
#include <QtGui/QPixmap>
|
||||
|
||||
class QValidator;
|
||||
class QUuid;
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QStringList>
|
||||
#include <QtCore/QStringList>
|
||||
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QUuid>
|
||||
#include <QComboBox>
|
||||
#include <QFutureWatcher>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QUuid>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtCore/QFutureWatcher>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
namespace AdvancedSymbology
|
||||
|
||||
@@ -15,12 +15,12 @@
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QObject>
|
||||
#include <QImage>
|
||||
#include <QLabel>
|
||||
#include <QFuture>
|
||||
#include <QSize>
|
||||
#include <QBuffer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtGui/QImage>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtCore/QFuture>
|
||||
#include <QtCore/QSize>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QElapsedTimer>
|
||||
|
||||
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
|
||||
|
||||
// Qt
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QString>
|
||||
|
||||
|
||||
namespace AdvancedSymbology
|
||||
|
||||
Reference in new issue
Block a user