From 402e0259b8310d25a1f51cc6a4c69f496f73591e Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Tue, 8 Dec 2015 22:36:21 +0100
Subject: cppification: GSList replaced by vectors (connectors)

(bzr r14504.1.13)
---
 src/graphlayout.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/graphlayout.cpp')

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];
-- 
cgit v1.2.3