From f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Fri, 15 Jun 2018 12:46:15 +0200 Subject: =?UTF-8?q?Run=20clang-tidy=E2=80=99s=20modernize-use-nullptr=20pa?= =?UTF-8?q?ss.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This replaces all NULL or 0 with nullptr when assigned to or returned as a pointer. --- src/layer-fns.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/layer-fns.cpp') diff --git a/src/layer-fns.cpp b/src/layer-fns.cpp index 0bc721c37..f7a5fb146 100644 --- a/src/layer-fns.cpp +++ b/src/layer-fns.cpp @@ -112,7 +112,7 @@ static SPObject *last_elder_layer(SPObject *root, SPObject *layer) { SPObject *next_layer(SPObject *root, SPObject *layer) { using std::find_if; - g_return_val_if_fail(layer != NULL, NULL); + g_return_val_if_fail(layer != nullptr, NULL); SPObject *result = nullptr; SPObject *sibling = next_sibling_layer(layer); @@ -134,7 +134,7 @@ SPObject *next_layer(SPObject *root, SPObject *layer) { SPObject *previous_layer(SPObject *root, SPObject *layer) { using Inkscape::Algorithms::find_last_if; - g_return_val_if_fail(layer != NULL, NULL); + g_return_val_if_fail(layer != nullptr, NULL); SPObject *result = nullptr; SPObject *child = last_child_layer(layer); @@ -164,7 +164,7 @@ SPObject *create_layer(SPObject *root, SPObject *layer, LayerRelativePosition po SPDocument *document = root->document; static int layer_suffix=1; - gchar *id=NULL; + gchar *id=nullptr; do { g_free(id); id = g_strdup_printf("layer%d", layer_suffix++); @@ -179,7 +179,7 @@ SPObject *create_layer(SPObject *root, SPObject *layer, LayerRelativePosition po if ( LPOS_CHILD == position ) { root = layer; SPObject *child_layer = Inkscape::last_child_layer(layer); - if ( NULL != child_layer ) { + if ( nullptr != child_layer ) { layer = child_layer; } } -- cgit v1.2.3