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
@@ -1,5 +1,5 @@
|
||||
#include <QApplication>
|
||||
#include <QTimer>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <iostream>
|
||||
#include <thread>
|
||||
|
||||
+5
-5
@@ -9,13 +9,13 @@
|
||||
|
||||
#include <ddkit/actors/Session.hpp>
|
||||
|
||||
#include <QObject>
|
||||
#include <QMutex>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMutex>
|
||||
#include <QQueue>
|
||||
#include <QVector>
|
||||
#include <QMetaObject>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QMetaObject>
|
||||
#include <QEventLoop>
|
||||
#include <QMutexLocker>
|
||||
#include <QtCore/QMutexLocker>
|
||||
|
||||
|
||||
namespace UAS
|
||||
|
||||
+2
-2
@@ -3,9 +3,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QQueue>
|
||||
#include <QMutex>
|
||||
#include <QtCore/QMutex>
|
||||
|
||||
|
||||
namespace UAS
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include "dispatchers/report_point.h"
|
||||
#include "logger.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
#include <set>
|
||||
|
||||
|
||||
+2
-2
@@ -6,8 +6,8 @@
|
||||
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
|
||||
using namespace LtsUtils;
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include <QQueue>
|
||||
#include <QPointer>
|
||||
#include <QtCore/QPointer>
|
||||
|
||||
|
||||
template<class T> using Optional = std::vector<T>;
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include <QVector3D>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
|
||||
namespace UAS
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
#include <ProjectDataManagement/pdm_dtc.h>
|
||||
#include <TrainingAreaBase/recv_from_tab.h>
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
|
||||
namespace UAS
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
|
||||
#include <QSettings>
|
||||
#include <QDebug>
|
||||
#include <QtCore/QSettings>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
namespace UAS
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <QHostInfo>
|
||||
|
||||
#include <TrainingAreaBase/tab_plugin_interface.h>
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@
|
||||
#include <TmsIfAdapter/tms_if_adapter.h>
|
||||
#include <TmsIfAdapter/uav_commander.h>
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
|
||||
namespace UAS
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include <TrainingAreaBase/dds_handler.h>
|
||||
#include <Core/core_types.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace ProjectDataManagement { namespace Interface { class Dtc; } }
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
|
||||
namespace NGL
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#include <TmsIfAdapter/uav_commander.h>
|
||||
|
||||
#include <QVector3D>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <vector>
|
||||
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
#include <TrainingAreaBase/dds_handler.h>
|
||||
#include <ParticipantManagement/ppm_ftc.h>
|
||||
|
||||
#include <QObject>
|
||||
#include <QMap>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QMap>
|
||||
#include <memory>
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user