diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-15 21:57:03 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-15 21:57:03 +0000 |
| commit | 6bd1c2a30b66e15fe055b22bd47dadb771f7fae2 (patch) | |
| tree | 1b991cc2736f84fb069666802d485bd29cff6394 /src/graphlayout.cpp | |
| parent | Update to limit options to radius = 0, radious > 0 or both (diff) | |
| parent | fix-bug-1557192. paint-order crash with multiple items (diff) | |
| download | inkscape-6bd1c2a30b66e15fe055b22bd47dadb771f7fae2.tar.gz inkscape-6bd1c2a30b66e15fe055b22bd47dadb771f7fae2.zip | |
Update to trunk
(bzr r13645.1.119)
Diffstat (limited to 'src/graphlayout.cpp')
| -rw-r--r-- | src/graphlayout.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp index 40994347c..3956b39fe 100644 --- a/src/graphlayout.cpp +++ b/src/graphlayout.cpp @@ -25,7 +25,6 @@ #include "desktop.h" #include "inkscape.h" #include "sp-namedview.h" -#include "util/glib-list-iterators.h" #include "graphlayout.h" #include "sp-path.h" #include "sp-item.h" @@ -89,7 +88,7 @@ struct CheckProgress : TestConvergence { * not connectors in filtered */ void filterConnectors(std::vector<SPItem*> const &items, list<SPItem *> &filtered) { - for(std::vector<SPItem*>::const_iterator i = items.begin();i !=items.end(); i++){ + for(std::vector<SPItem*>::const_iterator i = items.begin();i !=items.end(); ++i){ SPItem *item = *i; if(!isConnector(item)) { filtered.push_back(item); @@ -106,7 +105,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 +162,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 +202,6 @@ void graphlayout(std::vector<SPItem*> const &items) { } } } - if(nlist) { - g_slist_free(nlist); - } } const unsigned E = es.size(); double eweights[E]; |