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
@@ -6,8 +6,8 @@
|
||||
*/
|
||||
|
||||
#include "effect_show_effect_cluster.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QObject>
|
||||
#include "settings.h"
|
||||
|
||||
const static int DEFAULT_EFFECT_DURATION = 777777;
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
|
||||
#include "effect_show_mine_area.h"
|
||||
|
||||
#include <QLineF>
|
||||
#include <QtCore/QLineF>
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <EffectShowManagement/esm_db.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <QPointF>
|
||||
#include <QtCore/QPointF>
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
#include <EffectShowManagement/esm_db.h>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include "esm_convert_to_tab.h"
|
||||
#include <LtsUtils/qbytearray_byteaccess.h>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <QByteArray>
|
||||
#include <QtCore/QByteArray>
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
#include <TrainingAreaBase/tab_dtc.h>
|
||||
#include <MeteoDataManagement/mdm_dtc.h>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
* $HeadURL$
|
||||
* $Author$
|
||||
*/
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
#include "handler_aes_data.h"
|
||||
#include "object_aes_data.h"
|
||||
#include "handler_effect_show_vehicle_status.h"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "logger.h"
|
||||
#include "handler_effect_show.h"
|
||||
#include <AreaEffectSimulation/aes_dtc.h>
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -7,8 +7,8 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QHash>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "initialization.h"
|
||||
|
||||
+2
-2
@@ -13,8 +13,8 @@
|
||||
#include "esm_db.h"
|
||||
#include "initialization.h"
|
||||
|
||||
#include <QTimer>
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -7,9 +7,9 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
#include <QQueue>
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "esm_convert_from_tab.h"
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
#include "esm_db.h"
|
||||
#include "initialization.h"
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
|
||||
+3
-3
@@ -7,9 +7,9 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QMap>
|
||||
#include <QTimer>
|
||||
#include <QObject>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "esm_convert_from_tab.h"
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
#include <MeteoDataManagement/mdm_dtc.h>
|
||||
|
||||
namespace EffectShowManagement
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
#include <QHash>
|
||||
#include <QtCore/QHash>
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
|
||||
// Project Data Management - Handling for Effect Show Actors
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "initialization.h"
|
||||
#include "logger.h"
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
// Participand Management-Handling for Effect Show Actors
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
* $Author$
|
||||
* Created by hjl, SLSE, 2017-02-20
|
||||
*/
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
#include <LtsUtils/LtsUtilsCore/dds_vector.h>
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include "initialization.h"
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include "effect_show_mine_area.h"
|
||||
|
||||
#include "initialization.h"
|
||||
#include <QLineF>
|
||||
#include <QtCore/QLineF>
|
||||
|
||||
namespace EffectShowManagement
|
||||
{
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include "dds_handler.h"
|
||||
#include "logger.h"
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include "dds_handler.h"
|
||||
#include "esm_convert_to_tab.h"
|
||||
#include "esm_convert_from_tab.h"
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace NGL
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user