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 000000000..59f876512 Binary files /dev/null and b/ci/__pycache__/check_pr_policies.cpython-310.pyc differ 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