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,7 +1,7 @@
|
||||
#include "Lts/Common/LtsTimelineClassic/Event.h"
|
||||
|
||||
#include <QColor>
|
||||
#include <QJsonObject>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
namespace LtsTimelineClassic
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "Lts/Common/LtsTimelineClassic/EventDelegate.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
namespace LtsTimelineClassic
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "Lts/Common/LtsTimelineClassic/Event.h"
|
||||
#include "Lts/Common/LtsTimelineClassic/EventGraphic.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QRect>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtCore/QRect>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
namespace LtsTimelineClassic
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
#include "Lts/Common/LtsTimelineClassic/EventGraphic.h"
|
||||
#include "Lts/Common/LtsTimelineClassic/EventTools.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QPixmap>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
namespace LtsTimelineClassic
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "Lts/Common/LtsTimelineClassic/Item.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
namespace LtsTimelineClassic
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#include "Lts/Common/LtsAppDescriptor/lts_app_descriptor.h"
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtTest/QtTest>
|
||||
|
||||
namespace LtsAppDescriptor
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "lts_app_descriptor_editor.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtTest/QtTest>
|
||||
|
||||
class TestLtsAppDescriptorEditor : public QObject
|
||||
|
||||
@@ -9,12 +9,12 @@
|
||||
* 4. QStyleOption::initFrom() usage
|
||||
*/
|
||||
|
||||
#include <QApplication>
|
||||
#include <QComboBox>
|
||||
#include <QPushButton>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtWidgets/QComboBox>
|
||||
#include <QtWidgets/QPushButton>
|
||||
#include <QRandomGenerator>
|
||||
#include <QStyleOption>
|
||||
#include <QWheelEvent>
|
||||
#include <QtGui/QWheelEvent>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
// Ensure QApplication is initialized for widget tests
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
*/
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
// Test that the test framework is working
|
||||
TEST(MigrationStubs, TestFrameworkWorks)
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
#include "Lts/Common/LtsTimelineClassic/EventTools.h"
|
||||
#include "Lts/Common/LtsTimelineClassic/PassiveEventContainer.h"
|
||||
|
||||
#include <QPainter>
|
||||
#include <QPixmap>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <QStyleOptionViewItem>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
* 6. QXmlStreamWriter UTF-8 handling (no setCodec needed)
|
||||
*/
|
||||
|
||||
#include <QBuffer>
|
||||
#include <QList>
|
||||
#include <QMap>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QMap>
|
||||
#include <QMultiMap>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <QStringView>
|
||||
#include <QVariant>
|
||||
#include <QXmlStreamWriter>
|
||||
#include <QtCore/QVariant>
|
||||
#include <QtCore/QXmlStreamWriter>
|
||||
#include <QtGui/QFont>
|
||||
#include <QtGui/QFontMetricsF>
|
||||
#include <QtGui/QGuiApplication>
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
* 3. Qt6 APIs function correctly
|
||||
*/
|
||||
|
||||
#include <QChar>
|
||||
#include <QtCore/QChar>
|
||||
#include <QRandomGenerator>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <QStringView>
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
// Test 1: QRandomGenerator basic functionality
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#include "Lts/Common/LtsTimelineClassic/Event.h"
|
||||
#include "Lts/Common/LtsTimelineClassic/TestTimelineModel.h"
|
||||
|
||||
#include <QColor>
|
||||
#include <QJsonObject>
|
||||
#include <QStringList>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QStringList>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
namespace LtsTimelineClassic
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "Lts/Common/LtsTimelineClassic/TimelineHeaderView.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
namespace LtsTimelineClassic
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "Lts/Common/LtsTimelineClassic/TimelineIndicator.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
namespace LtsTimelineClassic
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "Lts/Common/LtsTimelineClassic/TimelineView.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
namespace LtsTimelineClassic
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "Lts/Common/LtsTimelineClassic/TimelineWidget.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
namespace LtsTimelineClassic
|
||||
|
||||
Reference in new issue
Block a user