summaryrefslogtreecommitdiffstats
path: root/src/live_effects/parameter/originalitemarray.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/live_effects/parameter/originalitemarray.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/live_effects/parameter/originalitemarray.cpp')
-rw-r--r--src/live_effects/parameter/originalitemarray.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/live_effects/parameter/originalitemarray.cpp b/src/live_effects/parameter/originalitemarray.cpp
index 5a0d67d26..3116b1f9c 100644
--- a/src/live_effects/parameter/originalitemarray.cpp
+++ b/src/live_effects/parameter/originalitemarray.cpp
@@ -323,7 +323,7 @@ void OriginalItemArrayParam::unlink(ItemAndActive* to)
to->ref.detach();
if (to->href) {
g_free(to->href);
- to->href = NULL;
+ to->href = nullptr;
}
}
@@ -398,12 +398,12 @@ bool OriginalItemArrayParam::param_readSVGValue(const gchar* strvalue)
_store->clear();
gchar ** strarray = g_strsplit(strvalue, "|", 0);
- for (gchar ** iter = strarray; *iter != NULL; iter++) {
+ for (gchar ** iter = strarray; *iter != nullptr; iter++) {
if ((*iter)[0] == '#') {
gchar ** substrarray = g_strsplit(*iter, ",", 0);
ItemAndActive* w = new ItemAndActive((SPObject *)param_effect->getLPEObj());
w->href = g_strdup(*substrarray);
- w->actived = *(substrarray+1) != NULL && (*(substrarray+1))[0] == '1';
+ w->actived = *(substrarray+1) != nullptr && (*(substrarray+1))[0] == '1';
w->linked_changed_connection = w->ref.changedSignal().connect(sigc::bind<ItemAndActive *>(sigc::mem_fun(*this, &OriginalItemArrayParam::linked_changed), w));
w->ref.attach(URI(w->href));