From 1632478122ea97c7beb7dd5e9450b66e7fb98dc6 Mon Sep 17 00:00:00 2001 From: twi-devel Date: Wed, 19 Aug 2026 15:44:15 +0200 Subject: [PATCH] Fix gui_plugin_interface.h m_logger member and ltsmultimonitor_export.h alias - Add m_logger member to GuiPluginInterface private section - Create ltsmultimonitor_export.h as alias for lts_multi_monitor_export.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ci/__pycache__/check_pr_policies.cpython-310.pyc | Bin 0 -> 6720 bytes .../LtsMultiMonitor/ltsmultimonitor_export.h | 2 ++ .../Lts/Common/LtsSession/lts_session.h | 2 ++ .../LtsSession/lts_session_data_dds_stub.h | 3 +++ .../PluginInterfaces/gui_plugin_interface.h | 1 + .../Lts/Common/ProjectConfig/project_defines.h | 5 +++++ .../Lts/Common/ProjectConfig/project_defines.h | 7 ++++++- 7 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 ci/__pycache__/check_pr_policies.cpython-310.pyc create mode 100644 qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/ltsmultimonitor_export.h diff --git a/ci/__pycache__/check_pr_policies.cpython-310.pyc b/ci/__pycache__/check_pr_policies.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..59f8765120e56e4e55a0f17f09bcc36966667b5a GIT binary patch literal 6720 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 literal 0 HcmV?d00001 diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/ltsmultimonitor_export.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/ltsmultimonitor_export.h new file mode 100644 index 000000000..e76bab3d0 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsMultiMonitor/ltsmultimonitor_export.h @@ -0,0 +1,2 @@ +#pragma once +#include "lts_multi_monitor_export.h" \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h index ca8aff689..e56fcf07a 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session.h @@ -91,9 +91,11 @@ class LTSSESSION_EXPORT LtsSession : public LtsSessionDataDds LtsSessionManager* getSessionManager(); bool init(const DdsConnectionParams& connParams, const QVector& dataPluginList, const QVector& guiPluginList, bool hidden); +#ifdef BUILD_RTI bool init(const dds::domain::DomainParticipant& dp, const DdsConnectionParams& connParams, const QVector& dataPluginList, const QVector& guiPluginList); +#endif void makeVisible(); void setPayloadsEnabled() diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds_stub.h b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds_stub.h index e47d55f13..072348959 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds_stub.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/LtsSession/lts_session_data_dds_stub.h @@ -13,6 +13,8 @@ #include #include +#include "Lts/Common/ProjectConfig/project_defines.h" + namespace LtsSession { @@ -21,6 +23,7 @@ struct DdsConnectionParams { int domainId = -1; int partitionId = 0; + IDL::PartitionType partitionType = IDL::PartitionType::Any; int exerciseId = 0; QUrl tcpConnectionUrl; QStringList qos_file; diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h index 590f7ab2b..22925a940 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/PluginInterfaces/gui_plugin_interface.h @@ -136,6 +136,7 @@ class Interface QFlags m_flags; QStringList m_options; LtsAppDescriptor::App m_appId; + NGL::INGLLogger& m_logger; }; } // namespace GuiPluginBase diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/ProjectConfig/project_defines.h b/qt6-after/qt6-migrated-legatus/Lts/Common/ProjectConfig/project_defines.h index a88ffc33d..c92e810c5 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/ProjectConfig/project_defines.h +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/ProjectConfig/project_defines.h @@ -1,5 +1,8 @@ +#ifndef LTS_COMMON_PROJECTCONFIG_PROJECT_DEFINES_H +#define LTS_COMMON_PROJECTCONFIG_PROJECT_DEFINES_H + #pragma once #include @@ -64,3 +67,5 @@ inline std::string replayPartition(int partitionId) } } // namespace IDL + +#endif // LTS_COMMON_PROJECTCONFIG_PROJECT_DEFINES_H diff --git a/qt6-after/qt6-migrated-legatus/include/Lts/Common/ProjectConfig/project_defines.h b/qt6-after/qt6-migrated-legatus/include/Lts/Common/ProjectConfig/project_defines.h index 2c7bcb3fc..ecffa86ea 100755 --- a/qt6-after/qt6-migrated-legatus/include/Lts/Common/ProjectConfig/project_defines.h +++ b/qt6-after/qt6-migrated-legatus/include/Lts/Common/ProjectConfig/project_defines.h @@ -1,6 +1,9 @@ +#ifndef LTS_COMMON_PROJECTCONFIG_PROJECT_DEFINES_H +#define LTS_COMMON_PROJECTCONFIG_PROJECT_DEFINES_H + #pragma once #include @@ -69,5 +72,7 @@ inline std::string replayPartition(int partitionId) return std::string("srp_") + std::to_string(partitionId); } -} +} // namespace IDL + +#endif // LTS_COMMON_PROJECTCONFIG_PROJECT_DEFINES_H