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-model.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/layer-model.cpp') diff --git a/src/layer-model.cpp b/src/layer-model.cpp index 62f47966f..c86f57483 100644 --- a/src/layer-model.cpp +++ b/src/layer-model.cpp @@ -44,8 +44,8 @@ static void _layer_changed(SPObject *top, SPObject *bottom, Inkscape::LayerModel namespace Inkscape { LayerModel::LayerModel() - : _doc( 0 ) - , _layer_hierarchy( 0 ) + : _doc( nullptr ) + , _layer_hierarchy( nullptr ) , _display_key( 0 ) { } @@ -65,7 +65,7 @@ void LayerModel::setDocument(SPDocument *doc) _layer_hierarchy->clear(); delete _layer_hierarchy; } - _layer_hierarchy = new Inkscape::ObjectHierarchy(NULL); + _layer_hierarchy = new Inkscape::ObjectHierarchy(nullptr); _layer_hierarchy->connectAdded(sigc::bind(sigc::ptr_fun(_layer_activated), this)); _layer_hierarchy->connectRemoved(sigc::bind(sigc::ptr_fun(_layer_deactivated), this)); _layer_hierarchy->connectChanged(sigc::bind(sigc::ptr_fun(_layer_changed), this)); @@ -87,7 +87,7 @@ SPDocument *LayerModel::getDocument() */ SPObject *LayerModel::currentRoot() const { - return _layer_hierarchy ? _layer_hierarchy->top() : NULL; + return _layer_hierarchy ? _layer_hierarchy->top() : nullptr; } /** @@ -95,7 +95,7 @@ SPObject *LayerModel::currentRoot() const */ SPObject *LayerModel::currentLayer() const { - return _layer_hierarchy ? _layer_hierarchy->bottom() : NULL; + return _layer_hierarchy ? _layer_hierarchy->bottom() : nullptr; } /** @@ -199,14 +199,14 @@ void LayerModel::toggleLayerSolo(SPObject *object) { * Return layer that contains \a object. */ SPObject *LayerModel::layerForObject(SPObject *object) { - g_return_val_if_fail(object != NULL, NULL); + g_return_val_if_fail(object != nullptr, NULL); SPObject *root=currentRoot(); object = object->parent; while ( object && object != root && !isLayer(object) ) { // Objects in defs have no layer and are NOT in the root layer if(SP_IS_DEFS(object)) - return NULL; + return nullptr; object = object->parent; } return object; -- cgit v1.2.3