Grantlee Templates: Fix namespace resolution for RTI DTC generation

- Changed {{ namespace }}::{{ dt.type }} to ::{{ namespace }}::{{ dt.type }}
  in svc_dtc.h.grantlee, svc_dtc_impl.cpp.grantlee, svc_dtc_impl.h.grantlee
- Ensures absolute namespace resolution for Core::* types
- Fixes MOC/compilation errors for CurrentRunningState, LockedEntity, etc.

- Updated CMakeLists.txt for RTI 7.7.0 detection with DDS_PATH
- Fixed RTI include paths (ndds/hpp and ndds directories)
- Updated Lts/DDS module files for Qt6/RTI 7.7 compatibility

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
torstenandCopilot committed 2026-08-31 12:51:26 +02:00
1 parent 497baa804b
commit ad07345480
14 files changed
+183 -62

No files matched your search

@@ -2,6 +2,7 @@
#include "pacemaker.h"
#if BUILD_RTI
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/DTS/generic_dts.h>
#include <DDS/DTS/generic_dts_impl.h>
@@ -14,7 +15,7 @@ namespace Core
{
Pacemaker::Pacemaker(DDSConnector::DdsConnector *ddsConnector)
: QObject(nullptr)
.getNGLLogger("Core.Pacemaker"))
, m_logger(NGL::INGLLoggerBootstrap::getNGLLogger("Core.Pacemaker"))
{
init(ddsConnector);
}
@@ -108,4 +109,57 @@ void Pacemaker::startTimer()
m_paceThread->start();
}
#else // BUILD_RTI
Pacemaker::Pacemaker(void* ddsConnector)
: QObject(nullptr)
{
Q_UNUSED(ddsConnector)
}
Pacemaker::~Pacemaker()
{
}
void Pacemaker::setNewState(Core::RunningState newState, const QString& errorString)
{
Q_UNUSED(newState)
Q_UNUSED(errorString)
}
void Pacemaker::setNewStateInternal(Core::RunningState newState, const QString& errorString)
{
Q_UNUSED(newState)
Q_UNUSED(errorString)
}
void Pacemaker::addPort(unsigned short number, Core::PortType portType, const QString& properties)
{
Q_UNUSED(number)
Q_UNUSED(portType)
Q_UNUSED(properties)
}
void Pacemaker::addPortInternal(unsigned short number, Core::PortType portType, const QString& properties)
{
Q_UNUSED(number)
Q_UNUSED(portType)
Q_UNUSED(properties)
}
void Pacemaker::publishState()
{
}
void Pacemaker::init(void* ddsConnector)
{
Q_UNUSED(ddsConnector)
}
void Pacemaker::startTimer()
{
}
#endif // BUILD_RTI
} // namespace Core