Skip to content

Commit 8f160a4

Browse files
authored
Removed deprecated API (#160)
Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
1 parent b4529af commit 8f160a4

20 files changed

Lines changed: 5 additions & 1000 deletions

point_cloud_transport/include/point_cloud_transport/point_cloud_transport.hpp

Lines changed: 0 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -95,39 +95,6 @@ class PointCloudTransportLoader
9595
point_cloud_transport::SubLoaderPtr sub_loader_;
9696
};
9797

98-
/// \brief Advertise every available transport on pointcloud topics, free function version.
99-
/// \param node The ROS node to use for any ROS operations
100-
/// \param base_topic The base topic for the publisher
101-
/// \param custom_qos The QoS profile to use for the underlying publisher(s)
102-
/// \param options The publisher options to use for the underlying publisher(s)
103-
/// \return The advertised publisher
104-
[[deprecated("Use create_publisher(rclcpp::node_interfaces...) instead")]]
105-
POINT_CLOUD_TRANSPORT_PUBLIC
106-
Publisher create_publisher(
107-
std::shared_ptr<rclcpp::Node> node,
108-
const std::string & base_topic,
109-
rmw_qos_profile_t custom_qos = rmw_qos_profile_default,
110-
const rclcpp::PublisherOptions & options = rclcpp::PublisherOptions());
111-
112-
/// \brief Advertise every available transport on pointcloud topics, free function version.
113-
/// \param node_interfaces the ROS node interfaces required for core node functionality, including
114-
/// NodeBaseInterface, NodeParametersInterface, NodeTopicsInterface, and NodeLoggingInterface.
115-
/// \param base_topic The base topic for the publisher
116-
/// \param custom_qos The QoS profile to use for the underlying publisher(s)
117-
/// \param options The publisher options to use for the underlying publisher(s)
118-
/// \return The advertised publisher
119-
[[deprecated("Use create_publisher(rclcpp::node_interfaces..., rclcpp::QoS, ...) instead")]]
120-
POINT_CLOUD_TRANSPORT_PUBLIC
121-
Publisher create_publisher(
122-
std::shared_ptr<rclcpp::node_interfaces::NodeInterfaces<
123-
rclcpp::node_interfaces::NodeBaseInterface,
124-
rclcpp::node_interfaces::NodeParametersInterface,
125-
rclcpp::node_interfaces::NodeTopicsInterface,
126-
rclcpp::node_interfaces::NodeLoggingInterface>> & node_interfaces,
127-
const std::string & base_topic,
128-
rmw_qos_profile_t custom_qos = rmw_qos_profile_default,
129-
const rclcpp::PublisherOptions & options = rclcpp::PublisherOptions());
130-
13198
/// \brief Advertise every available transport on pointcloud topics, free function version.
13299
/// \param node_interfaces the ROS node interfaces required for core node functionality, including
133100
/// NodeBaseInterface, NodeParametersInterface, NodeTopicsInterface, and NodeLoggingInterface.
@@ -146,47 +113,6 @@ Publisher create_publisher(
146113
rclcpp::QoS custom_qos,
147114
const rclcpp::PublisherOptions & options = rclcpp::PublisherOptions());
148115

