Qt6 Migration: BUILD_RTI guards und CMake fixes

- BUILD_RTI conditional compilation für RTI Connext DDS dependencies
- Namespace fixes in core_dtc.h (Core:: → DDS::Core::)
- CMakeLists.txt: BUILD_RTI option und conditional dependencies
- Handler minelayer: namespace closing mit BUILD_RTI guard
- Build erfolgreich mit BUILD_RTI=OFF validiert

Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>
This commit is contained in:
torsten committed 2026-08-21 18:37:18 +02:00
1 parent c599be63e3
commit 950d669538
422 files changed
+1013 -599

No files matched your search

@@ -11,7 +11,9 @@
#include <QTimer>
#if BUILD_RTI
#include <DDS/Core/pacemaker.h>
#endif
using namespace VideoOverlayManagement;
@@ -19,20 +21,24 @@ MainHandler::MainHandler(QObject *parent) : QObject(parent)
, m_exerciseId(0)
, m_avsIf(new AvsInterface(true, this))
, m_avsConnectionState(AvsIfConnectionState::Undefined)
#if BUILD_RTI
, m_ddsHandler(nullptr)
#endif
, m_handlerParticipantData(nullptr)
, m_handlerInfrastructureData(nullptr)
, m_handlerOverlays(nullptr)
, m_checkConnectTimer(new QTimer(this))
, m_keepAliveTriggerTimer(new QTimer(this))
, m_bAvsSocketWarnedOnce(false),
m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
} // end of ctor()
//-----------------------------------------------------------------------------
MainHandler::~MainHandler()
{
#if BUILD_RTI
m_ddsHandler.reset();
#endif
} // end of dtor()
//-----------------------------------------------------------------------------
@@ -62,6 +68,7 @@ bool MainHandler::init(int domainId, int exerciseId)
connect(m_keepAliveTriggerTimer, &QTimer::timeout,
this, &MainHandler::onSendKeepAlive);
#if BUILD_RTI
// initialize DDS
// for VideoOverlayManagement => exerciseId = partitionId
m_ddsHandler.reset(new DdsHandler(domainId, exerciseId));
@@ -92,6 +99,7 @@ bool MainHandler::init(int domainId, int exerciseId)
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StartingError);
return false;
}
#endif
// Initialisation of OverlayHandler wait until AVS is connected
connect(m_checkConnectTimer, &QTimer::timeout,
@@ -99,7 +107,9 @@ bool MainHandler::init(int domainId, int exerciseId)
m_checkConnectTimer->start(1000);
INFO_LOG(m_logger) << "VOM Handler initialized. (Connection to AVS may be still pending) ";
#if BUILD_RTI
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Starting);
#endif
return true;
} // end of init()
@@ -128,12 +138,16 @@ bool MainHandler::onTryToInitOverlayHandler()
if (!m_handlerOverlays->init())
{
ERROR_LOG(m_logger) << "Initialisation HandlerOverlays failed.";
#if BUILD_RTI
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StoppedError);
#endif
return false;
}
INFO_LOG(m_logger) << "VOM Handler initialized. (Connection to AVS established) ";
#if BUILD_RTI
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::Running);
#endif
return true;
} // end of onTryToInitOverlayHandler()
@@ -156,7 +170,9 @@ void MainHandler::onAvsIfConnectionState(AvsIfConnectionState state)
case AvsIfConnectionState::ConnectionError:
ERROR_LOG(m_logger) << "AvsIfConnectionState::ConnectionError !";
m_keepAliveTriggerTimer->stop();
#if BUILD_RTI
m_ddsHandler->pacemaker()->setNewState(Core::RunningState::StoppedError);
#endif
break;
case AvsIfConnectionState::Undefined:
default: