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
+9
-1
@@ -12,10 +12,12 @@
|
||||
#include <QPointF>
|
||||
#include <QTimer>
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <AreaEffectSimulation/aes_ftc.h>
|
||||
#include <Proxies/TrainingAreaBase/tab_dtc.h>
|
||||
#endif
|
||||
#include <LtsCoordTrans/lts_coord_trans.h>
|
||||
#include <ParticipantManagement/ppm.hpp>
|
||||
#include <Proxies/TrainingAreaBase/tab_dtc.h>
|
||||
#include "GFS_map_cont.h"
|
||||
|
||||
#include "logger.h"
|
||||
@@ -25,7 +27,9 @@ namespace GuezMinelayerProcessing
|
||||
class DdsHandler;
|
||||
class ZSSI_WI_Minenfeld_Interpreter;
|
||||
class HandlerMinelayerData : public QObject
|
||||
#if BUILD_RTI
|
||||
, protected AreaEffectSimulation::Interface::Ftc::MineAreaModifyFromCtaDataReplyHandler
|
||||
#endif
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
@@ -35,7 +39,9 @@ public:
|
||||
|
||||
bool init();
|
||||
|
||||
#if BUILD_RTI
|
||||
void onMineAreaModifyFromCtaDataReply(const Core::FunctionReplyObject &replyObject) override final;
|
||||
#endif
|
||||
|
||||
private slots:
|
||||
void onSpecialSensorDataChanged(const TrainingAreaBase::SpecialSensorData &data, DataModification modType);
|
||||
@@ -55,7 +61,9 @@ private:
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
std::shared_ptr<TrainingAreaBase::Interface::Dtc> m_tabDtc;
|
||||
std::shared_ptr<ParticipantManagement::Interface::Dtc> m_ppmDtc;
|
||||
#if BUILD_RTI
|
||||
std::shared_ptr<AreaEffectSimulation::Interface::Ftc> m_aesFtc;
|
||||
#endif
|
||||
|
||||
LtsCoordTrans::UtmCoordinate m_baseCoord;
|
||||
|
||||
|
||||
Reference in new issue
Block a user