From a7f2b2ba3f13ceb60376802f4a31e104153839e8 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <mc@localhost.localdomain>
Date: Tue, 17 Feb 2015 03:00:37 +0100
Subject: At first, I was thinking "I just have to go to the selection file,
 and change that GSList* with a std::list, then resolve the few problems" So,
 i tried that. And I will continue tomorrow, and the days after, on and on.

(bzr r13922.1.1)
---
 src/snap.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/snap.cpp')

diff --git a/src/snap.cpp b/src/snap.cpp
index 8138e4546..a7145b834 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -43,7 +43,7 @@ SnapManager::SnapManager(SPNamedView const *v) :
     object(this, 0),
     snapprefs(),
     _named_view(v),
-    _rotation_center_source_items(NULL),
+    _rotation_center_source_items(SelContainer()),
     _guide_to_ignore(NULL),
     _desktop(NULL),
     _snapindicator(true),
@@ -1013,7 +1013,7 @@ void SnapManager::setup(SPDesktop const *desktop,
     _snapindicator = snapindicator;
     _unselected_nodes = unselected_nodes;
     _guide_to_ignore = guide_to_ignore;
-    _rotation_center_source_items = NULL;
+    _rotation_center_source_items.clear();
 }
 
 void SnapManager::setup(SPDesktop const *desktop,
@@ -1031,7 +1031,7 @@ void SnapManager::setup(SPDesktop const *desktop,
     _snapindicator = snapindicator;
     _unselected_nodes = unselected_nodes;
     _guide_to_ignore = guide_to_ignore;
-    _rotation_center_source_items = NULL;
+    _rotation_center_source_items.clear();
 }
 
 /// Setup, taking the list of items to ignore from the desktop's selection.
@@ -1049,13 +1049,13 @@ void SnapManager::setupIgnoreSelection(SPDesktop const *desktop,
     _snapindicator = snapindicator;
     _unselected_nodes = unselected_nodes;
     _guide_to_ignore = guide_to_ignore;
-    _rotation_center_source_items = NULL;
+    _rotation_center_source_items.clear();
     _items_to_ignore.clear();
 
     Inkscape::Selection *sel = _desktop->selection;
-    GSList const *items = sel->itemList();
-    for (GSList *i = const_cast<GSList*>(items); i; i = i->next) {
-        _items_to_ignore.push_back(static_cast<SPItem const *>(i->data));
+    SelContainer const items = sel->itemList();
+    for (SelContainer::const_iterator i=items.begin();i!=items.end();i++) {
+        _items_to_ignore.push_back(static_cast<SPItem const *>(*i));
     }
 }
 
-- 
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/snap.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/snap.cpp')

diff --git a/src/snap.cpp b/src/snap.cpp
index a7145b834..c711874d7 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -43,7 +43,7 @@ SnapManager::SnapManager(SPNamedView const *v) :
     object(this, 0),
     snapprefs(),
     _named_view(v),
-    _rotation_center_source_items(SelContainer()),
+    _rotation_center_source_items(std::vector<SPItem*>()),
     _guide_to_ignore(NULL),
     _desktop(NULL),
     _snapindicator(true),
@@ -1053,8 +1053,8 @@ void SnapManager::setupIgnoreSelection(SPDesktop const *desktop,
     _items_to_ignore.clear();
 
     Inkscape::Selection *sel = _desktop->selection;
-    SelContainer const items = sel->itemList();
-    for (SelContainer::const_iterator i=items.begin();i!=items.end();i++) {
+    std::vector<SPItem*> const items = sel->itemList();
+    for (std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++) {
         _items_to_ignore.push_back(static_cast<SPItem const *>(*i));
     }
 }
-- 
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/snap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/snap.cpp')

diff --git a/src/snap.cpp b/src/snap.cpp
index c711874d7..31cafafcd 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -1055,7 +1055,7 @@ void SnapManager::setupIgnoreSelection(SPDesktop const *desktop,
     Inkscape::Selection *sel = _desktop->selection;
     std::vector<SPItem*> const items = sel->itemList();
     for (std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++) {
-        _items_to_ignore.push_back(static_cast<SPItem const *>(*i));
+        _items_to_ignore.push_back(*i);
     }
 }
 
-- 
cgit v1.2.3