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
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <QLabel>
|
||||
#include <QtWidgets/QLabel>
|
||||
#include <utility>
|
||||
|
||||
using namespace CodificationManagement;
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
#include "cod_authentication_code_model.h"
|
||||
|
||||
#include <QGuiApplication>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QPalette>
|
||||
|
||||
using namespace CodificationManagement;
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <CodificationManagement/cod_dtc.h>
|
||||
#include <CodificationManagement/logger.h>
|
||||
#include <QAbstractTableModel>
|
||||
#include <QtCore/QAbstractTableModel>
|
||||
|
||||
namespace CodificationManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <CodificationManagement/logger.h>
|
||||
#include <QItemDelegate>
|
||||
#include <QObject>
|
||||
#include <QtWidgets/QItemDelegate>
|
||||
#include <QtCore/QObject>
|
||||
|
||||
namespace CodificationManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#include "cod_codification_data_overview_model.h"
|
||||
|
||||
#include <ParticipantManagement/ppm_translation.h>
|
||||
#include <QColor>
|
||||
#include <QtGui/QColor>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
namespace CodificationManagement
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include "ui_cod_codification_data_overview_view.h"
|
||||
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
using namespace CodificationManagement;
|
||||
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
#include "cod_logistical_terms_model.h"
|
||||
#include "cod_phrase_table_model.h"
|
||||
|
||||
#include <QWidget>
|
||||
#include <QAbstractTableModel>
|
||||
#include <QtWidgets/QWidget>
|
||||
#include <QtCore/QAbstractTableModel>
|
||||
|
||||
#include <KDReports/KDReportsAutoTableElement>
|
||||
#include <KDReports/KDReportsCell>
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QBuffer>
|
||||
#include <QtCore/QBuffer>
|
||||
|
||||
namespace CodificationManagement
|
||||
{
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
#include "cod_phrase_table_model.h"
|
||||
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <QFile>
|
||||
#include <QFileDialog>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtWidgets/QFileDialog>
|
||||
|
||||
using namespace CodificationManagement;
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <CodificationManagement/logger.h>
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
namespace CodificationManagement
|
||||
{
|
||||
|
||||
+3
-3
@@ -8,9 +8,9 @@
|
||||
#include "cod_phrase_table_model.h"
|
||||
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <QBuffer>
|
||||
#include <QFile>
|
||||
#include <QFileDialog>
|
||||
#include <QtCore/QBuffer>
|
||||
#include <QtCore/QFile>
|
||||
#include <QtWidgets/QFileDialog>
|
||||
#include <utility>
|
||||
|
||||
using namespace CodificationManagement;
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <CodificationManagement/logger.h>
|
||||
#include <QWidget>
|
||||
#include <QtWidgets/QWidget>
|
||||
|
||||
namespace CodificationManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#include "cod_logistical_terms_model.h"
|
||||
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <QGuiApplication>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QPalette>
|
||||
|
||||
using namespace CodificationManagement;
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <CodificationManagement/cod_dtc.h>
|
||||
#include <CodificationManagement/logger.h>
|
||||
#include <QAbstractTableModel>
|
||||
#include <QtCore/QAbstractTableModel>
|
||||
|
||||
namespace CodificationManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#include "cod_numeral_code_model.h"
|
||||
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <QGuiApplication>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QPalette>
|
||||
|
||||
using namespace CodificationManagement;
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <CodificationManagement/cod_dtc.h>
|
||||
#include <CodificationManagement/logger.h>
|
||||
#include <QAbstractTableModel>
|
||||
#include <QtCore/QAbstractTableModel>
|
||||
|
||||
namespace CodificationManagement
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
#include "cod_phrase_table_model.h"
|
||||
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
#include <QGuiApplication>
|
||||
#include <QtGui/QGuiApplication>
|
||||
#include <QPalette>
|
||||
|
||||
using namespace CodificationManagement;
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <CodificationManagement/cod_dtc.h>
|
||||
#include <CodificationManagement/logger.h>
|
||||
#include <QAbstractTableModel>
|
||||
#include <QtCore/QAbstractTableModel>
|
||||
|
||||
namespace CodificationManagement
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user