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:
1 parent
497baa804b
commit
ad07345480
14 files changed
+183
-62
No files matched your search
@@ -4,12 +4,18 @@
|
||||
|
||||
#include "svccoreclient_export.h"
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <DDS/Core/core_dts_types.h>
|
||||
#endif
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QThread>
|
||||
|
||||
// Forward declarations for moc compatibility (moc doesn't see BUILD_RTI guards)
|
||||
namespace Core { enum class RunningState; enum class PortType; }
|
||||
namespace DTS { class CurrentRunningStateImpl; }
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <dds/core/core_dts_types.h>
|
||||
#include <dds/core/types/CurrentRunningState.h>
|
||||
#endif
|
||||
|
||||
namespace DDSConnector
|
||||
{
|
||||
class DdsConnector;
|
||||
@@ -52,26 +58,24 @@ class CORE_CLIENT_EXPORT Pacemaker final : public QObject
|
||||
#endif
|
||||
|
||||
private:
|
||||
NGL::INGLLogger& m_logger;
|
||||
#if BUILD_RTI
|
||||
NGL::INGLLogger& m_logger;
|
||||
void init(DDSConnector::DdsConnector* ddsConnector);
|
||||
void setNewStateInternal(Core::RunningState newState, const QString& errorString = QString());
|
||||
void addPortInternal(unsigned short number, Core::PortType portType,
|
||||
const QString& properties = QStringLiteral(""));
|
||||
#endif
|
||||
|
||||
private:
|
||||
NGL::INGLLogger& m_logger;
|
||||
static constexpr const int m_publishTimerDelay = 3000;
|
||||
|
||||
#if BUILD_RTI
|
||||
CurrentRunningState m_state;
|
||||
DTS::CurrentRunningStateImpl* m_dtsCurrentRunningState = nullptr;
|
||||
#else
|
||||
void* m_reserved1 = nullptr;
|
||||
void* m_reserved2 = nullptr;
|
||||
void* m_reserved3 = nullptr;
|
||||
void* m_reserved4 = nullptr;
|
||||
void* m_reserved5 = nullptr;
|
||||
#endif
|
||||
static constexpr const int m_publishTimerDelay = 3000;
|
||||
QTimer* m_publishTimer = nullptr;
|
||||
QThread* m_paceThread = nullptr;
|
||||
|
||||
#if BUILD_RTI
|
||||
DTS::CurrentRunningStateImpl* m_dtsCurrentRunningState;
|
||||
#endif
|
||||
};
|
||||
} // namespace Core
|
||||
Reference in new issue
Block a user