Skip to content

Commit 18c71ad

Browse files
committed
Modify getters naming, add docblocks
Signed-off-by: Ivan Santiago Paunovic <[email protected]>
1 parent 3b3bcf0 commit 18c71ad

File tree

3 files changed

+42
-33
lines changed

3 files changed

+42
-33
lines changed

rclcpp/include/rclcpp/qos.hpp

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,32 +201,41 @@ class RCLCPP_PUBLIC QoS
201201
QoS &
202202
avoid_ros_namespace_conventions(bool avoid_ros_namespace_conventions);
203203

204+
/// Get the history qos policy.
204205
HistoryPolicy
205-
get_history() const;
206+
history() const;
206207

208+
/// Get the history depth.
207209
size_t
208-
get_depth() const;
210+
depth() const;
209211

212+
/// Get the reliability policy.
210213
ReliabilityPolicy
211-
get_reliability() const;
214+
reliability() const;
212215

216+
/// Get the durability policy.
213217
DurabilityPolicy
214-
get_durability() const;
218+
durability() const;
215219

220+
/// Get the deadline duration setting.
216221
rclcpp::Duration
217-
get_deadline() const;
222+
deadline() const;
218223

224+
/// Get the lifespan duration setting.
219225
rclcpp::Duration
220-
get_lifespan() const;
226+
lifespan() const;
221227

228+
/// Get the liveliness policy.
222229
LivelinessPolicy
223-
get_liveliness() const;
230+
liveliness() const;
224231

232+
/// Get the liveliness lease duration setting.
225233
rclcpp::Duration
226-
get_liveliness_lease_duration() const;
234+
liveliness_lease_duration() const;
227235

236+
/// Get the `avoid ros namespace convention` setting.
228237
bool
229-
get_avoid_ros_namespace_conventions() const;
238+
avoid_ros_namespace_conventions() const;
230239

231240
private:
232241
rmw_qos_profile_t rmw_qos_profile_;

rclcpp/src/rclcpp/qos.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -236,46 +236,46 @@ QoS::avoid_ros_namespace_conventions(bool avoid_ros_namespace_conventions)
236236
}
237237

238238
HistoryPolicy
239-
QoS::get_history() const
239+
QoS::history() const
240240
{
241241
return static_cast<HistoryPolicy>(rmw_qos_profile_.history);
242242
}
243243

244244
size_t
245-
QoS::get_depth() const {return rmw_qos_profile_.depth;}
245+
QoS::depth() const {return rmw_qos_profile_.depth;}
246246

247247
ReliabilityPolicy
248-
QoS::get_reliability() const
248+
QoS::reliability() const
249249
{
250250
return static_cast<ReliabilityPolicy>(rmw_qos_profile_.reliability);
251251
}
252252

253253
DurabilityPolicy
254-
QoS::get_durability() const
254+
QoS::durability() const
255255
{
256256
return static_cast<DurabilityPolicy>(rmw_qos_profile_.durability);
257257
}
258258

259259
Duration
260-
QoS::get_deadline() const {return Duration::from_rmw_time(rmw_qos_profile_.deadline);}
260+
QoS::deadline() const {return Duration::from_rmw_time(rmw_qos_profile_.deadline);}
261261

262262
Duration
263-
QoS::get_lifespan() const {return Duration::from_rmw_time(rmw_qos_profile_.lifespan);}
263+
QoS::lifespan() const {return Duration::from_rmw_time(rmw_qos_profile_.lifespan);}
264264

265265
LivelinessPolicy
266-
QoS::get_liveliness() const
266+
QoS::liveliness() const
267267
{
268268
return static_cast<LivelinessPolicy>(rmw_qos_profile_.liveliness);
269269
}
270270

271271
Duration
272-
QoS::get_liveliness_lease_duration() const
272+
QoS::liveliness_lease_duration() const
273273
{
274274
return Duration::from_rmw_time(rmw_qos_profile_.liveliness_lease_duration);
275275
}
276276

277277
bool
278-
QoS::get_avoid_ros_namespace_conventions() const
278+
QoS::avoid_ros_namespace_conventions() const
279279
{
280280
return rmw_qos_profile_.avoid_ros_namespace_conventions;
281281
}

