summaryrefslogtreecommitdiffstats
path: root/src/ui/tools/star-tool.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-15 10:46:15 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-18 12:27:01 +0000
commitf4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 (patch)
tree7c6044fd3a17a2665841959dac9b3b2110b27924 /src/ui/tools/star-tool.cpp
parentRun clang-tidy’s modernize-use-override pass. (diff)
downloadinkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.tar.gz
inkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.zip
Run clang-tidy’s modernize-use-nullptr pass.
This replaces all NULL or 0 with nullptr when assigned to or returned as a pointer.
Diffstat (limited to 'src/ui/tools/star-tool.cpp')
-rw-r--r--src/ui/tools/star-tool.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index 3a5615c3b..5c0111012 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -61,7 +61,7 @@ const std::string StarTool::prefsPath = "/tools/shapes/star";
StarTool::StarTool()
: ToolBase(cursor_star_xpm)
- , star(NULL)
+ , star(nullptr)
, magnitude(5)
, proportion(0.5)
, isflatsided(false)
@@ -85,7 +85,7 @@ StarTool::~StarTool() {
this->sel_changed_connection.disconnect();
delete this->shape_editor;
- this->shape_editor = NULL;
+ this->shape_editor = nullptr;
/* fixme: This is necessary because we do not grab */
if (this->star) {
@@ -100,7 +100,7 @@ StarTool::~StarTool() {
* @param selection Should not be NULL.
*/
void StarTool::selection_changed(Inkscape::Selection* selection) {
- g_assert (selection != NULL);
+ g_assert (selection != nullptr);
this->shape_editor->unset_item();
this->shape_editor->set_item(selection->singleItem());
@@ -183,7 +183,7 @@ bool StarTool::root_handler(GdkEvent* event) {
GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK |
GDK_BUTTON_PRESS_MASK,
- NULL, event->button.time);
+ nullptr, event->button.time);
ret = TRUE;
}
break;
@@ -242,7 +242,7 @@ bool StarTool::root_handler(GdkEvent* event) {
selection->clear();
}
- this->item_to_select = NULL;
+ this->item_to_select = nullptr;
ret = TRUE;
sp_canvas_item_ungrab(SP_CANVAS_ITEM (desktop->acetate), event->button.time);
}
@@ -259,8 +259,8 @@ bool StarTool::root_handler(GdkEvent* event) {
case GDK_KEY_Meta_R:
sp_event_show_modifier_tip(this->defaultMessageContext(), event,
_("<b>Ctrl</b>: snap angle; keep rays radial"),
- NULL,
- NULL);
+ nullptr,
+ nullptr);
break;
case GDK_KEY_x:
@@ -403,7 +403,7 @@ void StarTool::drag(Geom::Point p, guint state)
void StarTool::finishItem() {
this->message_context->clear();
- if (this->star != NULL) {
+ if (this->star != nullptr) {
if (this->star->r[1] == 0) {
// Don't allow the creating of zero sized arc, for example
// when the start and and point snap to the snap grid point
@@ -416,14 +416,14 @@ void StarTool::finishItem() {
this->star->setCenter(this->center);
this->star->set_shape();
this->star->updateRepr(SP_OBJECT_WRITE_EXT);
- this->star->doWriteTransform(this->star->transform, NULL, true);
+ this->star->doWriteTransform(this->star->transform, nullptr, true);
desktop->canvas->endForcedFullRedraws();
desktop->getSelection()->set(this->star);
DocumentUndo::done(desktop->getDocument(), SP_VERB_CONTEXT_STAR,
_("Create star"));
- this->star = NULL;
+ this->star = nullptr;
}
}
@@ -431,15 +431,15 @@ void StarTool::cancel() {
desktop->getSelection()->clear();
sp_canvas_item_ungrab(SP_CANVAS_ITEM(desktop->acetate), 0);
- if (this->star != NULL) {
+ if (this->star != nullptr) {
this->star->deleteObject();
- this->star = NULL;
+ this->star = nullptr;
}
this->within_tolerance = false;
this->xp = 0;
this->yp = 0;
- this->item_to_select = NULL;
+ this->item_to_select = nullptr;
desktop->canvas->endForcedFullRedraws();