Qt6 migration fixes: RTI DDS alias targets, ErrorMessage namespace, DDS header include path

This commit is contained in:
torsten committed 2026-08-27 09:02:26 +02:00
1 parent 8050bca545
commit bb1447c858
18635 files changed
+2466913 -906310

No files matched your search

@@ -12,7 +12,7 @@
#include <QtCore/QSet>
#include <QtCore/QMap>
#include <QtWidgets/QWidget>
#include <QRegularExpressionValidator>
#include <QtGui/QRegularExpressionValidator>
class Ui_ParticipantDISTypeEdit;
@@ -1116,7 +1116,8 @@ void ParticipantTreeFilterProxyModel::setAllowedTypes(const QSet<int> &allowedTy
if (m_allowedTypes == allowedTypes)
return;
m_allowedTypes = allowedTypes;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
void ParticipantTreeFilterProxyModel::setSourceModel(QAbstractItemModel *sourceModel)
@@ -8,7 +8,7 @@
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_ftc.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <Plugins/OperatorManagement/opm_overview_gui_plugin_interface.h>
#include <OperatorManagement/opm_overview_gui_plugin_interface.h>
#include <LtsWidgets/lts_dialog.h>
#include <LtsSession/lts_session.h>
@@ -12,7 +12,7 @@
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_ftc.h>
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
#include <ProjectDataManagement/pdm_data_plugin_interface.h>
#include <QtCore/QJsonObject>
@@ -20,7 +20,7 @@
#include <PluginInterfaces/gui_plugin_interface.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_ftc.h>
#include <Plugins/ProjectDataManagement/pdm_gui_plugin_interface.h>
#include <ProjectDataManagement/pdm_gui_plugin_interface.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
@@ -1104,7 +1104,8 @@ void ParticipantTreeFilterProxyConfigModel::setAllowedTypes(const QSet<int> &all
if (m_allowedTypes == allowedTypes)
return;
m_allowedTypes = allowedTypes;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
void ParticipantTreeFilterProxyConfigModel::setSourceModel(QAbstractItemModel *sourceModel)
@@ -15,7 +15,7 @@
#include <ParticipantManagement/ppm_participant_info_gui_plugin_interface.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <PluginInterfaces/gui_plugin_interface.h>
@@ -5,7 +5,7 @@
#include "ui_participant_gear_restock.h"
#include "participant_gear_restock_charge.h"
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
#include <ProjectDataManagement/pdm_data_plugin_interface.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <ProjectDataManagement/pdm_translation.h>
@@ -96,7 +96,7 @@ bool ParticipantGearRestock::init(LtsSession::LtsSession *session, bool showAllO
m_ui->lblMaxCharges->setVisible(false);
QVBoxLayout* vLayout = new QVBoxLayout(m_ui->scrollArea);
vLayout->setMargin(0);
vLayout->setContentsMargins(0, 0, 0, 0);
m_ui->scrollArea->setLayout(vLayout);
for (const ProjectDataManagement::GearTypeChargeType &gearType2ChargeType : m_pdmDtc->gearTypeChargeTypes())
@@ -116,7 +116,7 @@ bool ParticipantGearRestock::init(LtsSession::LtsSession *session, bool showAllO
}
hLayoutMaxCharge->addWidget(lblMax);
hLayoutMaxCharge->addWidget(lblMaxCharges);
hLayoutMaxCharge->setMargin(8);
hLayoutMaxCharge->setContentsMargins(8, 8, 8, 8);
hLayoutMaxCharge->setSpacing(0);
vLayout->addLayout(hLayoutMaxCharge);
validate(0);
@@ -9,8 +9,8 @@
#include <ParticipantManagement/logger.h>
#include <ParticipantManagement/ppm.hpp>
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
#include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
#include <ProjectDataManagement/pdm_data_plugin_interface.h>
#include <AreaEffectSimulation/aes_data_plugin_interface.h>
#include "participant_history_dialog_model.h"
namespace Ui {
@@ -8,8 +8,8 @@
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/logger.h>
#include <ProjectDataManagement/pdm_dtc.h>
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
#include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
#include <ProjectDataManagement/pdm_data_plugin_interface.h>
#include <AreaEffectSimulation/aes_data_plugin_interface.h>
namespace ParticipantManagement
{
@@ -4,7 +4,7 @@
#include "ui_participant_hitline_info_dialog.h"
#include <ParticipantManagement/ppm_translation.h>
#include <ProjectDataManagement/pdm_to_string.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <LtsCoordTrans/lts_coord_trans.h>
#include <ngltools/ngltools_dtg.h>
@@ -14,7 +14,7 @@
#include <ProjectDataManagement/pdm_dtc.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
namespace Ui
@@ -28,12 +28,12 @@
#include <LtsUtils/LtsUtilsCore/outdated_position.h>
#include <LtsUtilsSettings/settings.h>
#include <Services/AreaEffectSimulation/Utils/polygons.h>
#include <AreaEffectSimulation/Utils/polygons.h>
#include <QtCore/QJsonDocument>
#include <QTableWidgetItem>
#include <QtWidgets/QToolButton>
#include <QTransform>
#include <QtGui/QTransform>
#include <QtWidgets/QMenu>
#include <QtGui/QColor>
#include <QtWidgets/QLabel>
@@ -27,7 +27,7 @@
#include <FilterManagement/flt_symbol_appearance_settings.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <AreaEffectSimulation/aes_data_plugin_interface.h>
@@ -9,13 +9,13 @@
#include <LtsSession/lts_session.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <ParticipantManagement/ppm_participant_info_gui_plugin_interface.h>
#include <Plugins/OcSituationClient/osc_participant_info_gui_plugin_interface.h>
#include <OcSituationClient/osc_participant_info_gui_plugin_interface.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
#include <Plugins/ProjectDataManagement/pdm_gui_plugin_interface.h>
#include <ProjectDataManagement/pdm_data_plugin_interface.h>
#include <ProjectDataManagement/pdm_gui_plugin_interface.h>
#include <AdvancedSymbology/asb_data_plugin_interface.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <FilterManagement/flt_participant_plugin_interface.h>
#include <FilterManagement/flt_symbol_appearance_settings.h>
#include "participant_search_widget.h"
@@ -13,9 +13,9 @@
#include <ParticipantManagement/logger.h>
#include <ParticipantManagement/Gui/Common/participant_edit_model.h>
#include <ParticipantManagement/ppm_participant_info_gui_plugin_interface.h>
#include <Plugins/OcSituationClient/osc_participant_info_gui_plugin_interface.h>
#include <OcSituationClient/osc_participant_info_gui_plugin_interface.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <PluginInterfaces/gui_plugin_interface.h>
@@ -16,7 +16,7 @@
#include <ProjectDataManagement/pdm_dtc.h>
#include <QList>
#include <QtCore/QList>
class QGroupBox;
class QCheckBox;
@@ -10,9 +10,9 @@
#include <ParticipantManagement/logger.h>
#include <ParticipantManagement/ppm.hpp>
#include <ParticipantManagement/ppm_ftc.h>
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
#include <Plugins/AreaEffectSimulation/aes_data_plugin_interface.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <ProjectDataManagement/pdm_data_plugin_interface.h>
#include <AreaEffectSimulation/aes_data_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include "participant_shootback_area_model.h"
@@ -943,7 +943,8 @@ void ParticipantTreeFilterProxyModel::setAllowedTypes(const QSet<int> &allowedTy
if (m_allowedTypes == allowedTypes)
return;
m_allowedTypes = allowedTypes;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
void ParticipantTreeFilterProxyModel::setSourceModel(QAbstractItemModel *sourceModel)
@@ -4,7 +4,7 @@
#include "operator_party_assignment.h"
#include "ui_operator_party_assignment.h"
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
#include <OperatorManagement/opm_data_plugin_interface.h>
#include <LtsSession/lts_session_data.h>
#include <QtWidgets/QHeaderView>
#include <QtCore/QJsonDocument>
@@ -14,7 +14,7 @@
#include <LtsUtilsSettings/settings.h>
#include <LtsSession/lts_session_data.h>
#include <Services/AreaEffectSimulation/aes_operator_rights.h>
#include <AreaEffectSimulation/aes_operator_rights.h>
namespace ParticipantManagement
{
@@ -7,13 +7,13 @@
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_ftc.h>
#include <Services/OperatorManagement/opm_dtc.h>
#include <Services/OperatorManagement/opm_ftc.h>
#include <OperatorManagement/opm_dtc.h>
#include <OperatorManagement/opm_ftc.h>
#include <NotificationManagement/nom.hpp>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
#include <OperatorManagement/opm_data_plugin_interface.h>
#include <ParticipantManagement/ppm_party_gui_plugin_interface.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
@@ -7,7 +7,7 @@
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_ftc.h>
#include <Services/OperatorManagement/opm_ftc.h>
#include <OperatorManagement/opm_ftc.h>
#include <LtsWidgets/lts_dialog.h>
#include <LtsSession/lts_session.h>
@@ -8,7 +8,7 @@
#include <ParticipantManagement/ppm_translation.h>
#include <LtsWidgets/lts_combo_box.h>
#include <QtGui/QPainter>
#include <QPainterPath>
#include <QtGui/QPainterPath>
namespace ParticipantManagement
{
@@ -8,10 +8,10 @@
#include <LtsWidgets/lts_dialog.h>
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_ftc.h>
#include <Services/FileManagement/flm_ftc.h>
#include <Lts/Services/FileManagement/flm_ftc.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <AdvancedSymbology/asb_data_plugin_interface.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <flm_data_plugin_interface.h>
#include <SymbologyGui/symbol_modification_dialog.h>
#include <ParticipantManagement/logger.h>
@@ -11,7 +11,7 @@
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <ParticipantManagement/ppm_types_gui_plugin_interface.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <flm_data_plugin_interface.h>
namespace ParticipantManagement
@@ -8,7 +8,7 @@
#include <ParticipantManagement/ppm_dtc.h>
#include <ParticipantManagement/ppm_ftc.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <Plugins/FileManagement/flm_data_plugin_interface.h>
#include <flm_data_plugin_interface.h>
#include <LtsWidgets/lts_dialog.h>
#include <LtsSession/lts_session.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
@@ -11,7 +11,7 @@
#include <PluginInterfaces/gui_plugin_interface.h>
#include <FileManagement/flm_data_plugin_interface.h>
#include <flm_data_plugin_interface.h>
#include <FileManagement/flm_translation.h>
#include <LtsUtils/LtsUtilsGui/LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
@@ -9,7 +9,7 @@
#include <ExerciseManagement/exm_data_plugin_interface.h>
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
#include <FileManagement/flm_dtc.h>
namespace Ui
@@ -6,7 +6,7 @@
#include <ParticipantManagement/ppm_operator_rights.h>
#include <AdvancedSymbology/asb_data_plugin_interface.h>
#include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
#include <ExerciseManagement/exm_data_plugin_interface.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsSession/lts_session.h>