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
+8
-8
@@ -13,16 +13,16 @@
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
|
||||
#include <QFile>
|
||||
#include <QTextStream>
|
||||
#include <QTimer>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QTextStream>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtWebSockets/QWebSocket>
|
||||
#include <QUrl>
|
||||
#include <QtCore/QUrl>
|
||||
|
||||
#include <QThread>
|
||||
#include <QtCore/QThread>
|
||||
|
||||
#include <InfrastructureManagement/ism_ftc.h>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <InfrastructureManagement/logger.h>
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
//----------------------------------------------------------------------------------------------
|
||||
namespace InfrastructureManagement
|
||||
|
||||
+7
-7
@@ -13,13 +13,13 @@
|
||||
#include <nglapplication/nglcoreapplication.h>
|
||||
#include <LtsCommandLineParser/LtsCommandLineParser.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QTest>
|
||||
#include <QSet>
|
||||
#include <QVector>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtTest/QTest>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
#include <LtsUtils/pgarray.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QUuid>
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -24,8 +24,8 @@
|
||||
#include <InfrastructureManagement/ism_translation.h>
|
||||
#include <AssetManagement/asm_dtc.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
using namespace InfrastructureManagement;
|
||||
|
||||
+4
-4
@@ -15,10 +15,10 @@
|
||||
#include "object_effect_area.h"
|
||||
#include "main_handler.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
|
||||
namespace InfrastructureManagement
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
#include "base.h"
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
#include "base.h"
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
#include "base.h"
|
||||
|
||||
|
||||
+2
-2
@@ -16,8 +16,8 @@
|
||||
#include "object_instrumentation_asset.h"
|
||||
#include <ngldb/dbtransaction.h>
|
||||
#include "convert_db_to_dds.h"
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QSet>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QSet>
|
||||
#include "main_handler.h"
|
||||
#include "base.h"
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
#include "base.h"
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
|
||||
#include "base.h"
|
||||
|
||||
|
||||
+8
-8
@@ -17,20 +17,20 @@
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
|
||||
#include <QSet>
|
||||
#include <QVector>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QJsonParseError>
|
||||
#include <QtGui/QPolygonF>
|
||||
#include <QtGui/QTransform>
|
||||
#include <unordered_map>
|
||||
#include <algorithm>
|
||||
#include <QFile>
|
||||
#include <QtCore/QFile>
|
||||
|
||||
#include <QMutex>
|
||||
#include <QMutexLocker>
|
||||
#include <QtCore/QMutex>
|
||||
#include <QtCore/QMutexLocker>
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------------------------------
|
||||
namespace InfrastructureManagement
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#include <utility>
|
||||
#include <LtsCoordinate/lts_coord_vector.h>
|
||||
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
#include <QPolygonF>
|
||||
#include <QTransform>
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#include "object_main_schedule.h"
|
||||
#include <ngldb/dbtransaction.h>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
using namespace InfrastructureManagement;
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
|
||||
+2
-2
@@ -19,8 +19,8 @@
|
||||
#include <LtsUtilsCore/json_object.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include "base.h"
|
||||
#include <Core/core_types.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include "object_special_area.h"
|
||||
#include <utility>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QPolygonF>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
#include <InfrastructureManagement/ism_db.h>
|
||||
|
||||
#include <QtCore/QPointF>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
namespace InfrastructureManagement
|
||||
|
||||
+6
-6
@@ -8,13 +8,13 @@
|
||||
*/
|
||||
|
||||
#include "parse_building_xml.h"
|
||||
#include <QDomDocument>
|
||||
#include <QFile>
|
||||
#include <QPointF>
|
||||
#include <QtXml/QDomDocument>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtCore/QPointF>
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
|
||||
|
||||
+2
-2
@@ -10,8 +10,8 @@
|
||||
|
||||
#include "svcismclient_export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QVector>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QVector>
|
||||
#include <InfrastructureManagement/ism_dtc.h>
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
#include <InfrastructureManagement/ism_enums.hpp>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QStateMachine>
|
||||
|
||||
#include <InfrastructureManagement/ism_enums.hpp>
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
|
||||
#include "settings.h"
|
||||
|
||||
#include <QSettings>
|
||||
#include <QVariant>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtCore/QVariant>
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user