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/dialog/objects.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/ui/dialog/objects.cpp')

diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index c95529a56..0ae3027c7 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -479,15 +479,15 @@ void ObjectsPanel::_objectsSelected( Selection *sel ) {
     _selectedConnection.block();
     _tree.get_selection()->unselect_all();
     SPItem *item = NULL;
-    for (const GSList * iter = sel->itemList(); iter != NULL; iter = iter->next)
-    {
-        item = reinterpret_cast<SPItem *>(iter->data);
+    SelContainer const items = sel->itemList();
+    for(SelContainer::const_iterator i=items.begin(); i!=items.end();i++){
+        item = reinterpret_cast<SPItem *>(*i);
         if (setOpacity)
         {
             _setCompositingValues(item);
             setOpacity = false;
         }
-        _store->foreach(sigc::bind<SPItem *, bool>( sigc::mem_fun(*this, &ObjectsPanel::_checkForSelected), item, iter->next == NULL));
+        _store->foreach(sigc::bind<SPItem *, bool>( sigc::mem_fun(*this, &ObjectsPanel::_checkForSelected), item, (*i)==items.back()));
     }
     if (!item) {
         if (_desktop->currentLayer() && SP_IS_ITEM(_desktop->currentLayer())) {
-- 
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/dialog/objects.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui/dialog/objects.cpp')

diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 0ae3027c7..d60780f78 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -479,8 +479,8 @@ void ObjectsPanel::_objectsSelected( Selection *sel ) {
     _selectedConnection.block();
     _tree.get_selection()->unselect_all();
     SPItem *item = NULL;
-    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++){
         item = reinterpret_cast<SPItem *>(*i);
         if (setOpacity)
         {
-- 
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/dialog/objects.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/dialog/objects.cpp')

diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 6e09be2ba..781c6ef93 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -479,7 +479,7 @@ void ObjectsPanel::_objectsSelected( Selection *sel ) {
     SPItem *item = NULL;
     std::vector<SPItem*> const items = sel->itemList();
     for(std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end();i++){
-        item = reinterpret_cast<SPItem *>(*i);
+        item = *i;
         if (setOpacity)
         {
             _setCompositingValues(item);
-- 
cgit v1.2.3