From 193b25a53c51a36fe9538e03203b0054c8cfc355 Mon Sep 17 00:00:00 2001
From: mc <>
Date: Wed, 18 Feb 2015 02:02:37 +0100
Subject: Just... some... more... lines...

(bzr r13922.1.2)
---
 src/ui/tools/connector-tool.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/ui/tools/connector-tool.cpp')

diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index 26a4eadd5..fc40c20e7 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -1313,12 +1313,12 @@ void cc_selection_set_avoid(bool const set_avoid)
 
     Inkscape::Selection *selection = desktop->getSelection();
 
-    GSList *l = const_cast<GSList *>(selection->itemList());
 
     int changes = 0;
 
-    while (l) {
-        SPItem *item = SP_ITEM(l->data);
+    SelContainer l = selection->itemList();
+    for(SelContainer::const_iterator i=l.begin();i!=l.end();i++) {
+        SPItem *item = SP_ITEM(*i);
 
         char const *value = (set_avoid) ? "true" : NULL;
 
@@ -1327,8 +1327,6 @@ void cc_selection_set_avoid(bool const set_avoid)
             item->avoidRef->handleSettingChange();
             changes++;
         }
-
-        l = l->next;
     }
 
     if (changes == 0) {
-- 
cgit v1.2.3


From 5fd00cab14d48beaf2279a2b8f3ad5b02b76c87b Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <mc>
Date: Thu, 19 Feb 2015 04:25:21 +0100
Subject: Put a few std::vector<SPitem*>

(bzr r13922.1.5)
---
 src/ui/tools/connector-tool.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui/tools/connector-tool.cpp')

diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index fc40c20e7..9c6eead16 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -1316,8 +1316,8 @@ void cc_selection_set_avoid(bool const set_avoid)
 
     int changes = 0;
 
-    SelContainer l = selection->itemList();
-    for(SelContainer::const_iterator i=l.begin();i!=l.end();i++) {
+    std::vector<SPItem*> l = selection->itemList();
+    for(std::vector<SPItem*>::const_iterator i=l.begin();i!=l.end();i++) {
         SPItem *item = SP_ITEM(*i);
 
         char const *value = (set_avoid) ? "true" : NULL;
-- 
cgit v1.2.3


From 9a7fa4d1899d30ec745107823f307b2a0bf3172f Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <mc@localhost.localdomain>
Date: Fri, 27 Feb 2015 03:10:36 +0100
Subject: corrected the casts (hopefully)

(bzr r13922.1.10)
---
 src/ui/tools/connector-tool.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/tools/connector-tool.cpp')

diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index 9c6eead16..f48e572df 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -1318,7 +1318,7 @@ void cc_selection_set_avoid(bool const set_avoid)
 
     std::vector<SPItem*> l = selection->itemList();
     for(std::vector<SPItem*>::const_iterator i=l.begin();i!=l.end();i++) {
-        SPItem *item = SP_ITEM(*i);
+        SPItem *item = *i;
 
         char const *value = (set_avoid) ? "true" : NULL;
 
-- 
cgit v1.2.3