summaryrefslogtreecommitdiffstats
path: root/src/ui/tools/dropper-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/dropper-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/dropper-tool.cpp')
-rw-r--r--src/ui/tools/dropper-tool.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index 07fc4b719..0c81e179c 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -72,8 +72,8 @@ DropperTool::DropperTool()
, stroke(false)
, dropping(false)
, dragging(false)
- , grabbed(NULL)
- , area(NULL)
+ , grabbed(nullptr)
+ , area(nullptr)
, centre(0, 0)
{
}
@@ -113,12 +113,12 @@ void DropperTool::finish() {
if (this->grabbed) {
sp_canvas_item_ungrab(this->grabbed, GDK_CURRENT_TIME);
- this->grabbed = NULL;
+ this->grabbed = nullptr;
}
if (this->area) {
sp_canvas_item_destroy(this->area);
- this->area = NULL;
+ this->area = nullptr;
}
ToolBase::finish();
@@ -211,7 +211,7 @@ bool DropperTool::root_handler(GdkEvent* event) {
sp_canvas_item_grab(SP_CANVAS_ITEM(desktop->acetate),
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK,
- NULL, event->button.time);
+ nullptr, event->button.time);
this->grabbed = SP_CANVAS_ITEM(desktop->acetate);
break;
@@ -299,7 +299,7 @@ bool DropperTool::root_handler(GdkEvent* event) {
if (this->grabbed) {
sp_canvas_item_ungrab(this->grabbed, event->button.time);
- this->grabbed = NULL;
+ this->grabbed = nullptr;
}
Inkscape::Selection *selection = desktop->getSelection();