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)

1 files changed, 11 insertions, 12 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 15576109d..25dc91f14 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1156,7 +1156,7 @@ static int sp_process_file_list(GSList *fl)
             }
             if (sp_export_svg) {
                 if (sp_export_text_to_path) {
-                    GSList *items = NULL;
+                    SelContainer items;
                     SPRoot *root = doc->getRoot();
                     doc->ensureUpToDate();
                     for ( SPObject *iter = root->firstChild(); iter ; iter = iter->getNext()) {
@@ -1166,17 +1166,17 @@ static int sp_process_file_list(GSList *fl)
                         }
 
                         te_update_layout_now_recursive(item);
-                        items = g_slist_append(items, item);
+                        items.push_back(item);
                     }
 
-                    GSList *selected = NULL;
-                    GSList *to_select = NULL;
+                    SelContainer selected;
+                    SelContainer to_select;
 
-                    sp_item_list_to_curves(items, &selected, &to_select);
+                    sp_item_list_to_curves(items, selected, to_select);
 
-                    g_slist_free (items);
-                    g_slist_free (selected);
-                    g_slist_free (to_select);
+                    items.clear();
+                    selected.clear();
+                    to_select.clear();
                 }
                 if(sp_export_id) {
                     doc->ensureUpToDate();
@@ -1435,7 +1435,7 @@ static int sp_do_export_png(SPDocument *doc)
         g_warning ("--export-use-hints can only be used with --export-id or --export-area-drawing; ignored.");
     }
 
-    GSList *items = NULL;
+    SelContainer items;
 
     Geom::Rect area;
     if (sp_export_id || sp_export_area_drawing) {
@@ -1459,7 +1459,7 @@ static int sp_do_export_png(SPDocument *doc)
                 return 1;
             }
 
-            items = g_slist_prepend (items, SP_ITEM(o));
+            items.push_front(SP_ITEM(o));
 
             if (sp_export_id_only) {
                 g_print("Exporting only object with id=\"%s\"; all other objects hidden\n", sp_export_id);
@@ -1647,7 +1647,7 @@ static int sp_do_export_png(SPDocument *doc)
 
         if ((width >= 1) && (height >= 1) && (width <= PNG_UINT_31_MAX) && (height <= PNG_UINT_31_MAX)) {
             if( sp_export_png_file(doc, path.c_str(), area, width, height, dpi,
-              dpi, bgcolor, NULL, NULL, true, sp_export_id_only ? items : NULL) == 1 ) {
+              dpi, bgcolor, NULL, NULL, true, sp_export_id_only ? items : SelContainer()) == 1 ) {
                 g_print("Bitmap saved as: %s\n", filename.c_str());
             } else {
                 g_warning("Bitmap failed to save to: %s", filename.c_str());
@@ -1657,7 +1657,6 @@ static int sp_do_export_png(SPDocument *doc)
         }
     }
 
-    g_slist_free (items);
     return retcode;
 }