From f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
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/ui/widget/style-subject.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/ui/widget/style-subject.cpp')

diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp
index e23627080..5eccc67cf 100644
--- a/src/ui/widget/style-subject.cpp
+++ b/src/ui/widget/style-subject.cpp
@@ -17,11 +17,11 @@ namespace Inkscape {
 namespace UI {
 namespace Widget {
 
-StyleSubject::StyleSubject() : _desktop(NULL) {
+StyleSubject::StyleSubject() : _desktop(nullptr) {
 }
 
 StyleSubject::~StyleSubject() {
-    setDesktop(NULL);
+    setDesktop(nullptr);
 }
 
 void StyleSubject::setDesktop(SPDesktop *desktop) {
@@ -49,7 +49,7 @@ Inkscape::Selection *StyleSubject::Selection::_getSelection() const {
     if (desktop) {
         return desktop->getSelection();
     } else {
-        return NULL;
+        return nullptr;
     }
 }
 
@@ -102,7 +102,7 @@ void StyleSubject::Selection::setCSS(SPCSSAttr *css) {
 }
 
 StyleSubject::CurrentLayer::CurrentLayer() {
-    _element = NULL;
+    _element = nullptr;
 }
 
 StyleSubject::CurrentLayer::~CurrentLayer() {
@@ -112,12 +112,12 @@ void StyleSubject::CurrentLayer::_setLayer(SPObject *layer) {
     _layer_release.disconnect();
     _layer_modified.disconnect();
     if (_element) {
-        sp_object_unref(_element, NULL);
+        sp_object_unref(_element, nullptr);
     }
     _element = layer;
     if (layer) {
-        sp_object_ref(layer, NULL);
-        _layer_release = layer->connectRelease(sigc::hide(sigc::bind(sigc::mem_fun(*this, &CurrentLayer::_setLayer), (SPObject *)NULL)));
+        sp_object_ref(layer, nullptr);
+        _layer_release = layer->connectRelease(sigc::hide(sigc::bind(sigc::mem_fun(*this, &CurrentLayer::_setLayer), (SPObject *)nullptr)));
         _layer_modified = layer->connectModified(sigc::hide(sigc::hide(sigc::mem_fun(*this, &CurrentLayer::_emitChanged))));
     }
     _emitChanged();
@@ -171,7 +171,7 @@ void StyleSubject::CurrentLayer::_afterDesktopSwitch(SPDesktop *desktop) {
         _layer_switched = desktop->connectCurrentLayerChanged(sigc::mem_fun(*this, &CurrentLayer::_setLayer));
         _setLayer(desktop->currentLayer());
     } else {
-        _setLayer(NULL);
+        _setLayer(nullptr);
     }
 }
 
-- 
cgit v1.2.3