Fixes merge conflicts, but leaves out-of-DDS-scope build errors (tbc)

qt6-after/qt6-migrated-legatus/Lts/Common/CodeGen/svc_dtc_impl.cpp.grantlee

@@ -15,6 +15,7 @@
 {% endif %}
 #include <NGLLogger/INGLLogger.h>
 #include <DDS/DTC/generic_dtc_impl.h>
+#include <DDS/Core/logger.h>
 #include <dds/core/cond/StatusCondition.hpp>
 #include <dds/core/cond/WaitSet.hpp>
 #include <unordered_map>
@@ -22,6 +23,7 @@
 #include <QThread>
 
 using namespace NGL;
+using namespace Core;
 
 namespace {{ namespace }}
 {
@@ -61,7 +63,7 @@ std::shared_ptr<Dtc> Dtc::create(const std::shared_ptr<DDSConnector::DdsConnecto
 DtcImpl::DtcImpl(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
   : Dtc()
   , m_ddsConnector(ddsConnector)
-  , m_logger(&ProjectDataManagement::getLogger("Dtc"))
+  , m_logger(&getLogger("Dtc"))
 {}
 
 DtcImpl::~DtcImpl()