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-manager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/layer-manager.cpp') diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp index 010411fc4..72ca54ae6 100644 --- a/src/layer-manager.cpp +++ b/src/layer-manager.cpp @@ -123,7 +123,7 @@ public: */ LayerManager::LayerManager(SPDesktop *desktop) -: _desktop(desktop), _document(NULL) +: _desktop(desktop), _document(nullptr) { _layer_connection = desktop->connectCurrentLayerChanged( sigc::mem_fun(*this, &LayerManager::_selectedLayerChanged) ); @@ -143,7 +143,7 @@ LayerManager::~LayerManager() _layer_connection.disconnect(); _document_connection.disconnect(); _resource_connection.disconnect(); - _document = NULL; + _document = nullptr; } void LayerManager::setCurrentLayer( SPObject* obj ) @@ -179,7 +179,7 @@ Glib::ustring LayerManager::getNextLayerName( SPObject* obj, gchar const *label) gchar* numpart = g_strdup(base.substr(pos+1).c_str()); if ( numpart ) { - gchar* endPtr = NULL; + gchar* endPtr = nullptr; guint64 val = g_ascii_strtoull( numpart, &endPtr, 10); if ( ((val > 0) || (endPtr != numpart)) && (val < 65536) ) { base.erase( pos+1); @@ -322,7 +322,7 @@ void LayerManager::_rebuild() { while ( higher && (higher->parent != root) ) { higher = higher->parent; } - Node const* node = higher ? higher->getRepr() : NULL; + Node const* node = higher ? higher->getRepr() : nullptr; if ( node && node->parent() ) { // Debug::EventTracker tracker(*layer); -- cgit v1.2.3