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
+3
-3
@@ -3,10 +3,10 @@
|
||||
#pragma once
|
||||
|
||||
#include <QtGlobal>
|
||||
#include <QVector>
|
||||
#include <QDataStream>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QDataStream>
|
||||
#include <QVarLengthArray>
|
||||
#include <QIODevice>
|
||||
#include <QtCore/QIODevice>
|
||||
|
||||
namespace ProjectionWorkstation
|
||||
{
|
||||
|
||||
+4
-4
@@ -4,10 +4,10 @@
|
||||
|
||||
#include "pws_rfb_protocol.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QTcpSocket>
|
||||
#include <QDataStream>
|
||||
#include <QHostAddress>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtNetwork/QTcpSocket>
|
||||
#include <QtCore/QDataStream>
|
||||
#include <QtNetwork/QHostAddress>
|
||||
|
||||
#include <pwscommon_export.h>
|
||||
#include <LtsProjectionWorkstation/logger.h>
|
||||
|
||||
+2
-2
@@ -13,8 +13,8 @@
|
||||
|
||||
#include <nglsettings/nglsettings_connections.h>
|
||||
|
||||
#include <QJsonObject>
|
||||
#include <QUuid>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QUuid>
|
||||
#include <QHostInfo>
|
||||
|
||||
#include <functional>
|
||||
|
||||
+5
-5
@@ -5,12 +5,12 @@
|
||||
|
||||
#include <LtsProjectionWorkstation/logger.h>
|
||||
|
||||
#include <QMutexLocker>
|
||||
#include <QPainter>
|
||||
#include <QtCore/QMutexLocker>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QOpenGLPaintDevice>
|
||||
#include <QOpenGLFunctions>
|
||||
#include <QThread>
|
||||
#include <QTimer>
|
||||
#include <QtGui/QOpenGLFunctions>
|
||||
#include <QtCore/QThread>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <cmath>
|
||||
|
||||
|
||||
+4
-4
@@ -6,12 +6,12 @@
|
||||
#include <Plugins/ProjectionWorkstation/Common/pws_rfb_protocol.h>
|
||||
#include <Plugins/ProjectionWorkstation/Common/pws_vnc_handler.h>
|
||||
|
||||
#include <QMutex>
|
||||
#include <QtCore/QMutex>
|
||||
#include <QOpenGLFramebufferObject>
|
||||
#include <QOpenGLTextureBlitter>
|
||||
#include <QOpenGLWidget>
|
||||
#include <QOpenGLFunctions>
|
||||
#include <QHostAddress>
|
||||
#include <QtWidgets/QOpenGLWidget>
|
||||
#include <QtGui/QOpenGLFunctions>
|
||||
#include <QtNetwork/QHostAddress>
|
||||
|
||||
namespace Ui { class VncViewerDialog; }
|
||||
|
||||
|
||||
Reference in new issue
Block a user