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
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "rep_input_aes_model.h"
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace ReportManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include <ReportManagement/rep_enums.hpp>
|
||||
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QtCore/QSortFilterProxyModel>
|
||||
|
||||
|
||||
namespace ReportManagement
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
|
||||
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QtCore/QSortFilterProxyModel>
|
||||
|
||||
namespace ReportManagement
|
||||
{
|
||||
|
||||
+6
-6
@@ -3,12 +3,12 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QSet>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QAbstractTableModel>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QtCore/QSet>
|
||||
#include <QtCore/QSortFilterProxyModel>
|
||||
#include <QtCore/QAbstractTableModel>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QVariantList>
|
||||
#include <QtGui/QBrush>
|
||||
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
#include <QFont>
|
||||
#include <QtGui/QFont>
|
||||
|
||||
using namespace ReportManagement;
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
#include <QFont>
|
||||
#include <QtGui/QFont>
|
||||
|
||||
using namespace ReportManagement;
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
|
||||
#include <QFont>
|
||||
#include <QtGui/QFont>
|
||||
|
||||
using namespace ReportManagement;
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
|
||||
#include <QFont>
|
||||
#include <QtGui/QFont>
|
||||
|
||||
using namespace ReportManagement;
|
||||
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
#include <QFont>
|
||||
#include <QtGui/QFont>
|
||||
|
||||
using namespace ReportManagement;
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
#include <QFont>
|
||||
#include <QtGui/QFont>
|
||||
|
||||
using namespace ReportManagement;
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
|
||||
#include <QFont>
|
||||
#include <QtGui/QFont>
|
||||
|
||||
using namespace ReportManagement;
|
||||
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
|
||||
#include <QFont>
|
||||
#include <QtGui/QFont>
|
||||
|
||||
using namespace ReportManagement;
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
|
||||
#include <QFont>
|
||||
#include <QtGui/QFont>
|
||||
|
||||
using namespace ReportManagement;
|
||||
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
|
||||
#include <QFont>
|
||||
#include <QtGui/QFont>
|
||||
|
||||
using namespace ReportManagement;
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
#include <QFont>
|
||||
#include <QtGui/QFont>
|
||||
|
||||
using namespace ReportManagement;
|
||||
|
||||
|
||||
+3
-3
@@ -7,10 +7,10 @@
|
||||
#include "rep_report_preview.h"
|
||||
#include "ui_rep_report_edit.h"
|
||||
|
||||
#include <QAction>
|
||||
#include <QtGui/QAction>
|
||||
#include <QElapsedTimer>
|
||||
#include <QMenu>
|
||||
#include <QTimer>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsSession/lts_session_manager.h>
|
||||
|
||||
+2
-2
@@ -13,8 +13,8 @@
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <ReportManagement/rep_operator_rights.h>
|
||||
|
||||
#include <QTreeView>
|
||||
#include <QDateTime>
|
||||
#include <QtWidgets/QTreeView>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
namespace ReportManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <ReportManagement/rep_translation.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <QSet>
|
||||
#include <QtCore/QSet>
|
||||
|
||||
namespace dds
|
||||
{
|
||||
|
||||
+4
-4
@@ -56,10 +56,10 @@
|
||||
#include <nglsettings/nglsettings_settings.h>
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
|
||||
#include <QDir>
|
||||
#include <QDateTime>
|
||||
#include <QPixmap>
|
||||
#include <QStandardItemModel>
|
||||
#include <QtCore/QDir>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <QtGui/QStandardItemModel>
|
||||
|
||||
namespace ReportManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#include <KDReports/KDReports.h>
|
||||
|
||||
#include <TopicEditor/topic_editor.h>
|
||||
#include <QBoxLayout>
|
||||
#include <QLabel>
|
||||
#include <QtWidgets/QBoxLayout>
|
||||
#include <QtWidgets/QLabel>
|
||||
|
||||
namespace ReportManagement
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user