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
+3
-3
@@ -10,9 +10,9 @@
|
||||
#include <LtsWidgets/lts_global_wait_dialog.h>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <Plugins/PresentationManagement/Gui/Common/pre_model.h>
|
||||
#include <QMessageBox>
|
||||
#include <QCloseEvent>
|
||||
#include <QTimer>
|
||||
#include <QtWidgets/QMessageBox>
|
||||
#include <QtGui/QCloseEvent>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
|
||||
namespace PresentationManagement
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include <LtsWidgets/lts_frameless_dialog.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <Services/PresentationManagement/pre_ftc.h>
|
||||
#include <QDialog>
|
||||
#include <QtWidgets/QDialog>
|
||||
|
||||
|
||||
namespace Ui { class ScriptChooser; }
|
||||
|
||||
+6
-6
@@ -8,12 +8,12 @@
|
||||
#include <LtsPluginManager/lts_plugin_loader.h>
|
||||
#include <ngldb/nsqlquery.h>
|
||||
#include <ngldb/dbtransaction.h>
|
||||
#include <QSqlDriver>
|
||||
#include <QSqlError>
|
||||
#include <QSqlField>
|
||||
#include <QSqlIndex>
|
||||
#include <QSqlRecord>
|
||||
#include <QVariant>
|
||||
#include <QtSql/QSqlDriver>
|
||||
#include <QtSql/QSqlError>
|
||||
#include <QtSql/QSqlField>
|
||||
#include <QtSql/QSqlIndex>
|
||||
#include <QtSql/QSqlRecord>
|
||||
#include <QtCore/QVariant>
|
||||
|
||||
namespace TakeHomePackageGenerator
|
||||
{
|
||||
|
||||
+2
-2
@@ -2,8 +2,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QVector>
|
||||
#include <QSqlDatabase>
|
||||
#include <QtCore/QVector>
|
||||
#include <QtSql/QSqlDatabase>
|
||||
|
||||
#include <PluginInterfaces/record_replay_plugin.h>
|
||||
#include <PresentationManagement/logger.h>
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "dvd_writer.h"
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <QFileInfo>
|
||||
#include <QtCore/QFileInfo>
|
||||
|
||||
namespace TakeHomePackageGenerator
|
||||
{
|
||||
|
||||
+5
-5
@@ -6,11 +6,11 @@
|
||||
#include <PresentationManagement/logger.h>
|
||||
#include "export.h"
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QProcess>
|
||||
#include <QPointer>
|
||||
#include <QProgressDialog>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QProcess>
|
||||
#include <QtCore/QPointer>
|
||||
#include <QtWidgets/QProgressDialog>
|
||||
|
||||
namespace TakeHomePackageGenerator
|
||||
{
|
||||
|
||||
+3
-3
@@ -4,10 +4,10 @@
|
||||
#include "export_process.h"
|
||||
#include <utility>
|
||||
#include "export_step.h"
|
||||
#include <QDir>
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QJsonParseError>
|
||||
#include <QProgressDialog>
|
||||
#include <QtWidgets/QProgressDialog>
|
||||
#include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
|
||||
#include <Plugins/AssetManagement/asm_data_plugin_interface.h>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
|
||||
#include <preguiscriptcommon_export.h>
|
||||
#include <Plugins/PresentationManagement/Gui/Common/topic_assignment.h>
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <preguiscriptcommon_export.h>
|
||||
#include <QObject>
|
||||
#include <QTimer>
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <LtsScriptTimeline/track_entry.h>
|
||||
#include <PluginInterfaces/topic_replay_interface.h>
|
||||
|
||||
+7
-7
@@ -9,13 +9,13 @@
|
||||
#include <ngldb/dbtransaction.h>
|
||||
#include <ngldb/nsqlquery.h>
|
||||
|
||||
#include <QFile>
|
||||
#include <QSqlRecord>
|
||||
#include <QSqlError>
|
||||
#include <QSqlField>
|
||||
#include <QSqlIndex>
|
||||
#include <QSqlDatabase>
|
||||
#include <QVariant>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtSql/QSqlRecord>
|
||||
#include <QtSql/QSqlError>
|
||||
#include <QtSql/QSqlField>
|
||||
#include <QtSql/QSqlIndex>
|
||||
#include <QtSql/QSqlDatabase>
|
||||
#include <QtCore/QVariant>
|
||||
|
||||
|
||||
namespace TakeHomePackageGenerator
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <PresentationManagement/logger.h>
|
||||
#include <QString>
|
||||
#include <QSqlDatabase>
|
||||
#include <QtCore/QString>
|
||||
#include <QtSql/QSqlDatabase>
|
||||
|
||||
namespace TakeHomePackageGenerator
|
||||
{
|
||||
|
||||
+12
-12
@@ -3,19 +3,19 @@
|
||||
|
||||
#include "topic_designer.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QPaintEvent>
|
||||
#include <QPainter>
|
||||
#include <QPen>
|
||||
#include <QBrush>
|
||||
#include <QColor>
|
||||
#include <QPoint>
|
||||
#include <QRect>
|
||||
#include <QSize>
|
||||
#include <QtCore/QDebug>
|
||||
#include <QtGui/QPaintEvent>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPen>
|
||||
#include <QtGui/QBrush>
|
||||
#include <QtGui/QColor>
|
||||
#include <QtCore/QPoint>
|
||||
#include <QtCore/QRect>
|
||||
#include <QtCore/QSize>
|
||||
#include <QCursor>
|
||||
#include <QTimer>
|
||||
#include <QScrollArea>
|
||||
#include <QScrollBar>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtWidgets/QScrollArea>
|
||||
#include <QtWidgets/QScrollBar>
|
||||
|
||||
|
||||
namespace PresentationManagement
|
||||
|
||||
+4
-4
@@ -6,11 +6,11 @@
|
||||
#include <preguiscriptcommon_export.h>
|
||||
#include <TopicEditorBase/topic_editor_utils.h>
|
||||
|
||||
#include <QWidget>
|
||||
#include <QVector>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtCore/QVector>
|
||||
#include <QLinkedList>
|
||||
#include <QPointer>
|
||||
#include <QScrollArea>
|
||||
#include <QtCore/QPointer>
|
||||
#include <QtWidgets/QScrollArea>
|
||||
|
||||
|
||||
namespace PresentationManagement
|
||||
|
||||
Reference in new issue
Block a user