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)

6 files changed, 24 insertions, 30 deletions

diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
index 76f35415e..87ef30887 100644
--- a/src/extension/internal/bitmap/imagemagick.cpp
+++ b/src/extension/internal/bitmap/imagemagick.cpp
@@ -70,8 +70,8 @@ ImageMagickDocCache::ImageMagickDocCache(Inkscape::UI::View::View * view) :
     _imageItems(NULL)
 {
     SPDesktop *desktop = (SPDesktop*)view;
-    const GSList *selectedItemList = desktop->selection->itemList();
-    int selectCount = g_slist_length((GSList *)selectedItemList);
+    const SelContainer selectedItemList = desktop->selection->itemList();
+    int selectCount = selectedItemList.size();
     
     // Init the data-holders
     _nodes = new Inkscape::XML::Node*[selectCount];
@@ -83,9 +83,8 @@ ImageMagickDocCache::ImageMagickDocCache(Inkscape::UI::View::View * view) :
     _imageItems = new SPItem*[selectCount];
 
     // Loop through selected items
-    for (; selectedItemList != NULL; selectedItemList = g_slist_next(selectedItemList))
-    {
-        SPItem *item = SP_ITEM(selectedItemList->data);
+    for (SelContainer::const_iterator i=selectedItemList.begin();i!=selectedItemList.end();i++) {
+        SPItem *item = static_cast<SPItem *>(*i);
         Inkscape::XML::Node *node = reinterpret_cast<Inkscape::XML::Node *>(item->getRepr());
         if (!strcmp(node->name(), "image") || !strcmp(node->name(), "svg:image"))
         {
@@ -243,11 +242,10 @@ ImageMagick::prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::Vie
 
     using Inkscape::Util::GSListConstIterator;
 
-    // FIXME very unsafe cast
-    GSListConstIterator<SPItem *> selected = ((SPDesktop *)view)->getSelection()->itemList();
+    SelContainer selected = ((SPDesktop *)view)->getSelection()->itemList();
     Inkscape::XML::Node * first_select = NULL;
-    if (selected != NULL) {
-        first_select = (*selected)->getRepr();
+    if (!selected.empty()) {
+        first_select = (selected.front())->getRepr();
     }
 
     return module->autogui(current_document, first_select, changeSignal);
diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp
index 3ce537d9f..138172715 100644
--- a/src/extension/internal/bluredge.cpp
+++ b/src/extension/internal/bluredge.cpp
@@ -65,13 +65,12 @@ BlurEdge::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View
 
     using Inkscape::Util::GSListConstIterator;
     // TODO need to properly refcount the items, at least
-    std::list<SPItem *> items;
-    items.insert<GSListConstIterator<SPItem *> >(items.end(), selection->itemList(), NULL);
+    SelContainer items(selection->itemList());
     selection->clear();
 
-    for(std::list<SPItem *>::iterator item = items.begin();
+    for(SelContainer::iterator item = items.begin();
             item != items.end(); ++item) {
-        SPItem * spitem = *item;
+        SPItem * spitem = static_cast<SPItem*>(*item);
 
         std::vector<Inkscape::XML::Node *> new_items(steps);
         Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 1f48d2097..7ce5cdf8a 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -294,14 +294,14 @@ static void sp_group_render(SPGroup *group, CairoRenderContext *ctx)
     CairoRenderer *renderer = ctx->getRenderer();
     TRACE(("sp_group_render opacity: %f\n", SP_SCALE24_TO_FLOAT(item->style->opacity.value)));
 
-    GSList *l = g_slist_reverse(group->childList(false));
-    while (l) {
-        SPObject *o = reinterpret_cast<SPObject *>(l->data);
+    SelContainer l(group->childList(false));
+    l.reverse();
+    for(SelContainer::const_iterator x=l.begin();x!=l.end();x++){
+        SPObject *o = reinterpret_cast<SPObject *>(*x);
         SPItem *item = dynamic_cast<SPItem *>(o);
         if (item) {
             renderer->renderItem(ctx, item);
         }
-        l = g_slist_remove (l, o);
     }
 }
 
diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index a2c565699..821c023ac 100644
--- a/src/extension/internal/filter/filter.cpp
+++ b/src/extension/internal/filter/filter.cpp
@@ -125,17 +125,15 @@ void Filter::effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::Vie
 	//printf("Calling filter effect\n");
     Inkscape::Selection * selection = ((SPDesktop *)document)->selection;
 
-    using Inkscape::Util::GSListConstIterator;
     // TODO need to properly refcount the items, at least
-    std::list<SPItem *> items;
-    items.insert<GSListConstIterator<SPItem *> >(items.end(), selection->itemList(), NULL);
+    SelContainer items(selection->itemList());
 
 	Inkscape::XML::Document * xmldoc = document->doc()->getReprDoc();
 	Inkscape::XML::Node * defsrepr = document->doc()->getDefs()->getRepr();
 
-    for(std::list<SPItem *>::iterator item = items.begin();
+    for(SelContainer::iterator item = items.begin();
             item != items.end(); ++item) {
-        SPItem * spitem = *item;
+        SPItem * spitem = static_cast<SPItem*>(*item);
 	Inkscape::XML::Node * node = spitem->getRepr();
 
 		SPCSSAttr * css = sp_repr_css_attr(node, "style");
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index 270edfe44..4c12f629c 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -192,11 +192,10 @@ Grid::prefs_effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View
 
     using Inkscape::Util::GSListConstIterator;
 
-    // FIXME very unsafe cast
-    GSListConstIterator<SPItem *> selected = ((SPDesktop *)view)->getSelection()->itemList();
+    SelContainer selected = ((SPDesktop *)view)->getSelection()->itemList();
     Inkscape::XML::Node * first_select = NULL;
-    if (selected != NULL) {
-        first_select = (*selected)->getRepr();
+    if (!selected.empty()) {
+        first_select = (selected.front())->getRepr();
     }
 
     return module->autogui(current_document, first_select, changeSignal);
diff --git a/src/extension/internal/latex-text-renderer.cpp b/src/extension/internal/latex-text-renderer.cpp
index ab0733848..dab27a0e1 100644
--- a/src/extension/internal/latex-text-renderer.cpp
+++ b/src/extension/internal/latex-text-renderer.cpp
@@ -228,14 +228,14 @@ LaTeXTextRenderer::writePostamble()
 
 void LaTeXTextRenderer::sp_group_render(SPGroup *group)
 {
-    GSList *l = g_slist_reverse(group->childList(false));
-    while (l) {
-        SPObject *o = reinterpret_cast<SPObject *>(l->data);
+    SelContainer l = (group->childList(false));
+    l.reverse();
+    for(SelContainer::const_iterator x=l.begin();x!=l.end();x++){
+        SPObject *o = reinterpret_cast<SPObject *>(*x);
         SPItem *item = dynamic_cast<SPItem *>(o);
         if (item) {
             renderItem(item);
         }
-        l = g_slist_remove (l, o);
     }
 }