1 files changed, 15 insertions, 13 deletions

diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 6d90c792e..fc6094c9f 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -605,7 +605,7 @@ void Export::onBatchClicked ()
 
 void Export::updateCheckbuttons ()
 {
-    gint num = g_slist_length((GSList *) SP_ACTIVE_DESKTOP->getSelection()->itemList());
+    gint num = SP_ACTIVE_DESKTOP->getSelection()->itemList().size();
     if (num >= 2) {
         batch_export.set_sensitive(true);
         batch_export.set_label(g_strdup_printf (ngettext("B_atch export %d selected object","B_atch export %d selected objects",num), num));
@@ -817,9 +817,9 @@ void Export::onAreaToggled ()
                    one that's nice */
                 if (filename.empty()) {
                     const gchar * id = "object";
-                    const GSList * reprlst = SP_ACTIVE_DESKTOP->getSelection()->reprList();
-                    for(; reprlst != NULL; reprlst = reprlst->next) {
-                        Inkscape::XML::Node * repr = (Inkscape::XML::Node *)reprlst->data;
+                    const SelContainer reprlst = SP_ACTIVE_DESKTOP->getSelection()->reprList();
+                    for(SelContainer::const_iterator i=reprlst.begin(); reprlst.end() != i; i++) {
+                        Inkscape::XML::Node * repr = (Inkscape::XML::Node *)(*i);
                         if (repr->attribute("id")) {
                             id = repr->attribute("id");
                             break;
@@ -1010,7 +1010,7 @@ void Export::onExport ()
     if (batch_export.get_active ()) {
         // Batch export of selected objects
 
-        gint num = g_slist_length(const_cast<GSList *>(desktop->getSelection()->itemList()));
+        gint num = (desktop->getSelection()->itemList()).size();
         gint n = 0;
 
         if (num < 1) {
@@ -1024,8 +1024,9 @@ void Export::onExport ()
 
         gint export_count = 0;
 
-        for (GSList *i = const_cast<GSList *>(desktop->getSelection()->itemList()); i && !interrupted; i = i->next) {
-            SPItem *item = reinterpret_cast<SPItem *>(i->data);
+        SelContainer itemlist=desktop->getSelection()->itemList();
+        for(SelContainer::const_iterator i = itemlist.begin();i!=itemlist.end() && !interrupted ;i++){
+            SPItem *item = reinterpret_cast<SPItem *>(*i);
 
             prog_dlg->set_data("current", GINT_TO_POINTER(n));
             prog_dlg->set_data("total", GINT_TO_POINTER(num));
@@ -1063,13 +1064,13 @@ void Export::onExport ()
                                               _("Exporting file <b>%s</b>..."), safeFile), desktop);
                     MessageCleaner msgFlashCleanup(desktop->messageStack()->flashF(Inkscape::IMMEDIATE_MESSAGE,
                                                    _("Exporting file <b>%s</b>..."), safeFile), desktop);
-
+                    SelContainer x;
                     if (!sp_export_png_file (doc, path.c_str(),
                                              *area, width, height, dpi, dpi,
                                              nv->pagecolor,
                                              onProgressCallback, (void*)prog_dlg,
                                              TRUE,  // overwrite without asking
-                                             hide ? const_cast<GSList *>(desktop->getSelection()->itemList()) : NULL
+                                             hide ? (desktop->getSelection()->itemList()) : x
                                             )) {
                         gchar * error = g_strdup_printf(_("Could not export to filename %s.\n"), safeFile);
 
@@ -1153,12 +1154,13 @@ void Export::onExport ()
         prog_dlg->set_data("total", GINT_TO_POINTER(0));
 
         /* Do export */
+        SelContainer x;
         ExportResult status = sp_export_png_file(desktop->getDocument(), path.c_str(),
                               Geom::Rect(Geom::Point(x0, y0), Geom::Point(x1, y1)), width, height, xdpi, ydpi,
                               nv->pagecolor,
                               onProgressCallback, (void*)prog_dlg,
                               FALSE,
-                              hide ? const_cast<GSList *>(desktop->getSelection()->itemList()) : NULL
+                              hide ? (desktop->getSelection()->itemList()) : x
                                                 );
         if (status == EXPORT_ERROR) {
             gchar * safeFile = Inkscape::IO::sanitizeString(path.c_str());
@@ -1224,7 +1226,7 @@ void Export::onExport ()
             break;
         }
         case SELECTION_SELECTION: {
-            const GSList * reprlst;
+            SelContainer reprlst;
             SPDocument * doc = SP_ACTIVE_DOCUMENT;
             bool modified = false;
 
@@ -1232,8 +1234,8 @@ void Export::onExport ()
             DocumentUndo::setUndoSensitive(doc, false);
             reprlst = desktop->getSelection()->reprList();
 
-            for(; reprlst != NULL; reprlst = reprlst->next) {
-                Inkscape::XML::Node * repr = static_cast<Inkscape::XML::Node *>(reprlst->data);
+            for(SelContainer::const_iterator i=reprlst.begin(); reprlst.end() != i; i++) {
+                Inkscape::XML::Node * repr = dynamic_cast<Inkscape::XML::Node *>(*i);
                 const gchar * temp_string;
                 Glib::ustring dir = Glib::path_get_dirname(filename.c_str());
                 const gchar* docURI=SP_ACTIVE_DOCUMENT->getURI();