diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2015-12-08 21:36:21 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2015-12-08 21:36:21 +0000 |
| commit | 402e0259b8310d25a1f51cc6a4c69f496f73591e (patch) | |
| tree | 9e0947e17ed84f037e20fe3ce733ee09d579e6b7 /src/graphlayout.cpp | |
| parent | 0-sized arrays are supposed to be forbidden (diff) | |
| download | inkscape-402e0259b8310d25a1f51cc6a4c69f496f73591e.tar.gz inkscape-402e0259b8310d25a1f51cc6a4c69f496f73591e.zip | |
cppification: GSList replaced by vectors (connectors)
(bzr r14504.1.13)
Diffstat (limited to 'src/graphlayout.cpp')
| -rw-r--r-- | src/graphlayout.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp index 9b67ba0b5..39ffb6cc7 100644 --- a/src/graphlayout.cpp +++ b/src/graphlayout.cpp @@ -106,7 +106,6 @@ void graphlayout(std::vector<SPItem*> const &items) { return; } - using Inkscape::Util::GSListIterator; list<SPItem *> selected; filterConnectors(items,selected); if (selected.empty()) return; @@ -164,10 +163,11 @@ void graphlayout(std::vector<SPItem*> const &items) { continue; } unsigned u=i_iter->second; - GSList *nlist=iu->avoidRef->getAttachedConnectors(Avoid::runningFrom); + std::vector<SPItem *> nlist=iu->avoidRef->getAttachedConnectors(Avoid::runningFrom); list<SPItem *> connectors; - connectors.insert<GSListIterator<SPItem *> >(connectors.end(),nlist,NULL); + connectors.insert(connectors.end(), nlist.begin(), nlist.end()); + for (list<SPItem *>::iterator j(connectors.begin()); j != connectors.end(); ++j) { @@ -203,9 +203,6 @@ void graphlayout(std::vector<SPItem*> const &items) { } } } - if(nlist) { - g_slist_free(nlist); - } } const unsigned E = es.size(); double eweights[E]; |