From 5fd00cab14d48beaf2279a2b8f3ad5b02b76c87b Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <mc>
Date: Thu, 19 Feb 2015 04:25:21 +0100
Subject: Put a few std::vector<SPitem*>

(bzr r13922.1.5)
---
 src/main.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 25dc91f14..c62b9cd25 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) {
-                    SelContainer items;
+                	std::vector<SPItem*> items;
                     SPRoot *root = doc->getRoot();
                     doc->ensureUpToDate();
                     for ( SPObject *iter = root->firstChild(); iter ; iter = iter->getNext()) {
@@ -1169,8 +1169,8 @@ static int sp_process_file_list(GSList *fl)
                         items.push_back(item);
                     }
 
-                    SelContainer selected;
-                    SelContainer to_select;
+                    std::vector<SPItem*> selected;
+                    std::vector<Inkscape::XML::Node*> to_select;
 
                     sp_item_list_to_curves(items, selected, to_select);
 
@@ -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.");
     }
 
-    SelContainer items;
+    std::vector<SPItem*> 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.push_front(SP_ITEM(o));
+            items.push_back(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 : SelContainer()) == 1 ) {
+              dpi, bgcolor, NULL, NULL, true, sp_export_id_only ? items : std::vector<SPItem*>()) == 1 ) {
                 g_print("Bitmap saved as: %s\n", filename.c_str());
             } else {
                 g_warning("Bitmap failed to save to: %s", filename.c_str());
-- 
cgit v1.2.3