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
-1
@@ -14,7 +14,7 @@
|
||||
#include <AudioVideoManagement/mounting_point.h>
|
||||
#include <InfrastructureManagement/ism.hpp>
|
||||
#include <LtsUtils/LtsUtilsCore/data_modification_enum.h>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <QSignalSpy>
|
||||
#include <vector>
|
||||
#include <functional>
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
/**
|
||||
* @author Christian Fröbel
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <AudioVideoManagement/avm_enums.hpp>
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
#include <memory>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
|
||||
#include "av_helper_test.h"
|
||||
#include <AudioVideoManagement/av_helper.h>
|
||||
#include <QDateTime>
|
||||
#include <QByteArray>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <string>
|
||||
|
||||
using namespace AudioVideoManagement;
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
/**
|
||||
* @author Christian Fröbel
|
||||
|
||||
+5
-5
@@ -12,11 +12,11 @@
|
||||
#include <AudioVideoManagement/ava_comm.h>
|
||||
#include <AudioVideoManagement/ava_types.h>
|
||||
#include <AudioVideoManagement/avs_dialog.h>
|
||||
#include <QCoreApplication>
|
||||
#include <QDateTime>
|
||||
#include <QList>
|
||||
#include <QVector>
|
||||
#include <QByteArray>
|
||||
#include <QtCore/QCoreApplication>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QByteArray>
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
using namespace AudioVideoManagement;
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
#include <memory>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
|
||||
+2
-2
@@ -15,9 +15,9 @@
|
||||
#include <AudioVideoManagement/stream_name_mapping.h>
|
||||
#include <AudioVideoManagement/avs_dialog.h>
|
||||
#include <AudioVideoManagement/list_response_collector.h>
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtGlobal>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QSignalSpy>
|
||||
#include <boost/optional.hpp>
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
#include <memory>
|
||||
|
||||
namespace AudioVideoManagement
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <utility>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QRegExp>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include "ava_test_server.h"
|
||||
|
||||
namespace AudioVideoManagement
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
|
||||
#include "ava_test_server.h"
|
||||
#include <QCoreApplication>
|
||||
#include <QtCore/QCoreApplication>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
/**
|
||||
* @author Christian Fröbel
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
/**
|
||||
* @author Christian Fröbel
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
/**
|
||||
* @author Christian Fröbel
|
||||
|
||||
+2
-2
@@ -12,8 +12,8 @@
|
||||
#include <AudioVideoManagement/list_response_collector.h>
|
||||
#include <AudioVideoManagement/ava_types.h>
|
||||
#include <AudioVideoManagement/av_helper.h>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
using namespace AudioVideoManagement;
|
||||
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
/**
|
||||
* @author Christian Fröbel
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <QtTest/QtTest>
|
||||
#include <QCommandLineParser>
|
||||
#include <QCommandLineOption>
|
||||
#include <QStringList>
|
||||
#include <QtCore/QStringList>
|
||||
#include <map>
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
/**
|
||||
* @author Christian Fröbel
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
|
||||
/**
|
||||
* @author Christian Fröbel
|
||||
|
||||
Reference in new issue
Block a user