summaryrefslogtreecommitdiffstats
path: root/src/guide-snapper.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-03-14 16:37:50 +0000
committerJabiertxof <jtx@jtx.marker.es>2016-03-14 16:37:50 +0000
commitb8d22beef5345210ad27cdc2685083aeae6f8f3b (patch)
treed69b8bfd19d3627a8425a1b265c2abf229b05354 /src/guide-snapper.cpp
parentfixes for update to trunk (diff)
parent"Relative to" option for node alignment. (diff)
downloadinkscape-b8d22beef5345210ad27cdc2685083aeae6f8f3b.tar.gz
inkscape-b8d22beef5345210ad27cdc2685083aeae6f8f3b.zip
update to trunk
(bzr r13708.1.39)
Diffstat (limited to 'src/guide-snapper.cpp')
-rw-r--r--src/guide-snapper.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/guide-snapper.cpp b/src/guide-snapper.cpp
index 960caed67..17f2d9583 100644
--- a/src/guide-snapper.cpp
+++ b/src/guide-snapper.cpp
@@ -44,11 +44,10 @@ Inkscape::GuideSnapper::LineList Inkscape::GuideSnapper::_getSnapLines(Geom::Poi
}
SPGuide const *guide_to_ignore = _snapmanager->getGuideToIgnore();
-
- for (GSList const *l = _snapmanager->getNamedView()->guides; l != NULL; l = l->next) {
- SPGuide const *g = SP_GUIDE(l->data);
- if (g != guide_to_ignore) {
- s.push_back(std::pair<Geom::Point, Geom::Point>(g->getNormal(), g->getPoint()));
+ std::vector<SPGuide *> guides = _snapmanager->getNamedView()->guides;
+ for(std::vector<SPGuide *>::const_iterator it = guides.begin() ; it != guides.end(); ++it) {
+ if ((*it) != guide_to_ignore) {
+ s.push_back(std::pair<Geom::Point, Geom::Point>((*it)->getNormal(), (*it)->getPoint()));
}
}