bzr merge lp:~mc.../inkscape/SelContainer

The main change of this branch is that the container for selections is now a std::vector and not a GSList.
This change propagates in most of the codebase.

Normally, there are no changes of semantics, except the following: 

-> childList is now in the intuitive order (childList()[0] is now firstChild)
-> sp_selection_paste_impl is now in the opposite order (change is local to selection-chemistry.cpp, and simplify a few things there)
-> selection.setReprList now takes the list in the opposite order. It was always the case (the list was always reversed before handing to it)
-> a few comparison functions now work "the c++ way": the C way was to return -1 if a<b, 0 if a==b and 1 if a>b, now they return (bool)(a<b) so they can be used with std::sort

(bzr r14074)

1 files changed, 7 insertions, 5 deletions

diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index 2b9053da9..7ca277ea2 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -578,9 +578,10 @@ void GlyphsPanel::setTargetDesktop(SPDesktop *desktop)
 void GlyphsPanel::insertText()
 {
     SPItem *textItem = 0;
-    for (const GSList *item = targetDesktop->selection->itemList(); item; item = item->next ) {
-        if (SP_IS_TEXT(item->data) || SP_IS_FLOWTEXT(item->data)) {
-            textItem = SP_ITEM(item->data);
+    std::vector<SPItem*> itemlist=targetDesktop->selection->itemList();
+        for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
+            if (SP_IS_TEXT(*i) || SP_IS_FLOWTEXT(*i)) {
+            textItem = *i;
             break;
         }
     }
@@ -687,8 +688,9 @@ void GlyphsPanel::selectionModifiedCB(guint flags)
 void GlyphsPanel::calcCanInsert()
 {
     int items = 0;
-    for (const GSList *item = targetDesktop->selection->itemList(); item; item = item->next ) {
-        if (SP_IS_TEXT(item->data) || SP_IS_FLOWTEXT(item->data)) {
+    std::vector<SPItem*> itemlist=targetDesktop->selection->itemList();
+    for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
+        if (SP_IS_TEXT(*i) || SP_IS_FLOWTEXT(*i)) {
             ++items;
         }
     }