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
@@ -2,13 +2,13 @@
|
||||
|
||||
#include "ngldialog.h"
|
||||
|
||||
#include <QApplication>
|
||||
#include <QDir>
|
||||
#include <QFrame>
|
||||
#include <QIcon>
|
||||
#include <QKeyEvent>
|
||||
#include <QScreen>
|
||||
#include <QVBoxLayout>
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtWidgets/QFrame>
|
||||
#include <QtGui/QIcon>
|
||||
#include <QtGui/QKeyEvent>
|
||||
#include <QtGui/QScreen>
|
||||
#include <QtWidgets/QVBoxLayout>
|
||||
#include <ngltools/ngltools_helpevent.h>
|
||||
|
||||
#include <time.h>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "nglwidgets_export.h"
|
||||
|
||||
#include <QDialog>
|
||||
#include <QtWidgets/QDialog>
|
||||
#include "nglstandardbutton.h"
|
||||
|
||||
class NGLWIDGETS_EXPORT NGLDialog : public QDialog
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
#include "ngldialogbuttonbox.h"
|
||||
|
||||
#include <QAction>
|
||||
#include <QHBoxLayout>
|
||||
#include <QFrame>
|
||||
#include <QtGui/QAction>
|
||||
#include <QtWidgets/QHBoxLayout>
|
||||
#include <QtWidgets/QFrame>
|
||||
|
||||
NGLDialogButtonBox::NGLDialogButtonBox(QWidget *parent)
|
||||
: NGLDialogButtonBox(Qt::Horizontal, parent)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QMultiMap>
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
#include "nglwidgets_export.h"
|
||||
#include "nglstandardbutton.h"
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
#include <NGLLogger/NGLLoggerBootstrap.h>
|
||||
#include <QtCore/QLibraryInfo>
|
||||
#include <QtCore/QTextStream>
|
||||
#include <QGuiApplication>
|
||||
#include <QMenu>
|
||||
#include <QMenuBar>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtWidgets/QMenuBar>
|
||||
|
||||
NGLMainWindow::NGLMainWindow(QWidget *parent)
|
||||
: m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QMainWindow>
|
||||
#include <QMap>
|
||||
#include <QProcess>
|
||||
#include <QtWidgets/QMainWindow>
|
||||
#include <QtCore/QMap>
|
||||
#include <QtCore/QProcess>
|
||||
#include "nglwidgets_export.h"
|
||||
|
||||
namespace NGL
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
#include "nglpdfpage.h"
|
||||
|
||||
#include <QtCore/QUrl>
|
||||
#include <QLabel>
|
||||
#include <QScrollArea>
|
||||
#include <QScrollBar>
|
||||
#include <QVBoxLayout>
|
||||
#include <QTimer>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <QtWidgets/QScrollArea>
|
||||
#include <QtWidgets/QScrollBar>
|
||||
#include <QtWidgets/QVBoxLayout>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
#pragma once
|
||||
|
||||
#include <QWidget>
|
||||
#include <QString>
|
||||
#include <QVector>
|
||||
#include <QPointer>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtCore/QPointer>
|
||||
#include <poppler/qt6/poppler-qt6.h>
|
||||
|
||||
#include "nglwidgets_export.h"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <QtCore/QSizeF>
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <poppler/qt6/poppler-qt6.h>
|
||||
#include <vector>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
|
||||
|
||||
#pragma once
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <memory>
|
||||
#include <poppler/qt6/poppler-qt6.h>
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
|
||||
|
||||
#include "nglstandardbutton.h"
|
||||
#include <QMenu>
|
||||
#include <QEvent>
|
||||
#include <QAction>
|
||||
#include <QKeySequence>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtCore/QEvent>
|
||||
#include <QtGui/QAction>
|
||||
#include <QtGui/QKeySequence>
|
||||
|
||||
NGLStandardButton::NGLStandardButton(QWidget *parent)
|
||||
: NGLStandardButton(NoButton, parent)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QPushButton>
|
||||
#include <QtWidgets/QPushButton>
|
||||
|
||||
#include "nglwidgets_export.h"
|
||||
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QIcon>
|
||||
#include <QVariant>
|
||||
#include <QVector>
|
||||
#include <QtGui/QIcon>
|
||||
#include <QtCore/QVariant>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
#include "nglwidgets_export.h"
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include <QTest>
|
||||
#include <QtTest/QTest>
|
||||
#include "nglpdfwidget.h"
|
||||
|
||||
class TestPDFWidget : public QObject
|
||||
|
||||
Reference in new issue
Block a user