summaryrefslogtreecommitdiffstats
path: root/src/display/canvas-arena.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/display/canvas-arena.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/display/canvas-arena.cpp')
-rw-r--r--src/display/canvas-arena.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp
index 8271a6ad9..72415d82d 100644
--- a/src/display/canvas-arena.cpp
+++ b/src/display/canvas-arena.cpp
@@ -78,7 +78,7 @@ sp_canvas_arena_class_init (SPCanvasArenaClass *klass)
G_TYPE_FROM_CLASS(item_class),
G_SIGNAL_RUN_LAST,
((glong)((guint8*)&(klass->arena_event) - (guint8*)klass)),
- NULL, NULL,
+ nullptr, nullptr,
sp_marshal_INT__POINTER_POINTER,
G_TYPE_INT, 2, G_TYPE_POINTER, G_TYPE_POINTER);
@@ -116,7 +116,7 @@ sp_canvas_arena_init (SPCanvasArena *arena)
sigc::ptr_fun(&sp_canvas_arena_item_deleted),
arena));
- arena->active = NULL;
+ arena->active = nullptr;
}
static void sp_canvas_arena_destroy(SPCanvasItem *object)
@@ -180,7 +180,7 @@ static void
sp_canvas_arena_item_deleted(SPCanvasArena *arena, Inkscape::DrawingItem *item)
{
if (arena->active == item) {
- arena->active = NULL;
+ arena->active = nullptr;
}
}
@@ -260,7 +260,7 @@ sp_canvas_arena_event (SPCanvasItem *item, GdkEvent *event)
case GDK_LEAVE_NOTIFY:
if (arena->cursor) {
ret = sp_canvas_arena_send_event (arena, event);
- arena->active = NULL;
+ arena->active = nullptr;
arena->cursor = FALSE;
}
break;
@@ -342,7 +342,7 @@ static void sp_canvas_arena_request_render(SPCanvasArena *ca, Geom::IntRect cons
void
sp_canvas_arena_set_pick_delta (SPCanvasArena *ca, gdouble delta)
{
- g_return_if_fail (ca != NULL);
+ g_return_if_fail (ca != nullptr);
g_return_if_fail (SP_IS_CANVAS_ARENA (ca));
/* fixme: repick? */
@@ -352,7 +352,7 @@ sp_canvas_arena_set_pick_delta (SPCanvasArena *ca, gdouble delta)
void
sp_canvas_arena_set_sticky (SPCanvasArena *ca, gboolean sticky)
{
- g_return_if_fail (ca != NULL);
+ g_return_if_fail (ca != nullptr);
g_return_if_fail (SP_IS_CANVAS_ARENA (ca));
/* fixme: repick? */
@@ -362,7 +362,7 @@ sp_canvas_arena_set_sticky (SPCanvasArena *ca, gboolean sticky)
void
sp_canvas_arena_render_surface (SPCanvasArena *ca, cairo_surface_t *surface, Geom::IntRect const &r)
{
- g_return_if_fail (ca != NULL);
+ g_return_if_fail (ca != nullptr);
g_return_if_fail (SP_IS_CANVAS_ARENA (ca));
Inkscape::DrawingContext dc(surface, r.min());