summaryrefslogtreecommitdiffstats
path: root/src/satisfied-guide-cns.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/satisfied-guide-cns.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/satisfied-guide-cns.cpp')
-rw-r--r--src/satisfied-guide-cns.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/satisfied-guide-cns.cpp b/src/satisfied-guide-cns.cpp
index 028a22405..a83417865 100644
--- a/src/satisfied-guide-cns.cpp
+++ b/src/satisfied-guide-cns.cpp
@@ -10,8 +10,8 @@ void satisfied_guide_cns(SPDesktop const &desktop,
std::vector<SPGuideConstraint> &cns)
{
SPNamedView const &nv = *desktop.getNamedView();
- for (GSList const *l = nv.guides; l != NULL; l = l->next) {
- SPGuide &g = *SP_GUIDE(l->data);
+ for(std::vector<SPGuide *>::const_iterator it = nv.guides.begin(); it != nv.guides.end(); ++it) {
+ SPGuide &g = *(*it);
for (unsigned int i = 0; i < snappoints.size(); ++i) {
if (Geom::are_near(g.getDistanceFrom(snappoints[i].getPoint()), 0, 1e-2)) {
cns.push_back(SPGuideConstraint(&g, i));