149-
/// \brief Subscribe to a pointcloud transport topic, free function version.
150-
/// \param node The ROS node to use for any ROS operations
151-
/// \param base_topic The base topic for the subscription
152-
/// \param callback The callback to invoke on receipt of a message
153-
/// \param transport The transport to use for the subscription
154-
/// \param custom_qos The QoS profile to use for the underlying publisher
155-
/// \param options The publisher options to use for the underlying publisher
156-
/// \return The subscriber
157-
[[deprecated("Use create_subscription(rclcpp::node_interfaces...) instead")]]
158-
POINT_CLOUD_TRANSPORT_PUBLIC
159-
Subscriber create_subscription(
160-
std::shared_ptr<rclcpp::Node> node,
161-
const std::string & base_topic,
162-
const Subscriber::Callback & callback,
163-
const std::string & transport,
164-
rmw_qos_profile_t custom_qos = rmw_qos_profile_default,
165-
rclcpp::SubscriptionOptions options = rclcpp::SubscriptionOptions());
166-
167-
/// \brief Subscribe to a pointcloud transport topic, free function version.
168-
/// \param node_interfaces the ROS node interfaces required for core node functionality, including
169-
/// NodeBaseInterface, NodeParametersInterface, NodeTopicsInterface, and NodeLoggingInterface.
170-
/// \param base_topic The base topic for the subscription
171-
/// \param callback The callback to invoke on receipt of a message
172-
/// \param transport The transport to use for the subscription
173-
/// \param custom_qos The QoS profile to use for the underlying publisher
174-
/// \param options The publisher options to use for the underlying publisher
175-
/// \return The subscriber
176-
[[deprecated("Use create_subscription(rclcpp::node_interfaces..., rclcpp::QoS, ...) instead")]]
177-
POINT_CLOUD_TRANSPORT_PUBLIC
178-
Subscriber create_subscription(
179-
std::shared_ptr<rclcpp::node_interfaces::NodeInterfaces<
180-
rclcpp::node_interfaces::NodeBaseInterface,
181-
rclcpp::node_interfaces::NodeParametersInterface,
182-
rclcpp::node_interfaces::NodeTopicsInterface,
183-
rclcpp::node_interfaces::NodeLoggingInterface>> & node_interfaces,
184-
const std::string & base_topic,
185-
const Subscriber::Callback & callback,
186-
const std::string & transport,
187-
rmw_qos_profile_t custom_qos = rmw_qos_profile_default,
188-
rclcpp::SubscriptionOptions options = rclcpp::SubscriptionOptions());
189-
190116
/// \brief Subscribe to a pointcloud transport topic, free function version.
191117
/// \param node_interfaces the ROS node interfaces required for core node functionality, including
192118
/// NodeBaseInterface, NodeParametersInterface, NodeTopicsInterface, and NodeLoggingInterface.
@@ -218,10 +144,6 @@ class PointCloudTransport : public PointCloudTransportLoader
218144

219145
public:
220146
//! Constructor
221-
[[deprecated("Use PointCloudTransport(rclcpp::node_interfaces...) instead")]]
222-
POINT_CLOUD_TRANSPORT_PUBLIC
223-
explicit PointCloudTransport(rclcpp::Node::SharedPtr node);
224-
225147
POINT_CLOUD_TRANSPORT_PUBLIC
226148
explicit PointCloudTransport(
227149
rclcpp::node_interfaces::NodeInterfaces<
@@ -267,17 +189,6 @@ class PointCloudTransport : public PointCloudTransportLoader
267189
return Publisher(node_interfaces_, base_topic, pub_loader_, custom_qos, options);
268190
}
269191

270-
[[deprecated("Use advertise(..., rclcpp::QoS custom_qos, ...) instead")]]
271-
POINT_CLOUD_TRANSPORT_PUBLIC
272-
Publisher advertise(
273-
const std::string & base_topic,
274-
rmw_qos_profile_t custom_qos,
275-
const rclcpp::PublisherOptions & options = rclcpp::PublisherOptions())
276-
{
277-
return Publisher(node_interfaces_, base_topic, pub_loader_,
278-
rclcpp::QoS(rclcpp::QoSInitialization::from_rmw(custom_qos), custom_qos), options);
279-
}
280-
281192
POINT_CLOUD_TRANSPORT_PUBLIC
282193
Publisher advertise(
283194
const std::string & base_topic,
@@ -287,23 +198,6 @@ class PointCloudTransport : public PointCloudTransportLoader
287198
return Publisher(node_interfaces_, base_topic, pub_loader_, custom_qos, options);
288199
}
289200

290-
//! Subscribe to a point cloud topic, version for arbitrary std::function object.
291-
[[deprecated("Use subscribe(..., rclcpp::QoS custom_qos, ...) instead")]]
292-
POINT_CLOUD_TRANSPORT_PUBLIC
293-
point_cloud_transport::Subscriber subscribe(
294-
const std::string & base_topic, rmw_qos_profile_t custom_qos,
295-
const std::function<void(const sensor_msgs::msg::PointCloud2::ConstSharedPtr &)> & callback,
296-
const VoidPtr & tracked_object = {},
297-
const point_cloud_transport::TransportHints * transport_hints = nullptr,
298-
rclcpp::SubscriptionOptions options = rclcpp::SubscriptionOptions())
299-
{
300-
(void)tracked_object;
301-
return Subscriber(
302-
node_interfaces_, base_topic, callback, sub_loader_,
303-
getTransportOrDefault(transport_hints),
304-
rclcpp::QoS(rclcpp::QoSInitialization::from_rmw(custom_qos), custom_qos), options);
305-
}
306-
307201
//! Subscribe to a point cloud topic, version for arbitrary std::function object.
308202
POINT_CLOUD_TRANSPORT_PUBLIC
309203
point_cloud_transport::Subscriber subscribe(
@@ -334,20 +228,6 @@ class PointCloudTransport : public PointCloudTransportLoader
334228
base_topic, custom_qos, callback, tracked_object, transport_hints, options);
335229
}
336230

