Merge pull request #2837 from randaz81/removed_deprecated_interfaces

Removed deprecated interfaces
robotology · May 18, 2022 · 225ed49 · 225ed49
2 parents e06abde + e961a8e
commit 225ed49
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 301 deletions.
diff --git a/bindings/yarp.i b/bindings/yarp.i
@@ -431,11 +431,6 @@ MAKE_COMMS(Bottle)
 %include <yarp/dev/IPositionDirect.h>
 %include <yarp/dev/MultipleAnalogSensorsInterfaces.h>
 
-#ifndef YARP_NO_DEPRECATED // Since YARP 3.0.0
-%include <yarp/dev/FrameGrabberControl2.h>
-%include <yarp/dev/IControlMode2.h>
-#endif
-
 #ifndef YARP_NO_DEPRECATED // Since YARP 3.5.0
 %include <yarp/dev/IFrameGrabber.h>
 %include <yarp/dev/IFrameGrabberRgb.h>
@@ -817,28 +812,10 @@ typedef yarp::os::BufferedPort<ImageRgbFloat> BufferedPortImageRgbFloat;
     CAST_POLYDRIVER_TO_INTERFACE(ITorqueControl)
     CAST_POLYDRIVER_TO_INTERFACE(IControlMode)
     CAST_POLYDRIVER_TO_INTERFACE(IJointFault)
-
-#ifndef YARP_NO_DEPRECATED // Since YARP 3.0.0
-    yarp::dev::IControlMode *viewIControlMode2() {
-        yarp::dev::IControlMode *result;
-        self->view(result);
-        return result;
-    }
-#endif
-
     CAST_POLYDRIVER_TO_INTERFACE(IInteractionMode)
     CAST_POLYDRIVER_TO_INTERFACE(IPWMControl)
     CAST_POLYDRIVER_TO_INTERFACE(ICurrentControl)
     CAST_POLYDRIVER_TO_INTERFACE(IAnalogSensor)
-
-#ifndef YARP_NO_DEPRECATED // Since YARP 3.0.0
-    yarp::dev::IFrameGrabberControls *viewIFrameGrabberControls2() {
-        yarp::dev::IFrameGrabberControls *result;
-        self->view(result);
-        return result;
-    }
-#endif
-
     CAST_POLYDRIVER_TO_INTERFACE(IFrameGrabberControls)
     CAST_POLYDRIVER_TO_INTERFACE(IPositionDirect)
     CAST_POLYDRIVER_TO_INTERFACE(IRemoteVariables)

