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:
1 parent
3d3c3b48fe
commit
7a6be7474e
2839 files changed
+6495
-6513
No files matched your search
+5
-5
@@ -8,11 +8,11 @@
|
||||
#include "saab_map_type.h"
|
||||
#include "saab_map_party.h"
|
||||
|
||||
#include <QFileDialog>
|
||||
#include <QXmlStreamWriter>
|
||||
#include <QXmlStreamReader>
|
||||
#include <QDateTime>
|
||||
#include <QUuid>
|
||||
#include <QtWidgets/QFileDialog>
|
||||
#include <QtCore/QXmlStreamWriter>
|
||||
#include <QtCore/QXmlStreamReader>
|
||||
#include <QtCore/QDateTime>
|
||||
#include <QtCore/QUuid>
|
||||
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsUtils/LtsUtilsSettings/settings.h>
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
#include <ExerciseManagement/exm.hpp>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
|
||||
#include <QFile>
|
||||
#include <QtCore/QFile>
|
||||
|
||||
class QXmlStreamWriter;
|
||||
class QXmlStreamReader;
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include "saab_logging.h"
|
||||
#include "saab_import_show.h"
|
||||
|
||||
#include <QFileDialog>
|
||||
#include <QtWidgets/QFileDialog>
|
||||
|
||||
#include <ngltools/ngltools_filesystem.h>
|
||||
#include <Common/participant_dis_helper.h>
|
||||
|
||||
+3
-3
@@ -9,7 +9,7 @@
|
||||
#include "saab_types.h"
|
||||
#include "zwmssaab_export.h"
|
||||
|
||||
#include <QModelIndex>
|
||||
#include <QtCore/QModelIndex>
|
||||
#include <ParticipantManagement/Gui/Common/participant_edit_model.h>
|
||||
|
||||
#include <memory>
|
||||
@@ -23,8 +23,8 @@
|
||||
#include <ParticipantManagement/ppm_templates_gui_plugin_interface.h>
|
||||
#include <ParticipantManagement/ppm_data_plugin_interface.h>
|
||||
|
||||
#include <QXmlStreamReader>
|
||||
#include <QFile>
|
||||
#include <QtCore/QXmlStreamReader>
|
||||
#include <QtCore/QFile>
|
||||
#include "saab_xml_strings.h"
|
||||
|
||||
class QXmlStreamReader;
|
||||
|
||||
+2
-2
@@ -3,8 +3,8 @@
|
||||
|
||||
#include "saab_import_show.h"
|
||||
#include "ui_saab_import_show.h"
|
||||
#include <QMenu>
|
||||
#include <QFile>
|
||||
#include <QtWidgets/QMenu>
|
||||
#include <QtCore/QFile>
|
||||
#include <LtsWidgets/lts_message_dialog.h>
|
||||
|
||||
#include <nglwidgets/nglstandardbutton.h>
|
||||
|
||||
+3
-3
@@ -2,9 +2,9 @@
|
||||
|
||||
#include "saab_types.h"
|
||||
#include <utility>
|
||||
#include <QRegularExpression>
|
||||
#include <QStringList>
|
||||
#include <QXmlStreamWriter>
|
||||
#include <QtCore/QRegularExpression>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QXmlStreamWriter>
|
||||
#include "saab_xml_strings.h"
|
||||
|
||||
namespace saab
|
||||
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
|
||||
|
||||
#pragma once
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <QVector>
|
||||
#include <QtCore/QVector>
|
||||
|
||||
class QXmlStreamWriter;
|
||||
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QString>
|
||||
#include <QtCore/QString>
|
||||
|
||||
namespace saab
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user