From 4cab91a948ff36698bad23f0b4dac04a8d981c84 Mon Sep 17 00:00:00 2001 From: berrux_dev Date: Fri, 18 Sep 2026 17:45:16 +0200 Subject: [PATCH] Restores generic_fts include and fixes FTS connext header --- qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h | 6 ++++-- .../qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h index e9bbafc21..59b294ef1 100644 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/connext.h @@ -282,7 +282,7 @@ template class Requester final : public Reply , m_dataReader(nullptr) , m_contentFilteredTopic(nullptr) , m_curInstanceHandle(dds::core::InstanceHandle::nil()) - , m_logger(NGL::getNGLLogger("connext.requester")) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("connext.requester")) { } @@ -417,6 +417,7 @@ private: dds::sub::DataReader m_dataReader; dds::topic::ContentFilteredTopic m_contentFilteredTopic; dds::core::InstanceHandle m_curInstanceHandle; + NGL::INGLLogger &m_logger; }; template class Replier final : public ReplyRequestBase @@ -431,7 +432,7 @@ template class Replier final : public ReplyRe , m_dataReader(dds::sub::DataReader(replierParams.subscriber(), ReplyRequestBase::m_requestTopic, replierParams.datareader_qos())) - , m_logger(NGL::getNGLLogger("connext.replier")) + , m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("connext.replier")) { } @@ -500,6 +501,7 @@ private: connext::ReplierParams m_replierParams; dds::pub::DataWriter m_dataWriter; dds::sub::DataReader m_dataReader; + NGL::INGLLogger &m_logger; }; } // namespace connext diff --git a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h index 487ba885f..cb8a72479 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h +++ b/qt6-after/qt6-migrated-legatus/Lts/DDS/FTS/generic_fts_internal.h @@ -2,6 +2,10 @@ #pragma once +// Declares the FTS::GenericFts template that generic_fts_impl.h's +// GenericFtsImpl derives from. Present in the qt5 original; without it +// GenericFts is no known template at the point of derivation. +#include "generic_fts.h" #include #include "logger.h"