summaryrefslogtreecommitdiffstats
path: root/src/graphlayout.cpp
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2014-03-27 01:33:44 +0000
committerMartin Owens <doctormo@gmail.com>2014-03-27 01:33:44 +0000
commit5a4fb2325f60d292b47330f540b26a3279341c90 (patch)
treed2aa7967be25450b83e625025366c618101ae49f /src/graphlayout.cpp
parentThe Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff)
parentRemove Snap menu item and improve grid menu item text (diff)
downloadinkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz
inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/graphlayout.cpp')
-rw-r--r--src/graphlayout.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp
index b0e00211a..7e10ccca1 100644
--- a/src/graphlayout.cpp
+++ b/src/graphlayout.cpp
@@ -106,7 +106,7 @@ void graphlayout(GSList const *const items) {
return;
}
- using Inkscape::Util::GSListConstIterator;
+ using Inkscape::Util::GSListIterator;
list<SPItem *> selected;
filterConnectors(items,selected);
if (selected.empty()) return;
@@ -167,7 +167,7 @@ void graphlayout(GSList const *const items) {
GSList *nlist=iu->avoidRef->getAttachedConnectors(Avoid::runningFrom);
list<SPItem *> connectors;
- connectors.insert<GSListConstIterator<SPItem *> >(connectors.end(),nlist,NULL);
+ connectors.insert<GSListIterator<SPItem *> >(connectors.end(),nlist,NULL);
for (list<SPItem *>::iterator j(connectors.begin());
j != connectors.end();
++j) {