Skip to content

Commit 5da2df4

Browse files
committed
clang-tidy: modernize-use-nullptr
1 parent 48f4c02 commit 5da2df4

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
Checks: '-*,
3+
modernize-use-nullptr,
34
modernize-use-override,
45
modernize-use-using,
56
modernize-loop-convert,

core/include/moveit/task_constructor/storage.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,14 @@ class SolutionBase
206206

207207
inline void setStartState(const InterfaceState& state) {
208208
// only allow setting once (by Stage)
209-
assert(start_ == NULL || start_ == &state);
209+
assert(start_ == nullptr || start_ == &state);
210210
start_ = &state;
211211
const_cast<InterfaceState&>(state).addOutgoing(this);
212212
}
213213

214214
inline void setEndState(const InterfaceState& state) {
215215
// only allow setting once (by Stage)
216-
assert(end_ == NULL || end_ == &state);
216+
assert(end_ == nullptr || end_ == &state);
217217
end_ = &state;
218218
const_cast<InterfaceState&>(state).addIncoming(this);
219219
}

visualization/motion_planning_tasks/src/job_queue.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class JobQueue : public QObject
5555
boost::condition_variable idle_condition_;
5656

5757
public:
58-
explicit JobQueue(QObject* parent = 0);
58+
explicit JobQueue(QObject* parent = nullptr);
5959
void addJob(const std::function<void()>& job);
6060
void clear();
6161
size_t numPending();

visualization/motion_planning_tasks/src/pluginlib_factory.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@ class PluginlibFactory : public rviz::Factory
163163
*
164164
* If makeRaw() returns NULL and error_return is not NULL, *error_return will be set.
165165
* On success, *error_return will not be changed. */
166-
virtual Type* makeRaw(const QString& class_id, QString* error_return = NULL) {
166+
virtual Type* makeRaw(const QString& class_id, QString* error_return = nullptr) {
167167
typename QHash<QString, BuiltInClassRecord>::const_iterator iter = built_ins_.find(class_id);
168168
if (iter != built_ins_.end()) {
169169
Type* instance = iter->factory_function_();
170-
if (instance == NULL && error_return != NULL) {
170+
if (instance == nullptr && error_return != nullptr) {
171171
*error_return = "Factory function for built-in class '" + class_id + "' returned NULL.";
172172
}
173173
return instance;
@@ -180,7 +180,7 @@ class PluginlibFactory : public rviz::Factory
180180
if (error_return) {
181181
*error_return = QString::fromStdString(ex.what());
182182
}
183-
return NULL;
183+
return nullptr;
184184
}
185185
}
186186

visualization/motion_planning_tasks/src/task_panel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class TaskPanel : public rviz::Panel
7979
TaskPanelPrivate* d_ptr;
8080

8181
public:
82-
TaskPanel(QWidget* parent = 0);
82+
TaskPanel(QWidget* parent = nullptr);
8383
~TaskPanel() override;
8484

8585
/// add a new sub panel widget

visualization/visualization_tools/include/moveit/visualization_tools/task_solution_panel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class TaskSolutionPanel : public rviz::Panel
5252
Q_OBJECT
5353

5454
public:
55-
TaskSolutionPanel(QWidget* parent = 0);
55+
TaskSolutionPanel(QWidget* parent = nullptr);
5656

5757
~TaskSolutionPanel() override;
5858

visualization/visualization_tools/src/task_solution_visualization.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ void TaskSolutionVisualization::changedTrail() {
267267
for (std::size_t i = 0; i < trail_.size(); i++) {
268268
int waypoint_i = std::min(i * stepsize, t->getWayPointCount() - 1); // limit to last trajectory point
269269
rviz::Robot* r =
270-
new rviz::Robot(trail_scene_node_, context_, "Trail Robot " + boost::lexical_cast<std::string>(i), NULL);
270+
new rviz::Robot(trail_scene_node_, context_, "Trail Robot " + boost::lexical_cast<std::string>(i), nullptr);
271271
r->load(*scene_->getRobotModel()->getURDF());
272272
r->setVisualVisible(robot_visual_enabled_property_->getBool());
273273
r->setCollisionVisible(robot_collision_enabled_property_->getBool());

0 commit comments

Comments
 (0)