337-
[[deprecated("Use subscribe(..., rclcpp::QoS custom_qos, ...) instead")]]
338-
POINT_CLOUD_TRANSPORT_PUBLIC
339-
point_cloud_transport::Subscriber subscribe(
340-
const std::string & base_topic, rmw_qos_profile_t custom_qos,
341-
void (* fp)(const sensor_msgs::msg::PointCloud2::ConstSharedPtr &),
342-
const point_cloud_transport::TransportHints * transport_hints = nullptr,
343-
rclcpp::SubscriptionOptions options = rclcpp::SubscriptionOptions())
344-
{
345-
return subscribe(
346-
base_topic, rclcpp::QoS(rclcpp::QoSInitialization::from_rmw(custom_qos), custom_qos),
347-
std::function<void(const sensor_msgs::msg::PointCloud2::ConstSharedPtr &)>(fp),
348-
VoidPtr(), transport_hints, options);
349-
}
350-
351231
POINT_CLOUD_TRANSPORT_PUBLIC
352232
point_cloud_transport::Subscriber subscribe(
353233
const std::string & base_topic, rclcpp::QoS custom_qos,
@@ -374,22 +254,6 @@ class PointCloudTransport : public PointCloudTransportLoader
374254
VoidPtr(), transport_hints, options);
375255
}
376256

377-
//! Subscribe to a point cloud topic, version for class member function with bare pointer.
378-
template<class T>
379-
[[deprecated("Use subscribe(..., rclcpp::QoS custom_qos, ...) instead")]]
380-
point_cloud_transport::Subscriber subscribe(
381-
const std::string & base_topic, rmw_qos_profile_t custom_qos,
382-
void (T::* fp)(const sensor_msgs::msg::PointCloud2::ConstSharedPtr &) const, T * obj,
383-
const point_cloud_transport::TransportHints * transport_hints = nullptr,
384-
rclcpp::SubscriptionOptions options = rclcpp::SubscriptionOptions())
385-
{
386-
return subscribe(
387-
base_topic, rclcpp::QoS(rclcpp::QoSInitialization::from_rmw(custom_qos), custom_qos),
388-
std::bind(
389-
fp,
390-
obj, std::placeholders::_1), VoidPtr(), transport_hints, options);
391-
}
392-
393257
//! Subscribe to a point cloud topic, version for class member function with bare pointer.
394258
template<class T>
395259
point_cloud_transport::Subscriber subscribe(
@@ -417,23 +281,6 @@ class PointCloudTransport : public PointCloudTransportLoader
417281
obj, std::placeholders::_1), VoidPtr(), transport_hints, options);
418282
}
419283

