lifemaps/qt-migration-legatus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_dialog.cpp
+1 -1
View File
@@ -6,7 +6,7 @@
#include "smo_equipment_error_registration_model.h"
#include <Plugins/Timeline/tln_data_plugin_interface.h>
#include <Timeline/tln_data_plugin_interface.h>
#include <ParticipantManagement/Data/ppm_data_plugin.h>
#include <Common/logger.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_gui_plugin.h
+3 -3
View File
@@ -3,13 +3,13 @@
#pragma once
#include <Plugins/ServiceMonitor/smo_hgr_and_mine_search_gui_plugin_interface.h>
#include <ServiceMonitor/smo_hgr_and_mine_search_gui_plugin_interface.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <Lts/Common/ProjectConfig/project_defines.h>
#include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
#include <Plugins/Timeline/tln_data_plugin_interface.h>
#include <ExerciseManagement/exm_data_plugin_interface.h>
#include <Timeline/tln_data_plugin_interface.h>
namespace ServiceMonitor
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/EquipmentErrorRegistration/smo_equipment_error_registration_model.h
+3 -3
View File
@@ -3,10 +3,10 @@
#pragma once
#include <Plugins/ExerciseManagement/Data/exm_data_plugin.h>
#include <ExerciseManagement/exm_data_plugin.h>
#include <ParticipantManagement/Data/ppm_data_plugin.h>
#include <Plugins/ProjectDataManagement/Data/pdm_data_plugin.h>
#include <Plugins/Timeline/tln_data_plugin_interface.h>
#include <ProjectDataManagement/pdm_data_plugin.h>
#include <Timeline/tln_data_plugin_interface.h>
#include <LtsSession/lts_session.h>
#include <LtsWidgets/lts_abstract_table_model.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_dialog.cpp
+2 -2
View File
@@ -7,8 +7,8 @@
#include "smo_hgr_and_mine_search_model.h"
#include <PluginInterfaces/gui_plugin_interface.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <Plugins/Timeline/tln_data_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <Timeline/tln_data_plugin_interface.h>
#include <ParticipantManagement/Data/ppm_data_plugin.h>
#include <Common/logger.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_gui_plugin.h
+5 -5
View File
@@ -3,17 +3,17 @@
#pragma once
#include <Plugins/ServiceMonitor/smo_hgr_and_mine_search_gui_plugin_interface.h>
#include <ServiceMonitor/smo_hgr_and_mine_search_gui_plugin_interface.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <Lts/Common/ProjectConfig/project_defines.h>
#include <Plugins/ExerciseManagement/exm_data_plugin_interface.h>
#include <ExerciseManagement/exm_data_plugin_interface.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <Plugins/ProjectDataManagement/Data/pdm_data_plugin.h>
#include <Plugins/Timeline/tln_data_plugin_interface.h>
#include <Plugins/AreaEffectSimulation/Data/aes_data_plugin.h>
#include <ProjectDataManagement/pdm_data_plugin.h>
#include <Timeline/tln_data_plugin_interface.h>
#include <AreaEffectSimulation/aes_data_plugin.h>
namespace ServiceMonitor
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/HgrAndMineSearch/smo_hgr_and_mine_search_model.h
+4 -4
View File
@@ -3,12 +3,12 @@
#pragma once
#include <Plugins/ExerciseManagement/Data/exm_data_plugin.h>
#include <ExerciseManagement/exm_data_plugin.h>
#include <ParticipantManagement/Data/ppm_data_plugin.h>
#include <Plugins/ProjectDataManagement/Data/pdm_data_plugin.h>
#include <Plugins/Timeline/tln_data_plugin_interface.h>
#include <ProjectDataManagement/pdm_data_plugin.h>
#include <Timeline/tln_data_plugin_interface.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <Plugins/AreaEffectSimulation/Data/aes_data_plugin.h>
#include <AreaEffectSimulation/aes_data_plugin.h>
#include <LtsSession/lts_session.h>
#include <LtsWidgets/lts_abstract_table_model.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_base_player_model.h
+1 -1
View File
@@ -9,7 +9,7 @@
#include <LtsSession/lts_session_data_dds.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
#include <ProjectDataManagement/pdm_data_plugin_interface.h>
#include <AdvancedSymbology/Helper/table_model_symbol_renderer.h>
#include <QtCore/QSet>
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_dialog.cpp
+2 -2
View File
@@ -17,8 +17,8 @@
#include <QtWidgets/QLabel>
#include <Common/PluginInterfaces/gui_plugin_interface.h>
#include <Plugins/Buildings/bld_data_plugin_interface.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <Buildings/bld_data_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
namespace ServiceMonitor
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.cpp
+9 -5
View File
@@ -5,7 +5,7 @@
#include <utility>
#include <InfrastructureManagement/ism_translation.h>
#include <Plugins/InfrastructureManagement/Shared/ism_mounting_point.h>
#include <InfrastructureManagement/ism_mounting_point.h>
#include <Common/logger.h>
#include <LtsSession/lts_session.h>
@@ -1128,7 +1128,8 @@ void EgcuModel::onMountingPointAssetChanged(const InfrastructureManagement::Moun
return;
QModelIndex index = indexFromItem(item);
removeRow(index.row(), index.parent());
emit invalidateFilter();
emit beginFilterChange();
endFilterChange();
}
else if (modType == DataModification::eModified)
{
@@ -1212,7 +1213,8 @@ void EgcuProxyModel::showIncluded(const bool bShow)
if (m_bShowIncluded == bShow)
return;
m_bShowIncluded = bShow;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
void EgcuProxyModel::showNotIncluded(const bool bShow)
@@ -1220,7 +1222,8 @@ void EgcuProxyModel::showNotIncluded(const bool bShow)
if (m_bShowNotIncluded == bShow)
return;
m_bShowNotIncluded = bShow;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
void EgcuProxyModel::setTypeFilter(const QSet<InfrastructureManagement::MountingPointType> &visibleTypes)
@@ -1228,7 +1231,8 @@ void EgcuProxyModel::setTypeFilter(const QSet<InfrastructureManagement::Mounting
if (m_visibleTypes == visibleTypes)
return;
m_visibleTypes = visibleTypes;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
void EgcuProxyModel::addToTypeFilter(const InfrastructureManagement::MountingPointType mpt, const bool bAdd)
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_egcu_model.h
+4 -4
View File
@@ -6,8 +6,8 @@
#include <AssetManagement/asm_dtc.h>
#include <InfrastructureManagement/ism_dtc.h>
#include <InfrastructureManagement/Shared/ism_mounting_point.h>
#include <Plugins/Buildings/bld_data_plugin_interface.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <Buildings/bld_data_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <QtCore/QSet>
#include <QtWidgets/QMenu>
@@ -16,8 +16,8 @@
#include <nglwidgets/ngltreemodel.h>
#include <nglwidgets/ngltreeitem.h>
#include <Plugins/InfrastructureManagement/ism_data_plugin_interface.h>
#include <Plugins/AssetManagement/asm_data_plugin_interface.h>
#include <InfrastructureManagement/ism_data_plugin_interface.h>
#include <AssetManagement/asm_data_plugin_interface.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_fault_message_dialog.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include <ParticipantManagement/Gui/Common/participant_edit_model.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <Plugins/TrainingAreaBaseOC/taboc_data_plugin_interface.h>
#include <TrainingAreaBaseOC/taboc_data_plugin_interface.h>
namespace Ui { class FaultMessageDialog; }
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_monitors_gui_plugin.cpp
+1 -1
View File
@@ -12,7 +12,7 @@
#include <LtsSession/lts_session.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsWidgets/lts_base_layout_widget.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <ServiceMonitor/smo_operator_rights.h>
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_monitors_gui_plugin.h
+2 -2
View File
@@ -9,8 +9,8 @@
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <ParticipantManagement/ppm_gui_combobox_plugin_interface.h>
#include <ParticipantManagement/ppm_participant_info_gui_plugin_interface.h>
#include <Plugins/ProjectDataManagement/pdm_data_plugin_interface.h>
#include <Plugins/ServiceMonitor/smo_monitors_gui_plugin_interface.h>
#include <ProjectDataManagement/pdm_data_plugin_interface.h>
#include <ServiceMonitor/smo_monitors_gui_plugin_interface.h>
namespace ServiceMonitor
{
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_party_player_model.cpp
+4 -2
View File
@@ -56,7 +56,8 @@ void PartyPlayerProxyModel::setPartyId(int partyId)
if (m_partyId == partyId)
return;
m_partyId = partyId;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
void PartyPlayerProxyModel::setTypeClass(ParticipantManagement::TypeClass typeClass)
@@ -64,7 +65,8 @@ void PartyPlayerProxyModel::setTypeClass(ParticipantManagement::TypeClass typeCl
if (m_typeClass == typeClass)
return;
m_typeClass = typeClass;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
}
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/Monitors/smo_single_service_equipment_check_dialog.h
+1 -1
View File
@@ -9,7 +9,7 @@
#include <LtsSession/lts_session.h>
#include <ParticipantManagement/ppm_participant_info_gui_plugin_interface.h>
#include <Plugins/FileManagement/flm_explorer_gui_plugin_interface.h>
#include <FileManagement/flm_explorer_gui_plugin_interface.h>
class QItemSelection;
qt6-after/qt6-migrated-legatus/Lts/Plugins/ServiceMonitor/Gui/SystemMonitor/smo_system_monitor_gui_plugin.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include <PluginInterfaces/gui_plugin_interface.h>
#include <Lts/Common/ProjectConfig/project_defines.h>
#include <Plugins/ServiceMonitor/smo_system_monitor_gui_plugin_interface.h>
#include <ServiceMonitor/smo_system_monitor_gui_plugin_interface.h>
namespace ServiceMonitor
{