summaryrefslogtreecommitdiffstats
path: root/src/object/object-set.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/object/object-set.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 '')
-rw-r--r--src/object/object-set.cpp8
1 files changed, 4 insertions, 4 deletions
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<hashed>().find(object) != _container.get<hashed>().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();