420-
//! Subscribe to a point cloud topic, version for class member function with shared_ptr.
421-
template<class T>
422-
[[deprecated("Use subscribe(..., rclcpp::QoS custom_qos, ...) instead")]]
423-
point_cloud_transport::Subscriber subscribe(
424-
const std::string & base_topic, rmw_qos_profile_t custom_qos,
425-
void (T::* fp)(const sensor_msgs::msg::PointCloud2::ConstSharedPtr &) const,
426-
const std::shared_ptr<T> & obj,
427-
const point_cloud_transport::TransportHints * transport_hints = nullptr,
428-
const rclcpp::SubscriptionOptions & options = rclcpp::SubscriptionOptions())
429-
{
430-
return subscribe(
431-
base_topic, rclcpp::QoS(rclcpp::QoSInitialization::from_rmw(custom_qos), custom_qos),
432-
std::bind(
433-
fp,
434-
obj, std::placeholders::_1), obj, transport_hints, options);
435-
}
436-
437284
//! Subscribe to a point cloud topic, version for class member function with shared_ptr.
438285
template<class T>
439286
point_cloud_transport::Subscriber subscribe(

point_cloud_transport/include/point_cloud_transport/publisher.hpp

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -57,35 +57,6 @@ class Publisher
5757
POINT_CLOUD_TRANSPORT_PUBLIC
5858
Publisher() = default;
5959

60-
[[deprecated("Use Publisher(rclcpp::node_interfaces...) instead")]]
61-
POINT_CLOUD_TRANSPORT_PUBLIC
62-
Publisher(
63-
std::shared_ptr<rclcpp::Node> node,
64-
const std::string & base_topic,
65-
PubLoaderPtr loader,
66-
rmw_qos_profile_t custom_qos,
67-
const rclcpp::PublisherOptions & options = rclcpp::PublisherOptions())
68-
: Publisher(
69-
*node,
70-
base_topic,
71-
loader,
72-
rclcpp::QoS(rclcpp::QoSInitialization::from_rmw(custom_qos), custom_qos),
73-
options)
74-
{}
75-
76-
[[deprecated("Use Publisher(rclcpp::node_interfaces, ..., rclcpp::QoS custom_qos,...) instead")]]
77-
POINT_CLOUD_TRANSPORT_PUBLIC
78-
Publisher(
79-
std::shared_ptr<rclcpp::node_interfaces::NodeInterfaces<
80-
rclcpp::node_interfaces::NodeBaseInterface,
81-
rclcpp::node_interfaces::NodeParametersInterface,
82-
rclcpp::node_interfaces::NodeTopicsInterface,
83-
rclcpp::node_interfaces::NodeLoggingInterface>> node_interfaces,
84-
const std::string & base_topic,
85-
PubLoaderPtr loader,
86-
rmw_qos_profile_t custom_qos,
87-
const rclcpp::PublisherOptions & options = rclcpp::PublisherOptions());
88-
8960
POINT_CLOUD_TRANSPORT_PUBLIC
9061
Publisher(
9162
rclcpp::node_interfaces::NodeInterfaces<

point_cloud_transport/include/point_cloud_transport/publisher_plugin.hpp

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -89,26 +89,6 @@ class PublisherPlugin
8989
virtual std::string getMessageType() const;
9090

9191
//! \brief Advertise a topic, simple version.
92-
[[deprecated("Use advertise(rclcpp::node_interfaces...) instead")]]
93-
POINT_CLOUD_TRANSPORT_PUBLIC
94-
void advertise(
95-
std::shared_ptr<rclcpp::Node> node,
96-
const std::string & base_topic,
97-
rmw_qos_profile_t custom_qos = rmw_qos_profile_default,
98-
const rclcpp::PublisherOptions & options = rclcpp::PublisherOptions());
99-
100-
[[deprecated("Use advertise(rclcpp::node_interfaces, ..., rclcpp::QoS, ...) instead")]]
101-
POINT_CLOUD_TRANSPORT_PUBLIC
102-
void advertise(
103-
std::shared_ptr<rclcpp::node_interfaces::NodeInterfaces<
104-
rclcpp::node_interfaces::NodeBaseInterface,
105-
rclcpp::node_interfaces::NodeParametersInterface,
106-
rclcpp::node_interfaces::NodeTopicsInterface,
107-
rclcpp::node_interfaces::NodeLoggingInterface>> node_interfaces,
108-
const std::string & base_topic,
109-
rmw_qos_profile_t custom_qos = rmw_qos_profile_default,
110-
const rclcpp::PublisherOptions & options = rclcpp::PublisherOptions());
111-
11292
POINT_CLOUD_TRANSPORT_PUBLIC
11393
void advertise(
11494
rclcpp::node_interfaces::NodeInterfaces<
@@ -166,36 +146,6 @@ class PublisherPlugin
166146

167147
protected:
168148
//! Advertise a topic. Must be implemented by the subclass.
169-
[[deprecated("Use advertiseImpl(rclcpp::node_interfaces...) instead")]]
170-
virtual void advertiseImpl(
171-
std::shared_ptr<rclcpp::Node> node, const std::string & base_topic,
172-
rmw_qos_profile_t custom_qos,
173-
const rclcpp::PublisherOptions & options = rclcpp::PublisherOptions())
174-
{
175-
advertiseImpl(
176-
*node,
177-
base_topic,
178-
rclcpp::QoS(rclcpp::QoSInitialization::from_rmw(custom_qos), custom_qos),
179-
options);
180-
}
181-
182-
[[deprecated("Use advertiseImpl(rclcpp::node_interfaces..., rclcpp::QoS, ...) instead")]]
183-
virtual void advertiseImpl(
184-
std::shared_ptr<rclcpp::node_interfaces::NodeInterfaces<
185-
rclcpp::node_interfaces::NodeBaseInterface,
186-
rclcpp::node_interfaces::NodeParametersInterface,
187-
rclcpp::node_interfaces::NodeTopicsInterface,
188-
rclcpp::node_interfaces::NodeLoggingInterface>> node_interfaces,
189-
const std::string & base_topic,
190-
rmw_qos_profile_t custom_qos = rmw_qos_profile_default,
191-
const rclcpp::PublisherOptions & options = rclcpp::PublisherOptions())
192-
{
193-
advertiseImpl(
194-
*node_interfaces, base_topic,
195-
rclcpp::QoS(rclcpp::QoSInitialization::from_rmw(custom_qos), custom_qos),
196-
options);
197-
}
198-
199149
virtual void advertiseImpl(
200150
rclcpp::node_interfaces::NodeInterfaces<
201151
rclcpp::node_interfaces::NodeBaseInterface,

point_cloud_transport/include/point_cloud_transport/simple_publisher_plugin.hpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -222,20 +222,6 @@ class SimplePublisherPlugin : public point_cloud_transport::PublisherPlugin
222222
protected:
223223
std::string base_topic_;
224224

225-
void advertiseImpl(
226-
std::shared_ptr<rclcpp::node_interfaces::NodeInterfaces<
227-
rclcpp::node_interfaces::NodeBaseInterface,
228-
rclcpp::node_interfaces::NodeParametersInterface,
229-
rclcpp::node_interfaces::NodeTopicsInterface,
230-
rclcpp::node_interfaces::NodeLoggingInterface>> node_interfaces,
231-
const std::string & base_topic,
232-
rmw_qos_profile_t custom_qos = rmw_qos_profile_default,
233-
const rclcpp::PublisherOptions & options = rclcpp::PublisherOptions()) override
234-
{
235-
advertiseImpl(*node_interfaces, base_topic,
236-
rclcpp::QoS(rclcpp::QoSInitialization::from_rmw(custom_qos), custom_qos), options);
237-
}
238-
239225
void advertiseImpl(
240226
rclcpp::node_interfaces::NodeInterfaces<
241227
rclcpp::node_interfaces::NodeBaseInterface,

point_cloud_transport/include/point_cloud_transport/simple_subscriber_plugin.hpp

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -220,35 +220,6 @@ class SimpleSubscriberPlugin : public SubscriberPlugin
220220
return base_topic + "/" + getTransportName();
221221
}
222222

223-
void subscribeImpl(
224-
std::shared_ptr<rclcpp::node_interfaces::NodeInterfaces<
225-
rclcpp::node_interfaces::NodeBaseInterface,
226-
rclcpp::node_interfaces::NodeParametersInterface,
227-
rclcpp::node_interfaces::NodeTopicsInterface,
228-
rclcpp::node_interfaces::NodeLoggingInterface>> node_interfaces,
229-
const std::string & base_topic,
230-
const Callback & callback,
231-
rmw_qos_profile_t custom_qos) override
232-
{
233-
subscribeImpl(*node_interfaces, base_topic, callback,
234-
rclcpp::QoS(rclcpp::QoSInitialization::from_rmw(custom_qos), custom_qos));
235-
}
236-
237-
void subscribeImpl(
238-
std::shared_ptr<rclcpp::node_interfaces::NodeInterfaces<
239-
rclcpp::node_interfaces::NodeBaseInterface,
240-
rclcpp::node_interfaces::NodeParametersInterface,
241-
rclcpp::node_interfaces::NodeTopicsInterface,
242-
rclcpp::node_interfaces::NodeLoggingInterface>> node_interfaces,
243-
const std::string & base_topic,
244-
const Callback & callback,
245-
rmw_qos_profile_t custom_qos,
246-
rclcpp::SubscriptionOptions options) override
247-
{
248-
subscribeImpl(*node_interfaces, base_topic, callback,
249-
rclcpp::QoS(rclcpp::QoSInitialization::from_rmw(custom_qos), custom_qos), options);
250-
}
251-
252223
void subscribeImpl(
253224
rclcpp::node_interfaces::NodeInterfaces<
254225
rclcpp::node_interfaces::NodeBaseInterface,

0 commit comments

Comments
 (0)