Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed deprecated interfaces #2837

Merged
merged 3 commits into from
May 18, 2022
Merged

Removed deprecated interfaces #2837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5253f6f
removed several interfaces/include files deprecated since Yarp 3.0
randaz81 Apr 29, 2022
0446fc4
includes removed from CMakeLists.txt
randaz81 May 5, 2022
e961a8e
fixed bindings
randaz81 May 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions bindings/yarp.i
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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)
Expand Down
9 changes: 0 additions & 9 deletions src/libYARP_dev/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions src/libYARP_dev/src/yarp/dev/ControlBoardInterfaces.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
37 changes: 0 additions & 37 deletions src/libYARP_dev/src/yarp/dev/FrameGrabberControl2.h
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/libYARP_dev/src/yarp/dev/FrameGrabberInterfaces.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
27 changes: 0 additions & 27 deletions src/libYARP_dev/src/yarp/dev/IControlLimits2.h
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions src/libYARP_dev/src/yarp/dev/IControlMode2.h
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions src/libYARP_dev/src/yarp/dev/IPositionControl2.h
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions src/libYARP_dev/src/yarp/dev/IVelocityControl2.h
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions src/libYARP_dev/src/yarp/dev/ImplementControlLimits2.h
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/libYARP_dev/src/yarp/dev/ImplementControlMode2.h
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/libYARP_dev/src/yarp/dev/ImplementPositionControl2.h
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/libYARP_dev/src/yarp/dev/ImplementVelocityControl2.h
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/libYARP_dev/src/yarp/dev/all.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down