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
@@ -1,8 +1,8 @@
|
||||
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QStringList>
|
||||
#include <QHostAddress>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtNetwork/QHostAddress>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include "tetra_if.h"
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
|
||||
#include <QCoreApplication>
|
||||
#include <QDateTime>
|
||||
#include <QDir>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QDir>
|
||||
#include <QNetworkInterface>
|
||||
#include <QStringList>
|
||||
#include <QTcpSocket>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtNetwork/QTcpSocket>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
|
||||
#include <CoPrtCnv/CoPrtCnvTelegramConverter.hpp>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
|
||||
|
||||
#pragma once
|
||||
#include <QObject>
|
||||
#include <QHostAddress>
|
||||
#include <QByteArray>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtNetwork/QHostAddress>
|
||||
#include <QtCore/QByteArray>
|
||||
|
||||
#include <NGLLogger/INGLLogger.h>
|
||||
#include <CoPrtCnv/CoPrtCnvRadioTelegram.hpp>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include <QApplication>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include "mainwindow.h"
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#include "mainwindow.h"
|
||||
#include <utility>
|
||||
#include "ui_mainwindow.h"
|
||||
#include <QFileDialog>
|
||||
#include <QFile>
|
||||
#include <QtWidgets/QFileDialog>
|
||||
#include <QtCore/QFile>
|
||||
#include <cmath>
|
||||
#include <QIntValidator>
|
||||
#include <QList>
|
||||
#include <QSet>
|
||||
#include <QTimer>
|
||||
#include <QtGui/QIntValidator>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#ifndef MAINWINDOW_H
|
||||
#define MAINWINDOW_H
|
||||
|
||||
#include <QMainWindow>
|
||||
#include <QDateTime>
|
||||
#include <QFile>
|
||||
#include <QtWidgets/QMainWindow>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QFile>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
#include <sys/stat.h>
|
||||
#include <stdio.h>
|
||||
#include <iostream>
|
||||
#include <QCoreApplication>
|
||||
#include <QThread>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QThread>
|
||||
|
||||
namespace PrtCnv
|
||||
{
|
||||
|
||||
@@ -25,10 +25,10 @@
|
||||
#include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
|
||||
#include <LtsUtils/dds_bitarray.h>
|
||||
|
||||
#include <QTimer>
|
||||
#include <QCoreApplication>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <time.h>
|
||||
#include <TrainingAreaBase/training_area_telegrams.h>
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <CoPrtCnv/CoPrtCnvCentralTelegram.hpp>
|
||||
#include "PrtCnvInjectionThread.hpp"
|
||||
#include <QtCore/QByteArray>
|
||||
#include <QTcpSocket>
|
||||
#include <QtNetwork/QTcpSocket>
|
||||
|
||||
namespace PrtCnv
|
||||
{
|
||||
|
||||
@@ -33,9 +33,9 @@
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <time.h>
|
||||
#include <iostream>
|
||||
#include <math.h>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
|
||||
#include "PrtCnvThread.hpp"
|
||||
#include <QThread>
|
||||
#include <QtCore/QThread>
|
||||
|
||||
namespace PrtCnv
|
||||
{
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
#include <time.h>
|
||||
#include <random>
|
||||
#include <iostream>
|
||||
#include <QStringList>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
TTWorker::TTWorker(QTcpSocket *socket, const TTSArgs &ttsArgs)
|
||||
: m_socket(socket)
|
||||
|
||||
Reference in new issue
Block a user