diff --git a/src/libYARP_dev/src/CMakeLists.txt b/src/libYARP_dev/src/CMakeLists.txt
@@ -135,15 +135,6 @@ endif()
 
 if(NOT YARP_NO_DEPRECATED)
   list(APPEND YARP_dev_HDRS
-    yarp/dev/FrameGrabberControl2.h      # DEPRECATED Since YARP 3.0.0
-    yarp/dev/IControlLimits2.h           # DEPRECATED Since YARP 3.0.0
-    yarp/dev/IControlMode2.h             # DEPRECATED Since YARP 3.0.0
-    yarp/dev/IPositionControl2.h         # DEPRECATED Since YARP 3.0.0
-    yarp/dev/IVelocityControl2.h         # DEPRECATED Since YARP 3.0.0
-    yarp/dev/ImplementControlLimits2.h   # DEPRECATED Since YARP 3.0.0
-    yarp/dev/ImplementControlMode2.h     # DEPRECATED Since YARP 3.0.0
-    yarp/dev/ImplementPositionControl2.h # DEPRECATED Since YARP 3.0.0
-    yarp/dev/ImplementVelocityControl2.h # DEPRECATED Since YARP 3.0.0
     yarp/dev/DataSource.h                # DEPRECATED Since YARP 3.3.0
     yarp/dev/GenericSensorInterfaces.h   # DEPRECATED Since YARP 3.3.0
     yarp/dev/PreciselyTimed.h            # DEPRECATED Since YARP 3.3.0

diff --git a/src/libYARP_dev/src/yarp/dev/ControlBoardInterfaces.h b/src/libYARP_dev/src/yarp/dev/ControlBoardInterfaces.h
@@ -40,16 +40,4 @@
 
 #include <yarp/dev/ControlBoardVocabs.h>
 
-#define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_ICONTROLMODE2_H_ON_PURPOSE
-#include <yarp/dev/IControlMode2.h>
-#undef YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_ICONTROLMODE2_H_ON_PURPOSE
-
-#define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IPOSITIONCONTROL2_H_ON_PURPOSE
-#include <yarp/dev/IPositionControl2.h>
-#undef YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IPOSITIONCONTROL2_H_ON_PURPOSE
-
-#define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IVELOCITYCONTROL2_H_ON_PURPOSE
-#include <yarp/dev/IVelocityControl2.h>
-#undef YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IVELOCITYCONTROL2_H_ON_PURPOSE
-
 #endif // YARP_DEV_CONTROLBOARDINTERFACES_H
diff --git a/src/libYARP_dev/src/yarp/dev/FrameGrabberControl2.h b/src/libYARP_dev/src/yarp/dev/FrameGrabberControl2.h
diff --git a/src/libYARP_dev/src/yarp/dev/FrameGrabberInterfaces.h b/src/libYARP_dev/src/yarp/dev/FrameGrabberInterfaces.h
@@ -18,10 +18,6 @@ YARP_COMPILER_WARNING("<yarp/dev/FrameGrabberInterfaces.h> file is deprecated")
 #include <yarp/dev/IFrameGrabberControlsDC1394.h>
 #include <yarp/dev/IFrameWriterImage.h>
 
-#define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_FRAMEGRABBERCONTROL2_H_ON_PURPOSE
-#include <yarp/dev/FrameGrabberControl2.h>
-#undef YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_FRAMEGRABBERCONTROL2_H_ON_PURPOSE
-
 #define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IFRAMEGRABBER_H_ON_PURPOSE
 #include <yarp/dev/IFrameGrabber.h>
 #undef YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IFRAMEGRABBER_H_ON_PURPOSE

diff --git a/src/libYARP_dev/src/yarp/dev/IControlLimits2.h b/src/libYARP_dev/src/yarp/dev/IControlLimits2.h
diff --git a/src/libYARP_dev/src/yarp/dev/IControlMode2.h b/src/libYARP_dev/src/yarp/dev/IControlMode2.h
diff --git a/src/libYARP_dev/src/yarp/dev/IPositionControl2.h b/src/libYARP_dev/src/yarp/dev/IPositionControl2.h
diff --git a/src/libYARP_dev/src/yarp/dev/IVelocityControl2.h b/src/libYARP_dev/src/yarp/dev/IVelocityControl2.h
diff --git a/src/libYARP_dev/src/yarp/dev/ImplementControlLimits2.h b/src/libYARP_dev/src/yarp/dev/ImplementControlLimits2.h
diff --git a/src/libYARP_dev/src/yarp/dev/ImplementControlMode2.h b/src/libYARP_dev/src/yarp/dev/ImplementControlMode2.h
diff --git a/src/libYARP_dev/src/yarp/dev/ImplementPositionControl2.h b/src/libYARP_dev/src/yarp/dev/ImplementPositionControl2.h
diff --git a/src/libYARP_dev/src/yarp/dev/ImplementVelocityControl2.h b/src/libYARP_dev/src/yarp/dev/ImplementVelocityControl2.h
diff --git a/src/libYARP_dev/src/yarp/dev/all.h b/src/libYARP_dev/src/yarp/dev/all.h
@@ -40,12 +40,6 @@
 #include <yarp/dev/IWrapper.h>
 #include <yarp/dev/IMultipleWrapper.h>
 
-#ifndef YARP_NO_DEPRECATED // since YARP 3.0
-#define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_FRAMEGRABBERCONTROL2_H_ON_PURPOSE
-#include <yarp/dev/FrameGrabberControl2.h>
-#undef YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_FRAMEGRABBERCONTROL2_H_ON_PURPOSE
-#endif // YARP_NO_DEPRECATED
-
 #ifndef YARP_NO_DEPRECATED // since YARP 3.3
 #define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_DATASOURCE_H_ON_PURPOSE
 #include <yarp/dev/DataSource.h>