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/object/object-set.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/object/object-set.cpp') diff --git a/src/object/object-set.cpp b/src/object/object-set.cpp index 36ddac350..de45450a1 100644 --- a/src/object/object-set.cpp +++ b/src/object/object-set.cpp @@ -21,7 +21,7 @@ namespace Inkscape { bool ObjectSet::add(SPObject* object, bool nosignal) { - g_return_val_if_fail(object != NULL, false); + g_return_val_if_fail(object != nullptr, false); g_return_val_if_fail(SP_IS_OBJECT(object), false); // any ancestor is in the set - do nothing @@ -43,7 +43,7 @@ bool ObjectSet::add(SPObject* object, bool nosignal) { } bool ObjectSet::remove(SPObject* object) { - g_return_val_if_fail(object != NULL, false); + g_return_val_if_fail(object != nullptr, false); g_return_val_if_fail(SP_IS_OBJECT(object), false); // object is the top of subtree @@ -65,7 +65,7 @@ bool ObjectSet::remove(SPObject* object) { } bool ObjectSet::includes(SPObject *object) { - g_return_val_if_fail(object != NULL, false); + g_return_val_if_fail(object != nullptr, false); g_return_val_if_fail(SP_IS_OBJECT(object), false); return _container.get().find(object) != _container.get().end(); @@ -206,7 +206,7 @@ SPItem *ObjectSet::largestItem(CompareSize compare) { SPItem *ObjectSet::_sizeistItem(bool sml, CompareSize compare) { auto items = this->items(); gdouble max = sml ? 1e18 : 0; - SPItem *ist = NULL; + SPItem *ist = nullptr; for (auto i = items.begin(); i != items.end(); ++i) { Geom::OptRect obox = SP_ITEM(*i)->documentPreferredBounds(); -- cgit v1.2.3