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 "evl_topic_editor_model.h"
|
||||
|
||||
#include <Evaluations/evl_translation.h>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <Evaluations/evl_dtc.h>
|
||||
#include <Evaluations/logger.h>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QtCore/QSortFilterProxyModel>
|
||||
#include <nglwidgets/ngltreemodel.h>
|
||||
|
||||
class QTableWidget;
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
#include <LtsUtilsCore/json_object.h>
|
||||
#include <LtsWidgets/lts_combo_box.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <QJsonParseError>
|
||||
#include <nglwidgets/ngltreeitem.h>
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <LtsPrinting/printing.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace Evaluations
|
||||
{
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
|
||||
namespace Evaluations
|
||||
{
|
||||
|
||||
+3
-3
@@ -14,9 +14,9 @@
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <LtsWidgets/lts_base_layout_widget.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <QDateTime>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <utility>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
|
||||
#include <AudioVideoManagement/stream_name_mapping.h>
|
||||
#include <LtsUtilsCore/json_object.h>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
namespace Evaluations
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
#include <Plugins/Evaluations/evl_data_plugin_interface.h>
|
||||
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
|
||||
#include <QIntValidator>
|
||||
#include <QJsonDocument>
|
||||
#include <QtGui/QIntValidator>
|
||||
#include <QtCore/QJsonDocument>
|
||||
#include <Services/Evaluations/san_category_line_json.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
#include <ngltranslator/ngltranslator.h>
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#include "evl_comment_model.h"
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QColor>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtGui/QColor>
|
||||
#include <LtsSession/lts_session_manager.h>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
|
||||
+2
-2
@@ -4,8 +4,8 @@
|
||||
#pragma once
|
||||
|
||||
|
||||
#include <QString>
|
||||
#include <QDateTime>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QDateTime>
|
||||
|
||||
|
||||
namespace Evaluations
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <PluginInterfaces/data_plugin_interface.h>
|
||||
|
||||
#include <QKeyEvent>
|
||||
#include <QtGui/QKeyEvent>
|
||||
|
||||
namespace Evaluations
|
||||
{
|
||||
|
||||
+5
-5
@@ -7,11 +7,11 @@
|
||||
|
||||
#include <Evaluations/evl_translation.h>
|
||||
#include <LtsSession/lts_session_data.h>
|
||||
#include <QInputDialog>
|
||||
#include <QKeyEvent>
|
||||
#include <QMenu>
|
||||
#include <QTimer>
|
||||
#include <QTreeView>
|
||||
#include <QtWidgets/QInputDialog>
|
||||
#include <QtGui/QKeyEvent>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtWidgets/QTreeView>
|
||||
|
||||
namespace Evaluations
|
||||
{
|
||||
|
||||
+4
-4
@@ -3,10 +3,10 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QIcon>
|
||||
#include <QString>
|
||||
#include <QDateTime>
|
||||
#include <QDataStream>
|
||||
#include <QtGui/QIcon>
|
||||
#include <QtCore/QString>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QDataStream>
|
||||
|
||||
namespace Evaluations
|
||||
{
|
||||
|
||||
+2
-2
@@ -2,8 +2,8 @@
|
||||
|
||||
#include "evl_edit_treemodel_schema.h"
|
||||
|
||||
#include <QJsonArray>
|
||||
#include <QJsonObject>
|
||||
#include <QtCore/QJsonArray>
|
||||
#include <QtCore/QJsonObject>
|
||||
#include <ngltools/ngltools_dtg.h>
|
||||
|
||||
namespace Evaluations
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <Evaluations/logger.h>
|
||||
#include "evl_edit_treemodel_general.h"
|
||||
|
||||
#include <QJsonDocument>
|
||||
#include <QtCore/QJsonDocument>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <TopicEditorBase/topic_editor_interface.h>
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace Evaluations
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user