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:
1 parent
3d3c3b48fe
commit
7a6be7474e
2839 files changed
+6495
-6513
No files matched your search
@@ -5,16 +5,16 @@
|
||||
#include <AudioVideoManagement/ava_control.h>
|
||||
#include <LtsMultiMonitor/lts_dummy_widget.h>
|
||||
#include <LtsMultiMonitor/lts_multi_monitor.h>
|
||||
#include <QGuiApplication>
|
||||
#include <QScreen>
|
||||
#include <QPoint>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtCore/QPoint>
|
||||
#include <QtGlobal>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#include <QDebug>
|
||||
#include <QtCore/QDebug>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <avmshared_export.h>
|
||||
#include <QObject>
|
||||
#include <QRect>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QRect>
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
namespace LtsMultiMonitor
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <avmshared_export.h>
|
||||
#include <QString>
|
||||
#include <QObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QObject>
|
||||
#include <memory>
|
||||
#include <functional>
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <nglsettings/nglsettings_connections.h>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
#include <QtGlobal>
|
||||
#include <QSettings>
|
||||
#include <QtCore/QSettings>
|
||||
|
||||
|
||||
namespace
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <avmshared_export.h>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <memory>
|
||||
#include <chrono>
|
||||
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#include "project_settings.h"
|
||||
#include <LtsUtilsSettings/settings.h>
|
||||
#include <QString>
|
||||
#include <QVariant>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVariant>
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#include "stream_list_result.h"
|
||||
|
||||
#include <QMap>
|
||||
#include <QtCore/QMap>
|
||||
|
||||
namespace AudioVideoManagement {
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QtCore/QObject>
|
||||
#include <AudioVideoManagement/ava_types.h>
|
||||
#include <avmshared_export.h>
|
||||
|
||||
|
||||
Reference in new issue
Block a user