Merge from trunk

(bzr r14059.2.11)

1 files changed, 14 insertions, 13 deletions

diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index 86d816e85..813d6ae5b 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -103,7 +103,7 @@ void MeshTool::selection_changed(Inkscape::Selection* /*sel*/) {
         return;
     }
 
-    guint n_obj = g_slist_length((GSList *) selection->itemList());
+    guint n_obj = selection->itemList().size();
 
     if (!drag->isNonEmpty() || selection->isEmpty()) {
         return;
@@ -467,11 +467,12 @@ bool MeshTool::root_handler(GdkEvent* event) {
             if (over_line) {
                 // We take the first item in selection, because with doubleclick, the first click
                 // always resets selection to the single object under cursor
-                sp_mesh_context_split_near_point(this, SP_ITEM(selection->itemList()->data), this->mousepoint_doc, event->button.time);
+                sp_mesh_context_split_near_point(this, selection->itemList()[0], this->mousepoint_doc, event->button.time);
             } else {
                 // Create a new gradient with default coordinates.
-                for (GSList const* i = selection->itemList(); i != NULL; i = i->next) {
-                    SPItem *item = SP_ITEM(i->data);
+            	std::vector<SPItem*> items=selection->itemList();
+                for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
+                    SPItem *item = *i;
                     SPGradientType new_type = SP_GRADIENT_TYPE_MESH;
                     Inkscape::PaintTarget fsmode = (prefs->getInt("/tools/gradient/newfillorstroke", 1) != 0) ? Inkscape::FOR_FILL : Inkscape::FOR_STROKE;
 
@@ -940,27 +941,27 @@ static void sp_mesh_drag(MeshTool &rc, Geom::Point const /*pt*/, guint /*state*/
         } else {
             // Starting from empty space:
             // Sort items so that the topmost comes last
-            GSList *items = g_slist_copy ((GSList *) selection->itemList());
-            items = g_slist_sort(items, (GCompareFunc) sp_item_repr_compare_position);
+        	std::vector<SPItem*> items(selection->itemList());
+            sort(items.begin(),items.end(),sp_item_repr_compare_position);
             // take topmost
-            vector = sp_gradient_vector_for_object(document, desktop, SP_ITEM(g_slist_last(items)->data), fill_or_stroke);
-            g_slist_free (items);
+            vector = sp_gradient_vector_for_object(document, desktop, SP_ITEM(items.back()), fill_or_stroke);
         }
 
         // HACK: reset fill-opacity - that 0.75 is annoying; BUT remove this when we have an opacity slider for all tabs
         SPCSSAttr *css = sp_repr_css_attr_new();
         sp_repr_css_set_property(css, "fill-opacity", "1.0");
 
-        for (GSList const *i = selection->itemList(); i != NULL; i = i->next) {
+        std::vector<SPItem*> items=selection->itemList();
+        for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
 
             //FIXME: see above
-            sp_repr_css_change_recursive(SP_OBJECT(i->data)->getRepr(), css, "style");
+            sp_repr_css_change_recursive((*i)->getRepr(), css, "style");
 
-            sp_item_set_gradient(SP_ITEM(i->data), vector, (SPGradientType) type, fill_or_stroke);
+            sp_item_set_gradient(*i, vector, (SPGradientType) type, fill_or_stroke);
 
             // We don't need to do anything. Mesh is already sized appropriately.
  
-            SP_OBJECT(i->data)->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            (*i)->requestModified(SP_OBJECT_MODIFIED_FLAG);
         }
         // if (ec->_grdrag) {
         //     ec->_grdrag->updateDraggers();
@@ -978,7 +979,7 @@ static void sp_mesh_drag(MeshTool &rc, Geom::Point const /*pt*/, guint /*state*/
 
         // status text; we do not track coords because this branch is run once, not all the time
         // during drag
-        int n_objects = g_slist_length((GSList *) selection->itemList());
+        int n_objects = selection->itemList().size();
         rc.message_context->setF(Inkscape::NORMAL_MESSAGE,
                                   ngettext("<b>Gradient</b> for %d object; with <b>Ctrl</b> to snap angle",
                                            "<b>Gradient</b> for %d objects; with <b>Ctrl</b> to snap angle", n_objects),