clang-tidy: modernize-use-nullptr

This commit is contained in:
v4hn 2020-06-10 00:36:47 +02:00
parent 48f4c025ba
commit 5da2df4c61
7 changed files with 10 additions and 9 deletions

View File

@ -1,5 +1,6 @@
--- ---
Checks: '-*, Checks: '-*,
modernize-use-nullptr,
modernize-use-override, modernize-use-override,
modernize-use-using, modernize-use-using,
modernize-loop-convert, modernize-loop-convert,

View File

@ -206,14 +206,14 @@ public:
inline void setStartState(const InterfaceState& state) { inline void setStartState(const InterfaceState& state) {
// only allow setting once (by Stage) // only allow setting once (by Stage)
assert(start_ == NULL || start_ == &state); assert(start_ == nullptr || start_ == &state);
start_ = &state; start_ = &state;
const_cast<InterfaceState&>(state).addOutgoing(this); const_cast<InterfaceState&>(state).addOutgoing(this);
} }
inline void setEndState(const InterfaceState& state) { inline void setEndState(const InterfaceState& state) {
// only allow setting once (by Stage) // only allow setting once (by Stage)
assert(end_ == NULL || end_ == &state); assert(end_ == nullptr || end_ == &state);
end_ = &state; end_ = &state;
const_cast<InterfaceState&>(state).addIncoming(this); const_cast<InterfaceState&>(state).addIncoming(this);
} }

View File

@ -55,7 +55,7 @@ class JobQueue : public QObject
boost::condition_variable idle_condition_; boost::condition_variable idle_condition_;
public: public:
explicit JobQueue(QObject* parent = 0); explicit JobQueue(QObject* parent = nullptr);
void addJob(const std::function<void()>& job); void addJob(const std::function<void()>& job);
void clear(); void clear();
size_t numPending(); size_t numPending();

View File

@ -163,11 +163,11 @@ public:
* *
* If makeRaw() returns NULL and error_return is not NULL, *error_return will be set. * If makeRaw() returns NULL and error_return is not NULL, *error_return will be set.
* On success, *error_return will not be changed. */ * On success, *error_return will not be changed. */
virtual Type* makeRaw(const QString& class_id, QString* error_return = NULL) { virtual Type* makeRaw(const QString& class_id, QString* error_return = nullptr) {
typename QHash<QString, BuiltInClassRecord>::const_iterator iter = built_ins_.find(class_id); typename QHash<QString, BuiltInClassRecord>::const_iterator iter = built_ins_.find(class_id);
if (iter != built_ins_.end()) { if (iter != built_ins_.end()) {
Type* instance = iter->factory_function_(); Type* instance = iter->factory_function_();
if (instance == NULL && error_return != NULL) { if (instance == nullptr && error_return != nullptr) {
*error_return = "Factory function for built-in class '" + class_id + "' returned NULL."; *error_return = "Factory function for built-in class '" + class_id + "' returned NULL.";
} }
return instance; return instance;
@ -180,7 +180,7 @@ public:
if (error_return) { if (error_return) {
*error_return = QString::fromStdString(ex.what()); *error_return = QString::fromStdString(ex.what());
} }
return NULL; return nullptr;
} }
} }

View File

@ -79,7 +79,7 @@ class TaskPanel : public rviz::Panel
TaskPanelPrivate* d_ptr; TaskPanelPrivate* d_ptr;
public: public:
TaskPanel(QWidget* parent = 0); TaskPanel(QWidget* parent = nullptr);
~TaskPanel() override; ~TaskPanel() override;
/// add a new sub panel widget /// add a new sub panel widget

View File

@ -52,7 +52,7 @@ class TaskSolutionPanel : public rviz::Panel
Q_OBJECT Q_OBJECT
public: public:
TaskSolutionPanel(QWidget* parent = 0); TaskSolutionPanel(QWidget* parent = nullptr);
~TaskSolutionPanel() override; ~TaskSolutionPanel() override;

View File

@ -267,7 +267,7 @@ void TaskSolutionVisualization::changedTrail() {
for (std::size_t i = 0; i < trail_.size(); i++) { for (std::size_t i = 0; i < trail_.size(); i++) {
int waypoint_i = std::min(i * stepsize, t->getWayPointCount() - 1); // limit to last trajectory point int waypoint_i = std::min(i * stepsize, t->getWayPointCount() - 1); // limit to last trajectory point
rviz::Robot* r = rviz::Robot* r =
new rviz::Robot(trail_scene_node_, context_, "Trail Robot " + boost::lexical_cast<std::string>(i), NULL); new rviz::Robot(trail_scene_node_, context_, "Trail Robot " + boost::lexical_cast<std::string>(i), nullptr);
r->load(*scene_->getRobotModel()->getURDF()); r->load(*scene_->getRobotModel()->getURDF());
r->setVisualVisible(robot_visual_enabled_property_->getBool()); r->setVisualVisible(robot_visual_enabled_property_->getBool());
r->setCollisionVisible(robot_collision_enabled_property_->getBool()); r->setCollisionVisible(robot_collision_enabled_property_->getBool());