From d1947e768272c703674129d5c583204ff2b59251 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Wed, 13 Jul 2016 13:36:19 +0200 Subject: Second part of new SPObject children list (bzr r14954.1.19) --- src/object-snapper.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/object-snapper.cpp') diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index 3e559ee7a..580fb5fc7 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -90,9 +90,9 @@ void Inkscape::ObjectSnapper::_findCandidates(SPObject* parent, Geom::Rect bbox_to_snap_incl = bbox_to_snap; // _incl means: will include the snapper tolerance bbox_to_snap_incl.expandBy(getSnapperTolerance()); // see? - for ( SPObject *o = parent->firstChild(); o; o = o->getNext() ) { + for (auto& o: parent->_children) { g_assert(dt != NULL); - SPItem *item = dynamic_cast(o); + SPItem *item = dynamic_cast(&o); if (item && !(dt->itemIsHidden(item) && !clip_or_mask)) { // Snapping to items in a locked layer is allowed // Don't snap to hidden objects, unless they're a clipped path or a mask @@ -100,7 +100,7 @@ void Inkscape::ObjectSnapper::_findCandidates(SPObject* parent, std::vector::const_iterator i; if (it != NULL) { i = it->begin(); - while (i != it->end() && *i != o) { + while (i != it->end() && *i != &o) { ++i; } } @@ -122,7 +122,7 @@ void Inkscape::ObjectSnapper::_findCandidates(SPObject* parent, } if (dynamic_cast(item)) { - _findCandidates(o, it, false, bbox_to_snap, clip_or_mask, additional_affine); + _findCandidates(&o, it, false, bbox_to_snap, clip_or_mask, additional_affine); } else { Geom::OptRect bbox_of_item; Preferences *prefs = Preferences::get(); -- cgit v1.2.3 From 24d3f50003ca3cec6a03a7f5267cc4fe5588c69f Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 14 Jul 2016 13:17:21 +0200 Subject: Renamed children list in SPObject (bzr r14954.1.21) --- src/object-snapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/object-snapper.cpp') diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index 580fb5fc7..307dcf062 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -90,7 +90,7 @@ void Inkscape::ObjectSnapper::_findCandidates(SPObject* parent, Geom::Rect bbox_to_snap_incl = bbox_to_snap; // _incl means: will include the snapper tolerance bbox_to_snap_incl.expandBy(getSnapperTolerance()); // see? - for (auto& o: parent->_children) { + for (auto& o: parent->children) { g_assert(dt != NULL); SPItem *item = dynamic_cast(&o); if (item && !(dt->itemIsHidden(item) && !clip_or_mask)) { -- cgit v1.2.3 From f35bb1f74a0ffeb5c6477a25e3c4cde87a97bcf1 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 12:06:06 +0200 Subject: Removed unused includes, decrease compilation time (bzr r15025) --- src/object-snapper.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/object-snapper.cpp') diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index 3e559ee7a..af33415a1 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -14,9 +14,6 @@ #include "svg/svg.h" #include <2geom/path-intersection.h> -#include <2geom/pathvector.h> -#include <2geom/point.h> -#include <2geom/rect.h> #include <2geom/line.h> #include <2geom/circle.h> #include <2geom/path-sink.h> @@ -24,9 +21,7 @@ #include "sp-namedview.h" #include "sp-image.h" #include "sp-item-group.h" -#include "sp-item.h" #include "sp-use.h" -#include "display/curve.h" #include "inkscape.h" #include "preferences.h" #include "sp-text.h" @@ -34,7 +29,6 @@ #include "text-editing.h" #include "sp-clippath.h" #include "sp-mask.h" -#include "helper/geom-curves.h" #include "desktop.h" #include "sp-root.h" -- cgit v1.2.3 From 43b49e325db73cc19b1731db6c69545664ee8fbe Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Thu, 28 Jul 2016 13:26:17 +0200 Subject: Reverted changes to r15024 after many building problems (bzr r15027) --- src/object-snapper.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/object-snapper.cpp') diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index af33415a1..3e559ee7a 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -14,6 +14,9 @@ #include "svg/svg.h" #include <2geom/path-intersection.h> +#include <2geom/pathvector.h> +#include <2geom/point.h> +#include <2geom/rect.h> #include <2geom/line.h> #include <2geom/circle.h> #include <2geom/path-sink.h> @@ -21,7 +24,9 @@ #include "sp-namedview.h" #include "sp-image.h" #include "sp-item-group.h" +#include "sp-item.h" #include "sp-use.h" +#include "display/curve.h" #include "inkscape.h" #include "preferences.h" #include "sp-text.h" @@ -29,6 +34,7 @@ #include "text-editing.h" #include "sp-clippath.h" #include "sp-mask.h" +#include "helper/geom-curves.h" #include "desktop.h" #include "sp-root.h" -- cgit v1.2.3 From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001 From: Adrian Boguszewski Date: Wed, 3 Aug 2016 15:29:38 +0200 Subject: Removed unused includes, decreased compilation time. Once again (bzr r15034) --- src/object-snapper.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/object-snapper.cpp') diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp index 3e559ee7a..af33415a1 100644 --- a/src/object-snapper.cpp +++ b/src/object-snapper.cpp @@ -14,9 +14,6 @@ #include "svg/svg.h" #include <2geom/path-intersection.h> -#include <2geom/pathvector.h> -#include <2geom/point.h> -#include <2geom/rect.h> #include <2geom/line.h> #include <2geom/circle.h> #include <2geom/path-sink.h> @@ -24,9 +21,7 @@ #include "sp-namedview.h" #include "sp-image.h" #include "sp-item-group.h" -#include "sp-item.h" #include "sp-use.h" -#include "display/curve.h" #include "inkscape.h" #include "preferences.h" #include "sp-text.h" @@ -34,7 +29,6 @@ #include "text-editing.h" #include "sp-clippath.h" #include "sp-mask.h" -#include "helper/geom-curves.h" #include "desktop.h" #include "sp-root.h" -- cgit v1.2.3