From 7c7b311cb7ff307a4e865341c3b78ec669e73fc7 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Fri, 13 Nov 2015 18:53:22 +0100
Subject: static code analysis

(bzr r14463)
---
 src/graphlayout.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/graphlayout.cpp')

diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp
index 40994347c..9b67ba0b5 100644
--- a/src/graphlayout.cpp
+++ b/src/graphlayout.cpp
@@ -89,7 +89,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);
-- 
cgit v1.2.3


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


From 97324d275423a8367fdd671cbdda8097f26b0b10 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 9 Dec 2015 21:01:20 +0100
Subject: Remove unused header file.

(bzr r14522)
---
 src/graphlayout.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/graphlayout.cpp')

diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp
index 39ffb6cc7..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"
-- 
cgit v1.2.3