rclcpp/test/rclcpp/test_qos.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -82,61 +82,61 @@ TEST(TestQoS, setters_and_getters) {
8282
rclcpp::QoS qos(10);
8383

8484
qos.keep_all();
85-
EXPECT_EQ(rclcpp::HistoryPolicy::KeepAll, qos.get_history());
85+
EXPECT_EQ(rclcpp::HistoryPolicy::KeepAll, qos.history());
8686

8787
qos.keep_last(20);
88-
EXPECT_EQ(rclcpp::HistoryPolicy::KeepLast, qos.get_history());
89-
EXPECT_EQ(20u, qos.get_depth());
88+
EXPECT_EQ(rclcpp::HistoryPolicy::KeepLast, qos.history());
89+
EXPECT_EQ(20u, qos.depth());
9090

9191
qos.reliable();
92-
EXPECT_EQ(rclcpp::ReliabilityPolicy::Reliable, qos.get_reliability());
92+
EXPECT_EQ(rclcpp::ReliabilityPolicy::Reliable, qos.reliability());
9393

9494
qos.durability_volatile();
95-
EXPECT_EQ(rclcpp::DurabilityPolicy::Volatile, qos.get_durability());
95+
EXPECT_EQ(rclcpp::DurabilityPolicy::Volatile, qos.durability());
9696

9797
qos.transient_local();
98-
EXPECT_EQ(rclcpp::DurabilityPolicy::TransientLocal, qos.get_durability());
98+
EXPECT_EQ(rclcpp::DurabilityPolicy::TransientLocal, qos.durability());
9999

100100
qos.history(RMW_QOS_POLICY_HISTORY_KEEP_ALL);
101-
EXPECT_EQ(rclcpp::HistoryPolicy::KeepAll, qos.get_history());
101+
EXPECT_EQ(rclcpp::HistoryPolicy::KeepAll, qos.history());
102102

103103
qos.history(rclcpp::HistoryPolicy::KeepLast);
104-
EXPECT_EQ(rclcpp::HistoryPolicy::KeepLast, qos.get_history());
104+
EXPECT_EQ(rclcpp::HistoryPolicy::KeepLast, qos.history());
105105

106106
constexpr rcl_duration_value_t duration_ns = 12345;
107107
constexpr std::chrono::nanoseconds duration(duration_ns);
108108
qos.deadline(duration);
109-
EXPECT_EQ(duration_ns, qos.get_deadline().nanoseconds());
109+
EXPECT_EQ(duration_ns, qos.deadline().nanoseconds());
110110

111111
const rmw_time_t rmw_time {0, 54321};
112112
qos.deadline(rmw_time);
113113
EXPECT_EQ(rmw_time.sec, qos.get_rmw_qos_profile().deadline.sec);
114114
EXPECT_EQ(rmw_time.nsec, qos.get_rmw_qos_profile().deadline.nsec);
115115

116116
qos.lifespan(duration);
117-
EXPECT_EQ(duration_ns, qos.get_lifespan().nanoseconds());
117+
EXPECT_EQ(duration_ns, qos.lifespan().nanoseconds());
118118

119119
qos.lifespan(rmw_time);
120120
EXPECT_EQ(rmw_time.sec, qos.get_rmw_qos_profile().lifespan.sec);
121121
EXPECT_EQ(rmw_time.nsec, qos.get_rmw_qos_profile().lifespan.nsec);
122122

123123
qos.liveliness(RMW_QOS_POLICY_LIVELINESS_MANUAL_BY_TOPIC);
124-
EXPECT_EQ(rclcpp::LivelinessPolicy::ManualByTopic, qos.get_liveliness());
124+
EXPECT_EQ(rclcpp::LivelinessPolicy::ManualByTopic, qos.liveliness());
125125

126126
qos.liveliness(rclcpp::LivelinessPolicy::Automatic);
127-
EXPECT_EQ(rclcpp::LivelinessPolicy::Automatic, qos.get_liveliness());
127+
EXPECT_EQ(rclcpp::LivelinessPolicy::Automatic, qos.liveliness());
128128

129129
qos.liveliness_lease_duration(duration);
130-
EXPECT_EQ(duration_ns, qos.get_liveliness_lease_duration().nanoseconds());
130+
EXPECT_EQ(duration_ns, qos.liveliness_lease_duration().nanoseconds());
131131

132132
qos.liveliness_lease_duration(rmw_time);
133133
EXPECT_EQ(rmw_time.sec, qos.get_rmw_qos_profile().liveliness_lease_duration.sec);
134134
EXPECT_EQ(rmw_time.nsec, qos.get_rmw_qos_profile().liveliness_lease_duration.nsec);
135135

136136
qos.avoid_ros_namespace_conventions(true);
137-
EXPECT_TRUE(qos.get_avoid_ros_namespace_conventions());
137+
EXPECT_TRUE(qos.avoid_ros_namespace_conventions());
138138
qos.avoid_ros_namespace_conventions(false);
139-
EXPECT_FALSE(qos.get_avoid_ros_namespace_conventions());
139+
EXPECT_FALSE(qos.avoid_ros_namespace_conventions());
140140
}
141141

142142
bool operator==(const rmw_qos_profile_t & lhs, const rmw_qos_profile_t & rhs)

0 commit comments

Comments
 (0)