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

@@ -4,7 +4,7 @@
#pragma once
#include <PluginInterfaces/data_plugin_interface.h>
#include <Plugins/AlarmManagement/alm_data_plugin_interface.h>
#include <AlarmManagement/alm_data_plugin_interface.h>
#include <AlarmManagement/alm_dtc.h>
#include <AlarmManagement/alm_ftc.h>
@@ -29,7 +29,7 @@ NGL_TARGET_LINK_LIBRARIES(AlmConfigAlarmGuiPlugin
LtsUtilsSettings
AlmGuiPluginInterface
AlmDataPluginInterface
svcPdmCommon # pdm_enums.h in alm_dialog.cpp
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,> # pdm_enums.h in alm_dialog.cpp
svcPpmCommon
GuiPluginInterface
Qt6::Widgets
@@ -4,7 +4,7 @@
#include "alm_config_alarm_gui_plugin.h"
#include "alm_dialog.h"
#include "alm_history.h"
#include <Services/AlarmManagement/alm_operator_rights.h>
#include <AlarmManagement/alm_operator_rights.h>
#include <AreaEffectSimulation/aes_data_plugin_interface.h>
#include <ParticipantManagement/ppm_data_plugin_interface.h>
#include <LtsSession/lts_session.h>
@@ -5,10 +5,10 @@
#include <AlarmManagement/logger.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <Plugins/AlarmManagement/alm_gui_plugin_interface.h>
#include <Plugins/AlarmManagement/alm_data_plugin_interface.h>
#include <Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h>
#include <Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h>
#include <AlarmManagement/alm_gui_plugin_interface.h>
#include <AlarmManagement/alm_data_plugin_interface.h>
#include <AlarmManagement/Common/alm_config_alarm_model.h>
#include <AlarmManagement/Common/alm_history_alarm_model.h>
#include <AreaEffectSimulation/aes_dtc.h>
#include <ParticipantManagement/ppm.hpp>
@@ -8,8 +8,8 @@
#include <LtsSession/lts_session_data.h>
#include <LtsUtilsSettings/settings.h>
#include <LtsWidgets/lts_dialog.h>
#include <Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h>
#include <Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h>
#include <AlarmManagement/Common/alm_config_alarm_model.h>
#include <AlarmManagement/Common/alm_history_alarm_model.h>
#include <ProjectDataManagement/pdm_enums.hpp>
#include <utility>
@@ -4,8 +4,8 @@
#pragma once
#include <LtsWidgets/lts_dialog.h>
#include <Services/AlarmManagement/alm_ftc.h>
#include <Services/AlarmManagement/alm_dtc.h>
#include <AlarmManagement/alm_ftc.h>
#include <AlarmManagement/alm_dtc.h>
#include <ParticipantManagement/ppm.hpp>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <AlarmManagement/logger.h>
@@ -6,7 +6,7 @@
#include <LtsPrinting/printing.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <Plugins/AlarmManagement/Gui/Common/alm_history_alarm_model.h>
#include <AlarmManagement/Common/alm_history_alarm_model.h>
#include <QtWidgets/QTreeView>
namespace AlarmManagement
@@ -6,7 +6,7 @@
#include <AlarmManagement/logger.h>
#include <LtsSession/lts_session.h>
#include <LtsWidgets/lts_dialog.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
namespace Ui
{
@@ -32,7 +32,7 @@ NGL_TARGET_LINK_LIBRARIES(AlmOnlineReportsGuiPlugin
LtsSessionData
AlmGuiPluginInterface
AlmDataPluginInterface
svcPdmCommon # pdm_translation.h in alm_dialog.cpp
$<IF:$<TARGET_EXISTS:svcPdmCommon>,svcPdmCommon,> # pdm_translation.h in alm_dialog.cpp
svcAesCommon
GuiPluginInterface
Qt6::Widgets
@@ -6,8 +6,8 @@
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <LtsWidgets/lts_dialog.h>
#include <ParticipantManagement/ppm_dtc.h>
#include <Services/AlarmManagement/alm_dtc.h>
#include <Services/AlarmManagement/alm_ftc.h>
#include <AlarmManagement/alm_dtc.h>
#include <AlarmManagement/alm_ftc.h>
#include <memory>
namespace Ui
@@ -8,9 +8,9 @@
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <LtsWidgets/lts_dialog.h>
#include <ParticipantManagement/ppm_dtc.h>
#include <Services/AlarmManagement/alm.hpp>
#include <Services/AlarmManagement/alm_dtc.h>
#include <Services/AlarmManagement/alm_ftc.h>
#include <AlarmManagement/alm.hpp>
#include <AlarmManagement/alm_dtc.h>
#include <AlarmManagement/alm_ftc.h>
#include <memory>
namespace Ui
@@ -4,7 +4,7 @@
#pragma once
#include <PluginInterfaces/gui_plugin_interface.h>
#include <Plugins/AlarmManagement/alm_gui_plugin_interface.h>
#include <AlarmManagement/alm_gui_plugin_interface.h>
#include <AreaEffectSimulation/aes_dtc.h>
#include <ParticipantManagement/ppm.hpp>
@@ -6,9 +6,9 @@
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <LtsWidgets/lts_dialog.h>
#include <ParticipantManagement/ppm_dtc.h>
#include <Plugins/AlarmManagement/Gui/Common/alm_config_alarm_model.h>
#include <Services/AlarmManagement/alm_dtc.h>
#include <Services/AlarmManagement/alm_ftc.h>
#include <AlarmManagement/Common/alm_config_alarm_model.h>
#include <AlarmManagement/alm_dtc.h>
#include <AlarmManagement/alm_ftc.h>
namespace Ui
{
@@ -11,7 +11,7 @@
#include <QtCore/QDateTime>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <Services/AlarmManagement/alm_operator_rights.h>
#include <AlarmManagement/alm_operator_rights.h>
namespace AlarmManagement
{
@@ -4,12 +4,12 @@
#pragma once
#include <LtsWidgets/lts_dialog.h>
#include <Services/AlarmManagement/alm_ftc.h>
#include <Services/AlarmManagement/alm_dtc.h>
#include <AlarmManagement/alm_ftc.h>
#include <AlarmManagement/alm_dtc.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <AlarmManagement/logger.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <OperatorManagement/opm_data_plugin_interface.h>
#include <LtsSession/lts_session_data.h>
#include <LtsSession/lts_session.h>
@@ -3,7 +3,7 @@
#include "alm_emergency_call_gui_plugin.h"
#include <Services/AlarmManagement/alm_operator_rights.h>
#include <AlarmManagement/alm_operator_rights.h>
#include <LtsSession/lts_session.h>
#include <LtsSession/lts_session_data.h>
#include <QtCore/QJsonDocument>
@@ -7,12 +7,12 @@
#include "alm_emergency_call_dialog.h"
#include <AlarmManagement/logger.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <Plugins/AlarmManagement/alm_gui_plugin_interface.h>
#include <Plugins/AlarmManagement/alm_data_plugin_interface.h>
#include <Plugins/AlarmManagement/alm_info_gui_plugin_interface.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <AlarmManagement/alm_gui_plugin_interface.h>
#include <AlarmManagement/alm_data_plugin_interface.h>
#include <AlarmManagement/alm_info_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
#include <OperatorManagement/opm_data_plugin_interface.h>
#include <ExerciseManagement/exm_data_plugin_interface.h>
#include <ExerciseManagement/exm_dtc.h>
@@ -8,7 +8,7 @@
#include <LtsCoordTrans/lts_coord_trans.h>
#include <LtsSession/lts_session.h>
#include <LtsSession/lts_session_data.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <ngltools/ngltools_dtg.h>
namespace AlarmManagement
@@ -5,13 +5,13 @@
#include <LtsWidgets/lts_dialog.h>
#include <LtsSession/lts_session.h>
#include <Services/AlarmManagement/alm_ftc.h>
#include <Services/AlarmManagement/alm_dtc.h>
#include <AlarmManagement/alm_ftc.h>
#include <AlarmManagement/alm_dtc.h>
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
#include <AlarmManagement/logger.h>
#include <Plugins/SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <SituationMapPlugin/situation_map_gui_plugin_interface.h>
#include <PluginInterfaces/gui_plugin_interface.h>
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
#include <OperatorManagement/opm_data_plugin_interface.h>
#include <QtWidgets/QWidget>
@@ -126,7 +126,8 @@ void EmergencyCallProxyModel::hideByExerciseStopped(bool show)
if (m_hideByExerciseStopped == show)
return;
m_hideByExerciseStopped = show;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
void EmergencyCallProxyModel::setShowExpired(bool show)
@@ -134,7 +135,8 @@ void EmergencyCallProxyModel::setShowExpired(bool show)
if (m_showExpired == show)
return;
m_showExpired = show;
invalidateFilter();
beginFilterChange();
endFilterChange();
}
bool EmergencyCallProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
@@ -6,7 +6,7 @@
#include <AlarmManagement/logger.h>
#include <LtsWidgets/lts_abstract_table_model.h>
#include <LtsWidgets/lts_column_filter_proxy_model.h>
#include <Plugins/OperatorManagement/opm_data_plugin_interface.h>
#include <OperatorManagement/opm_data_plugin_interface.h>
#include <QtCore/QObject>
namespace AlarmManagement