From 34ccca9dbcc5423f7981a3a59157e639a14aa24d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Vallv=C3=A9=20Navarro?= <jvallve@iri.upc.edu>
Date: Mon, 27 May 2019 11:14:57 +0200
Subject: [PATCH] remove deprecated unlinkFromXX()
---
include/core/capture/capture_base.h | 1 -
include/core/frame/frame_base.h | 1 -
src/frame/frame_base.cpp | 6 ------
3 files changed, 8 deletions(-)
diff --git a/include/core/capture/capture_base.h b/include/core/capture/capture_base.h
index 8732820b4..bdec47c6e 100644
--- a/include/core/capture/capture_base.h
+++ b/include/core/capture/capture_base.h
@@ -61,7 +61,6 @@ class CaptureBase : public NodeBase, public std::enable_shared_from_this<Capture
FrameBasePtr getFrame() const;
void setFrame(const FrameBasePtr _frm_ptr);
- void unlinkFromFrame(){frame_ptr_.reset();}
virtual void setProblem(ProblemPtr _problem) final;
FeatureBasePtrList& getFeatureList();
diff --git a/include/core/frame/frame_base.h b/include/core/frame/frame_base.h
index bc0591388..d6ec479ad 100644
--- a/include/core/frame/frame_base.h
+++ b/include/core/frame/frame_base.h
@@ -138,7 +138,6 @@ class FrameBase : public NodeBase, public std::enable_shared_from_this<FrameBase
CaptureBasePtr getCaptureOf(const SensorBasePtr _sensor_ptr);
CaptureBasePtr getCaptureOf(const SensorBasePtr _sensor_ptr, const std::string& type);
CaptureBasePtrList getCapturesOf(const SensorBasePtr _sensor_ptr);
- void unlinkCapture(CaptureBasePtr _cap_ptr);
FactorBasePtr getFactorOf(const ProcessorBasePtr _processor_ptr);
FactorBasePtr getFactorOf(const ProcessorBasePtr _processor_ptr, const std::string& type);
diff --git a/src/frame/frame_base.cpp b/src/frame/frame_base.cpp
index 02914eb1a..789c93ec9 100644
--- a/src/frame/frame_base.cpp
+++ b/src/frame/frame_base.cpp
@@ -353,12 +353,6 @@ CaptureBasePtrList FrameBase::getCapturesOf(const SensorBasePtr _sensor_ptr)
return captures;
}
-void FrameBase::unlinkCapture(CaptureBasePtr _cap_ptr)
-{
- _cap_ptr->unlinkFromFrame();
- capture_list_.remove(_cap_ptr);
-}
-
FactorBasePtr FrameBase::getFactorOf(const ProcessorBasePtr _processor_ptr, const std::string& type)
{
for (const FactorBasePtr& constaint_ptr : getConstrainedByList())
--
GitLab