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:
422 files changed
+1013
-599
No files matched your search
@@ -2,9 +2,13 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "generic_fts.h"
|
||||
#include <ddsfts_export.h>
|
||||
#include "logger.h"
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <DDS/Core/topic_lock_master.h>
|
||||
#include <DDS/Generic/wait_set_handler.h>
|
||||
#endif
|
||||
#include <dds/sub/qos/DataReaderQos.hpp>
|
||||
#include <dds/pub/qos/DataWriterQos.hpp>
|
||||
|
||||
@@ -13,7 +17,9 @@
|
||||
namespace FTS
|
||||
{
|
||||
class DDSFTS_EXPORT GenericFtsInternal : public QObject
|
||||
#if BUILD_RTI
|
||||
, protected DDSGeneric::WaitSetHandler::CallbackInterface
|
||||
#endif
|
||||
{
|
||||
Q_OBJECT
|
||||
protected:
|
||||
@@ -24,8 +30,9 @@ namespace FTS
|
||||
static dds::pub::qos::DataWriterQos writerQos(NGL::INGLLogger &logger);
|
||||
|
||||
protected:
|
||||
|
||||
#if BUILD_RTI
|
||||
void dataAvailable() override;
|
||||
#endif
|
||||
virtual bool enqueueRequests() = 0;
|
||||
protected Q_SLOTS:
|
||||
virtual void processRequests() = 0;
|
||||
|
||||
Reference in new issue
Block a user