diff --git a/bindings/yarp.i b/bindings/yarp.i index 63b176745ee..8512980b5f3 100644 --- a/bindings/yarp.i +++ b/bindings/yarp.i @@ -431,11 +431,6 @@ MAKE_COMMS(Bottle) %include %include -#ifndef YARP_NO_DEPRECATED // Since YARP 3.0.0 -%include -%include -#endif - #ifndef YARP_NO_DEPRECATED // Since YARP 3.5.0 %include %include @@ -817,28 +812,10 @@ typedef yarp::os::BufferedPort 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 index 41272af4d8f..225afb360e6 100644 --- 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 index 63ae776c693..426888457f6 100644 --- a/src/libYARP_dev/src/yarp/dev/ControlBoardInterfaces.h +++ b/src/libYARP_dev/src/yarp/dev/ControlBoardInterfaces.h @@ -40,16 +40,4 @@ #include -#define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_ICONTROLMODE2_H_ON_PURPOSE -#include -#undef YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_ICONTROLMODE2_H_ON_PURPOSE - -#define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IPOSITIONCONTROL2_H_ON_PURPOSE -#include -#undef YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IPOSITIONCONTROL2_H_ON_PURPOSE - -#define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IVELOCITYCONTROL2_H_ON_PURPOSE -#include -#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 deleted file mode 100644 index 5b3a6255cb1..00000000000 --- a/src/libYARP_dev/src/yarp/dev/FrameGrabberControl2.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT) - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef YARP_DEV_FRAMEGRABBERCONTROL2_H -#define YARP_DEV_FRAMEGRABBERCONTROL2_H - -#include -#if !defined(YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_FRAMEGRABBERCONTROL2_H_ON_PURPOSE) -YARP_COMPILER_WARNING(" file is deprecated") -#endif - -#ifndef YARP_NO_DEPRECATED // Since YARP 3.0.0 - -#define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_FRAMEGRABBERINTERFACES_H_ON_PURPOSE -#include -#undef YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_FRAMEGRABBERINTERFACES_H_ON_PURPOSE - -/*! \file FrameGrabberControl2.h define common interfaces to discover - * remote camera capabilities */ - - -namespace yarp::dev { -/** - * This interface exports a list of general methods to discover the remote camera - * capabilities. It also has the get/set feature methods so can be used in conjuntion - * with former IFrameGrabberControls2 or as standalone. - * @deprecated Since YARP 3.0.0 - */ -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::IFrameGrabberControl instead") IFrameGrabberControls IFrameGrabberControls2; - -} // namespace yarp::dev - -#endif // YARP_NO_DEPRECATED - -#endif // YARP_DEV_FRAMEGRABBERCONTROL2_H diff --git a/src/libYARP_dev/src/yarp/dev/FrameGrabberInterfaces.h b/src/libYARP_dev/src/yarp/dev/FrameGrabberInterfaces.h index 37f23ced304..f5ea81dd823 100644 --- 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(" file is deprecated") #include #include -#define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_FRAMEGRABBERCONTROL2_H_ON_PURPOSE -#include -#undef YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_FRAMEGRABBERCONTROL2_H_ON_PURPOSE - #define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IFRAMEGRABBER_H_ON_PURPOSE #include #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 deleted file mode 100644 index 9cdd8d54ddc..00000000000 --- a/src/libYARP_dev/src/yarp/dev/IControlLimits2.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT) - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef YARP_DEV_ICONTROLLIMITS2_H -#define YARP_DEV_ICONTROLLIMITS2_H - -#include -#if !defined(YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_ICONTROLLIMITS2_H_ON_PURPOSE) -YARP_COMPILER_WARNING(" file is deprecated") -#endif - -#ifndef YARP_NO_DEPRECATED // Since YARP 3.0.0 - -#include - -namespace yarp { - namespace dev { -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::IControlLimits instead") IControlLimits IControlLimits2; -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::IControlLimitsRaw instead") IControlLimitsRaw IControlLimits2Raw; - } -} - -#endif - -#endif // YARP_DEV_ICONTROLLIMITS2_H diff --git a/src/libYARP_dev/src/yarp/dev/IControlMode2.h b/src/libYARP_dev/src/yarp/dev/IControlMode2.h deleted file mode 100644 index 9576898f43f..00000000000 --- a/src/libYARP_dev/src/yarp/dev/IControlMode2.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT) - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef YARP_DEV_ICONTROLMODE2_H -#define YARP_DEV_ICONTROLMODE2_H - -#include -#if !defined(YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_ICONTROLMODE2_H_ON_PURPOSE) -YARP_COMPILER_WARNING(" file is deprecated") -#endif - -#ifndef YARP_NO_DEPRECATED // Since YARP 3.0.0 - -#include - -namespace yarp::dev { -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::IControlModeRaw instead") IControlModeRaw IControlMode2Raw; -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::IControlMode instead") IControlMode IControlMode2; -} - -#endif - -#endif // YARP_DEV_ICONTROLMODE2_H diff --git a/src/libYARP_dev/src/yarp/dev/IPositionControl2.h b/src/libYARP_dev/src/yarp/dev/IPositionControl2.h deleted file mode 100644 index 1e109fc575f..00000000000 --- a/src/libYARP_dev/src/yarp/dev/IPositionControl2.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT) - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef YARP_DEV_IPOSITIONCONTROL2_H -#define YARP_DEV_IPOSITIONCONTROL2_H - -#include -#if !defined(YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IPOSITIONCONTROL2_H_ON_PURPOSE) -YARP_COMPILER_WARNING(" file is deprecated") -#endif - -#ifndef YARP_NO_DEPRECATED // Since YARP 3.0.0 - -#include -namespace yarp::dev { -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::IPositionControl instead") IPositionControl IPositionControl2; -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::IPositionControlRaw instead") IPositionControlRaw IPositionControl2Raw; -} -#endif - -#endif // YARP_DEV_IPOSITIONCONTROL2_H diff --git a/src/libYARP_dev/src/yarp/dev/IVelocityControl2.h b/src/libYARP_dev/src/yarp/dev/IVelocityControl2.h deleted file mode 100644 index 3911e66f181..00000000000 --- a/src/libYARP_dev/src/yarp/dev/IVelocityControl2.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT) - * SPDX-FileCopyrightText: 2006-2010 RobotCub Consortium - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef YARP_DEV_IVELOCITYCONTROL2_H -#define YARP_DEV_IVELOCITYCONTROL2_H - -#include -#if !defined(YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IVELOCITYCONTROL2_H_ON_PURPOSE) -YARP_COMPILER_WARNING(" file is deprecated") -#endif - -#ifndef YARP_NO_DEPRECATED // Since YARP 3.0.0 - -#include -namespace yarp::dev { -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::IVelocityControl instead") IVelocityControl IVelocityControl2; -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::IVelocityControlRaw instead") IVelocityControlRaw IVelocityControl2Raw; -} - -#endif // YARP_NO_DEPRECATED - -#endif // YARP_DEV_IVELOCITYCONTROL2_H diff --git a/src/libYARP_dev/src/yarp/dev/ImplementControlLimits2.h b/src/libYARP_dev/src/yarp/dev/ImplementControlLimits2.h deleted file mode 100644 index 53f781f8cf5..00000000000 --- a/src/libYARP_dev/src/yarp/dev/ImplementControlLimits2.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT) - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef YARP_DEV_ICONTROLLIMITS2IMPL_H -#define YARP_DEV_ICONTROLLIMITS2IMPL_H - -#include -#if !defined(YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IMPLEMENTCONTROLLIMITS2_H_ON_PURPOSE) -YARP_COMPILER_WARNING(" file is deprecated") -#endif - -#ifndef YARP_NO_DEPRECATED // Since YARP 3.0.0 - -#include -#include -#include - -namespace yarp { - namespace dev { -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::ImplementControlLimits instead") ImplementControlLimits ImplementControlLimits2; -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::StubImplControlLimitsRaw instead") StubImplControlLimitsRaw StubImplControlLimits2Raw; - } -} - -#endif // YARP_NO_DEPRECATED - -#endif // YARP_DEV_ICONTROLLIMITS2IMPL_H diff --git a/src/libYARP_dev/src/yarp/dev/ImplementControlMode2.h b/src/libYARP_dev/src/yarp/dev/ImplementControlMode2.h deleted file mode 100644 index 7582a93dcb6..00000000000 --- a/src/libYARP_dev/src/yarp/dev/ImplementControlMode2.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT) - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef YARP_DEV_IMPLEMENTCONTROLMODE2_H -#define YARP_DEV_IMPLEMENTCONTROLMODE2_H - -#include -#if !defined(YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IMPLEMENTCONTROLMODE2_H_ON_PURPOSE) -YARP_COMPILER_WARNING(" file is deprecated") -#endif - -#ifndef YARP_NO_DEPRECATED // Since YARP 3.0.0 - -#include -#include - -namespace yarp { - namespace dev { -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::ImplementControlMode instead") ImplementControlMode ImplementControlMode2; - } -} - -#endif // YARP_NO_DEPRECATED - -#endif // YARP_DEV_IMPLEMENTCONTROLMODE2_H diff --git a/src/libYARP_dev/src/yarp/dev/ImplementPositionControl2.h b/src/libYARP_dev/src/yarp/dev/ImplementPositionControl2.h deleted file mode 100644 index 0df2d6233f4..00000000000 --- a/src/libYARP_dev/src/yarp/dev/ImplementPositionControl2.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT) - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef YARP_DEV_IPOSITIONCONTROL2IMPL_H -#define YARP_DEV_IPOSITIONCONTROL2IMPL_H - -#include -#if !defined(YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IMPLEMENTPOSITIONCONTROL2_H_ON_PURPOSE) -YARP_COMPILER_WARNING(" file is deprecated") -#endif - -#ifndef YARP_NO_DEPRECATED // Since YARP 3.0.0 - -#include - -namespace yarp{ - namespace dev { -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::ImplementPositionControl instead") ImplementPositionControl ImplementPositionControl2; -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::StubImplPositionControlRaw instead") StubImplPositionControlRaw StubImplPositionControl2Raw; - } -} - -#endif // YARP_NO_DEPRECATED - -#endif // YARP_DEV_IPOSITIONCONTROL2IMPL_H diff --git a/src/libYARP_dev/src/yarp/dev/ImplementVelocityControl2.h b/src/libYARP_dev/src/yarp/dev/ImplementVelocityControl2.h deleted file mode 100644 index 9d81a0a7b51..00000000000 --- a/src/libYARP_dev/src/yarp/dev/ImplementVelocityControl2.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2006-2021 Istituto Italiano di Tecnologia (IIT) - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef YARP_DEV_IVELOCITYCONTROL2IMPL_H -#define YARP_DEV_IVELOCITYCONTROL2IMPL_H - -#include -#if !defined(YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_IMPLEMENTVELOCITYCONTROL2_H_ON_PURPOSE) -YARP_COMPILER_WARNING(" file is deprecated") -#endif - -#ifndef YARP_NO_DEPRECATED // Since YARP 3.0.0 - -#include -#include - -namespace yarp { - namespace dev { -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::ImplementVelocityControl instead") ImplementVelocityControl ImplementVelocityControl2; -YARP_DEPRECATED_TYPEDEF_MSG("Use yarp::dev::StubImplVelocityControlRaw instead") StubImplVelocityControlRaw StubImplVelocityControl2Raw; - } -} -#endif // YARP_NO_DEPRECATED - -#endif // YARP_DEV_IVELOCITYCONTROL2IMPL_H diff --git a/src/libYARP_dev/src/yarp/dev/all.h b/src/libYARP_dev/src/yarp/dev/all.h index b01a7b022fb..01b5364c9fe 100644 --- a/src/libYARP_dev/src/yarp/dev/all.h +++ b/src/libYARP_dev/src/yarp/dev/all.h @@ -40,12 +40,6 @@ #include #include -#ifndef YARP_NO_DEPRECATED // since YARP 3.0 -#define YARP_INCLUDING_DEPRECATED_HEADER_YARP_DEV_FRAMEGRABBERCONTROL2_H_ON_PURPOSE -#include -#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