summaryrefslogtreecommitdiffstats
path: root/src/layer-fns.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/layer-fns.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/layer-fns.cpp')
-rw-r--r--src/layer-fns.cpp8
1 files changed, 4 insertions, 4 deletions
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;
}
}