Put a few std::vector<SPitem*>

(bzr r13922.1.5)

19 files changed, 116 insertions, 120 deletions

diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 562bc28b7..34dbd150b 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -98,7 +98,7 @@ void ActionAlign::do_action(SPDesktop *desktop, int index)
     bool sel_as_group = prefs->getBool("/dialogs/align/sel-as-groups");
 
     using Inkscape::Util::GSListConstIterator;
-    SelContainer selected(selection->itemList());
+    std::vector<SPItem*> selected(selection->itemList());
     if (selected.empty()) return;
 
     const Coeffs &a = _allCoeffs[index];
@@ -148,7 +148,7 @@ void ActionAlign::do_action(SPDesktop *desktop, int index)
         b = selection->preferredBounds();
 
     //Move each item in the selected list separately
-    for (SelContainer::iterator it(selected.begin());
+    for (std::vector<SPItem*>::iterator it(selected.begin());
          it != selected.end(); ++it)
     {
     	SPItem* item=static_cast<SPItem*> (*it);
@@ -251,18 +251,18 @@ private :
         if (!selection) return;
 
         using Inkscape::Util::GSListConstIterator;
-        SelContainer selected(selection->itemList());
+        std::vector<SPItem*> selected(selection->itemList());
         if (selected.empty()) return;
 
         //Check 2 or more selected objects
-        SelContainer::iterator second(selected.begin());
+        std::vector<SPItem*>::iterator second(selected.begin());
         ++second;
         if (second == selected.end()) return;
 
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         int prefs_bbox = prefs->getBool("/tools/bounding_box");
         std::vector< BBoxSort  > sorted;
-        for (SelContainer::iterator it(selected.begin());
+        for (std::vector<SPItem*>::iterator it(selected.begin());
             it != selected.end();
             ++it)
         {SPItem *item=static_cast<SPItem*>(*it);
@@ -540,10 +540,6 @@ private :
         return (a->isSiblingOf(b));
     }
 
-    static bool local_obj_compare(SPObject* a,SPObject* b){
-    	return ActionExchangePositions::sort_compare(static_cast<SPItem*>(a),static_cast<SPItem*>(b));
-    }
-
     virtual void on_button_click()
     {
         SPDesktop *desktop = _dialog.getDesktop();
@@ -553,7 +549,7 @@ private :
         if (!selection) return;
 
         using Inkscape::Util::GSListConstIterator;
-        SelContainer selected(selection->itemList());
+        std::vector<SPItem*> selected(selection->itemList());
         if (selected.empty()) return;
 
         //Check 2 or more selected objects
@@ -571,9 +567,9 @@ private :
 		} else { // sorting by ZOrder is outomatically done by not setting the center
 			center.reset();
 		}
-		selected.sort(local_obj_compare);
+		sort(selected.begin(),selected.end(),sort_compare);
 	}
-	SelContainer::iterator it(selected.begin());
+	std::vector<SPItem*>::iterator it(selected.begin());
 	SPItem* item=static_cast<SPItem*>(*it);
 	Geom::Point p1 =  (item)->getCenter();
 	for (++it ;it != selected.end(); ++it)
@@ -619,7 +615,7 @@ private :
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         int saved_compensation = prefs->getInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED);
         prefs->setInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED);
-        SelContainer x(_dialog.getDesktop()->getSelection()->itemList());
+        std::vector<SPItem*> x(_dialog.getDesktop()->getSelection()->itemList());
         unclump (x);
 
         // restore compensation setting
@@ -651,7 +647,7 @@ private :
         if (!selection) return;
 
         using Inkscape::Util::GSListConstIterator;
-        SelContainer selected(selection->itemList());
+        std::vector<SPItem*> selected(selection->itemList());
         if (selected.empty()) return;
 
         //Check 2 or more selected objects
@@ -675,7 +671,7 @@ private :
         int saved_compensation = prefs->getInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED);
         prefs->setInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED);
 
-        for (SelContainer::iterator it(selected.begin());
+        for (std::vector<SPItem*>::iterator it(selected.begin());
             it != selected.end();
             ++it)
         {
@@ -750,7 +746,7 @@ private :
         if (!selection) return;
 
         using Inkscape::Util::GSListConstIterator;
-        SelContainer selected(selection->itemList());
+        std::vector<SPItem*> selected(selection->itemList());
         if (selected.empty()) return;
 
         //Check 2 or more selected objects
@@ -761,7 +757,7 @@ private :
 
         std::vector<Baselines> sorted;
 
-        for (SelContainer::iterator it(selected.begin());
+        for (std::vector<SPItem*>::iterator it(selected.begin());
             it != selected.end();
             ++it)
         {
@@ -805,7 +801,7 @@ private :
             }
 
         } else {
-            for (SelContainer::iterator it(selected.begin());
+            for (std::vector<SPItem*>::iterator it(selected.begin());
                  it != selected.end();
                  ++it)
             {
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index abfab8b19..680757373 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -2104,16 +2104,17 @@ void CloneTiler::clonetiler_unclump(GtkWidget */*widget*/, void *)
     SPObject *obj = selection->singleItem();
     SPObject *parent = obj->parent;
 
-    SelContainer to_unclump; // not including the original
+    std::vector<SPItem*> to_unclump; // not including the original
 
     for (SPObject *child = parent->firstChild(); child != NULL; child = child->next) {
         if (clonetiler_is_a_clone_of (child, obj)) {
-            to_unclump.push_front(child);
+            to_unclump.push_back((SPItem*)child);
         }
     }
 
     desktop->getDocument()->ensureUpToDate();
-
+    std::vector<SPItem*> tu2(to_unclump);
+    for(int i=0;i<tu2.size();i++)to_unclump[i]=tu2[tu2.size()-i-1];
     unclump (to_unclump);
 
     DocumentUndo::done(desktop->getDocument(), SP_VERB_DIALOG_CLONETILER,
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 0667ba721..32eed088c 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -1024,8 +1024,8 @@ void Export::onExport ()
 
         gint export_count = 0;
 
-        SelContainer itemlist=desktop->getSelection()->itemList();
-        for(SelContainer::const_iterator i = itemlist.begin();i!=itemlist.end() && !interrupted ;i++){
+        std::vector<SPItem*> itemlist=desktop->getSelection()->itemList();
+        for(std::vector<SPItem*>::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));
@@ -1064,7 +1064,7 @@ 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;
+                    std::vector<SPItem*> x;
                     if (!sp_export_png_file (doc, path.c_str(),
                                              *area, width, height, dpi, dpi,
                                              nv->pagecolor,
@@ -1154,7 +1154,7 @@ void Export::onExport ()
         prog_dlg->set_data("total", GINT_TO_POINTER(0));
 
         /* Do export */
-        SelContainer x;
+        std::vector<SPItem*> 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,
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index f67c1d173..a6312140d 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -1465,8 +1465,8 @@ void FilterEffectsDialog::FilterModifier::update_selection(Selection *sel)
     }
 
     std::set<SPObject*> used;
-    SelContainer itemlist=sel->itemList();
-    for(SelContainer::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
+    std::vector<SPItem*> itemlist=sel->itemList();
+    for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
         SPObject *obj = SP_OBJECT (*i);
         SPStyle *style = obj->style;
         if (!style || !SP_IS_ITEM(obj)) {
@@ -1545,8 +1545,8 @@ void FilterEffectsDialog::FilterModifier::on_selection_toggled(const Glib::ustri
         if((*iter)[_columns.sel] == 1)
             filter = 0;
 
-        SelContainer itemlist=sel->itemList();
-        for(SelContainer::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
+        std::vector<SPItem*> itemlist=sel->itemList();
+        for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
             SPItem * item = SP_ITEM(*i);
             SPStyle *style = item->style;
             g_assert(style != NULL);
@@ -1649,9 +1649,9 @@ void FilterEffectsDialog::FilterModifier::remove_filter()
         SPDocument* doc = filter->document;
 
         // Delete all references to this filter
-        SelContainer x,y;
-        SelContainer all = get_all_items(x, _desktop->currentRoot(), _desktop, false, false, true, y);
-        for(SelContainer::const_iterator i=all.begin(); all.end() != i; i++) {
+        std::vector<SPItem*> x,y;
+        std::vector<SPItem*> all = get_all_items(x, _desktop->currentRoot(), _desktop, false, false, true, y);
+        for(std::vector<SPItem*>::const_iterator i=all.begin(); all.end() != i; i++) {
             if (!SP_IS_ITEM(*i)) {
                 continue;
             }
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index 43ecb60ac..283d79c0d 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -549,7 +549,7 @@ bool Find::item_font_match(SPItem *item, const gchar *text, bool exact, bool cas
 }
 
 
-SelContainer Find::filter_fields (SelContainer &l, bool exact, bool casematch)
+std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, bool casematch)
 {
     Glib::ustring tmp = entry_find.getEntry()->get_text();
     if (tmp.empty()) {
@@ -557,17 +557,17 @@ SelContainer Find::filter_fields (SelContainer &l, bool exact, bool casematch)
     }
     gchar* text = g_strdup(tmp.c_str());
 
-    SelContainer in = l;
-    SelContainer out;
+    std::vector<SPItem*> in = l;
+    std::vector<SPItem*> out;
 
     if (check_searchin_text.get_active()) {
-        for(SelContainer::const_iterator i=in.begin(); in.end() != i; i++) {
+        for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
             SPObject *obj = SP_OBJECT (*i);
             SPItem *item = dynamic_cast<SPItem *>(obj);
             g_assert(item != NULL);
             if (item_text_match(item, text, exact, casematch)) {
                 if (out.end()==find(out.begin(),out.end(), *i)) {
-                    out.push_front(*i);
+                    out.push_back(*i);
                     if (_action_replace) {
                         item_text_match(item, text, exact, casematch, _action_replace);
                     }
@@ -584,12 +584,12 @@ SelContainer Find::filter_fields (SelContainer &l, bool exact, bool casematch)
         bool attrvalue = check_attributevalue.get_active();
 
         if (ids) {
-            for(SelContainer::const_iterator i=in.begin(); in.end() != i; i++) {
+            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
                 SPObject *obj = SP_OBJECT (*i);
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 if (item_id_match(item, text, exact, casematch)) {
                     if (out.end()==find(out.begin(),out.end(), *i)) {
-                        out.push_front(*i);
+                        out.push_back(*i);
                         if (_action_replace) {
                             item_id_match(item, text, exact, casematch, _action_replace);
                         }
@@ -600,13 +600,13 @@ SelContainer Find::filter_fields (SelContainer &l, bool exact, bool casematch)
 
 
         if (style) {
-            for(SelContainer::const_iterator i=in.begin(); in.end() != i; i++) {
+            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
                 SPObject *obj = SP_OBJECT (*i);
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 g_assert(item != NULL);
                 if (item_style_match(item, text, exact, casematch)) {
                     if (out.end()==find(out.begin(),out.end(), *i)){
-                            out.push_front(*i);
+                            out.push_back(*i);
                             if (_action_replace) {
                                 item_style_match(item, text, exact, casematch, _action_replace);
                             }
@@ -617,13 +617,13 @@ SelContainer Find::filter_fields (SelContainer &l, bool exact, bool casematch)
 
 
         if (attrname) {
-            for(SelContainer::const_iterator i=in.begin(); in.end() != i; i++) {
+            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
                 SPObject *obj = SP_OBJECT (*i);
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 g_assert(item != NULL);
                 if (item_attr_match(item, text, exact, casematch)) {
                     if (out.end()==find(out.begin(),out.end(), *i)) {
-                        out.push_front(*i);
+                        out.push_back(*i);
                         if (_action_replace) {
                             item_attr_match(item, text, exact, casematch, _action_replace);
                         }
@@ -634,13 +634,13 @@ SelContainer Find::filter_fields (SelContainer &l, bool exact, bool casematch)
 
 
         if (attrvalue) {
-            for(SelContainer::const_iterator i=in.begin(); in.end() != i; i++) {
+            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
                 SPObject *obj = SP_OBJECT (*i);
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 g_assert(item != NULL);
                 if (item_attrvalue_match(item, text, exact, casematch)) {
                     if (out.end()==find(out.begin(),out.end(), *i)) {
-                        out.push_front(*i);
+                        out.push_back(*i);
                         if (_action_replace) {
                             item_attrvalue_match(item, text, exact, casematch, _action_replace);
                         }
@@ -651,13 +651,13 @@ SelContainer Find::filter_fields (SelContainer &l, bool exact, bool casematch)
 
 
         if (font) {
-            for(SelContainer::const_iterator i=in.begin(); in.end() != i; i++) {
+            for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
                 SPObject *obj = SP_OBJECT (*i);
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 g_assert(item != NULL);
                 if (item_font_match(item, text, exact, casematch)) {
                     if (out.end()==find(out.begin(),out.end(),*i)) {
-                        out.push_front(*i);
+                        out.push_back(*i);
                         if (_action_replace) {
                             item_font_match(item, text, exact, casematch, _action_replace);
                         }
@@ -715,29 +715,29 @@ bool Find::item_type_match (SPItem *item)
     return false;
 }
 
-SelContainer Find::filter_types (SelContainer &l)
+std::vector<SPItem*> Find::filter_types (std::vector<SPItem*> &l)
 {
-    SelContainer n;
-    for(SelContainer::const_iterator i=l.begin(); l.end() != i; i++) {
+    std::vector<SPItem*> n;
+    for(std::vector<SPItem*>::const_reverse_iterator i=l.rbegin(); l.rend() != i; i++) {
         SPObject *obj = SP_OBJECT (*i);
         SPItem *item = dynamic_cast<SPItem *>(obj);
         g_assert(item != NULL);
         if (item_type_match(item)) {
-        	n.push_front(*i);
+        	n.push_back(*i);
         }
     }
     return n;
 }
 
 
-SelContainer &Find::filter_list (SelContainer &l, bool exact, bool casematch)
+std::vector<SPItem*> &Find::filter_list (std::vector<SPItem*> &l, bool exact, bool casematch)
 {
     l = filter_types (l);
     l = filter_fields (l, exact, casematch);
     return l;
 }
 
-SelContainer &Find::all_items (SPObject *r, SelContainer &l, bool hidden, bool locked)
+std::vector<SPItem*> &Find::all_items (SPObject *r, std::vector<SPItem*> &l, bool hidden, bool locked)
 {
     if (dynamic_cast<SPDefs *>(r)) {
         return l; // we're not interested in items in defs
@@ -751,7 +751,7 @@ SelContainer &Find::all_items (SPObject *r, SelContainer &l, bool hidden, bool l
         SPItem *item = dynamic_cast<SPItem *>(child);
         if (item && !child->cloned && !desktop->isLayer(item)) {
             if ((hidden || !desktop->itemIsHidden(item)) && (locked || !item->isLocked())) {
-                l.push_front(child);
+                l.insert(l.begin(),(SPItem*)child);
             }
         }
         l = all_items (child, l, hidden, locked);
@@ -759,10 +759,10 @@ SelContainer &Find::all_items (SPObject *r, SelContainer &l, bool hidden, bool l
     return l;
 }
 
-SelContainer &Find::all_selection_items (Inkscape::Selection *s, SelContainer &l, SPObject *ancestor, bool hidden, bool locked)
+std::vector<SPItem*> &Find::all_selection_items (Inkscape::Selection *s, std::vector<SPItem*> &l, SPObject *ancestor, bool hidden, bool locked)
 {
-    SelContainer itemlist=s->itemList();
-    for(SelContainer::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
+	std::vector<SPItem*> itemlist=s->itemList();
+    for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
         SPObject *obj = SP_OBJECT (*i);
         SPItem *item = dynamic_cast<SPItem *>(obj);
         g_assert(item != NULL);
@@ -817,7 +817,7 @@ void Find::onAction()
     bool casematch = check_case_sensitive.get_active();
     blocked = true;
 
-    SelContainer l;
+    std::vector<SPItem*> l;
     if (check_scope_selection.get_active()) {
         if (check_scope_layer.get_active()) {
             l = all_selection_items (desktop->selection, l, desktop->currentLayer(), hidden, locked);
@@ -833,7 +833,7 @@ void Find::onAction()
     }
     guint all = l.size();
 
-    SelContainer n = filter_list (l, exact, casematch);
+    std::vector<SPItem*> n = filter_list (l, exact, casematch);
 
     if (!n.empty()) {
         int count = n.size();
diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h
index 1aded96f2..61f4463ae 100644
--- a/src/ui/dialog/find.h
+++ b/src/ui/dialog/find.h
@@ -149,10 +149,10 @@ protected:
     /**
      * Function to filter a list of items based on the item type by calling each item_XXX_match function
      */
-    SelContainer    filter_fields (SelContainer &l, bool exact, bool casematch);
+    std::vector<SPItem*>    filter_fields (std::vector<SPItem*> &l, bool exact, bool casematch);
     bool        item_type_match (SPItem *item);
-    SelContainer    filter_types (SelContainer &l);
-    SelContainer &    filter_list (SelContainer &l, bool exact, bool casematch);
+    std::vector<SPItem*>    filter_types (std::vector<SPItem*> &l);
+    std::vector<SPItem*> &    filter_list (std::vector<SPItem*> &l, bool exact, bool casematch);
 
     /**
      * Find a string within a string and returns true if found with options for exact and casematching
@@ -173,12 +173,12 @@ protected:
      * recursive function to return a list of all the items in the SPObject tree
      *
      */
-    SelContainer &    all_items (SPObject *r, SelContainer &l, bool hidden, bool locked);
+    std::vector<SPItem*> &    all_items (SPObject *r, std::vector<SPItem*> &l, bool hidden, bool locked);
     /**
      * to return a list of all the selected items
      *
      */
-    SelContainer &    all_selection_items (Inkscape::Selection *s, SelContainer &l, SPObject *ancestor, bool hidden, bool locked);
+    std::vector<SPItem*> &    all_selection_items (Inkscape::Selection *s, std::vector<SPItem*> &l, SPObject *ancestor, bool hidden, bool locked);
 
     /**
      * Shrink the dialog size when the expander widget is closed
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index 625ed99b9..e9a0fc017 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -70,7 +70,7 @@ FontSubstitution::checkFontSubstitutions(SPDocument* doc)
     int show_dlg = prefs->getInt("/options/font/substitutedlg", 0);
     if (show_dlg) {
         Glib::ustring out;
-        SelContainer l =  getFontReplacedItems(doc, &out);
+        std::vector<SPItem*> l =  getFontReplacedItems(doc, &out);
         if (out.length() > 0) {
             show(out, l);
         }
@@ -78,7 +78,7 @@ FontSubstitution::checkFontSubstitutions(SPDocument* doc)
 }
 
 void
-FontSubstitution::show(Glib::ustring out, SelContainer &l)
+FontSubstitution::show(Glib::ustring out, std::vector<SPItem*> &l)
 {
    Gtk::MessageDialog warning(_("\nSome fonts are not available and have been substituted."),
                        false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK, true);
@@ -148,17 +148,17 @@ FontSubstitution::show(Glib::ustring out, SelContainer &l)
  * b. Build up a list of the objects rendered fonts - taken for the objects layout/spans
  * If there are fonts in a. that are not in b. then those fonts have been substituted.
  */
-SelContainer FontSubstitution::getFontReplacedItems(SPDocument* doc, Glib::ustring *out)
+std::vector<SPItem*> FontSubstitution::getFontReplacedItems(SPDocument* doc, Glib::ustring *out)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    SelContainer allList;
-    SelContainer outList,x,y;
+    std::vector<SPItem*> allList;
+    std::vector<SPItem*> outList,x,y;
     std::set<Glib::ustring> setErrors;
     std::set<Glib::ustring> setFontSpans;
     std::map<SPItem *, Glib::ustring> mapFontStyles;
 
     allList = get_all_items(x, doc->getRoot(), desktop, false, false, true, y);
-    for(SelContainer::const_iterator i = allList.begin();i!=allList.end();i++){
+    for(std::vector<SPItem*>::const_iterator i = allList.begin();i!=allList.end();i++){
         SPItem *item = SP_ITEM(*i);
         SPStyle *style = item->style;
         Glib::ustring family = "";
@@ -214,8 +214,8 @@ SelContainer FontSubstitution::getFontReplacedItems(SPDocument* doc, Glib::ustri
     }
 
     // Check if any document styles are not in the actual layout
-    std::map<SPItem *, Glib::ustring>::const_iterator mapIter;
-    for (mapIter = mapFontStyles.begin(); mapIter != mapFontStyles.end(); ++mapIter) {
+    std::map<SPItem *, Glib::ustring>::const_reverse_iterator mapIter;
+    for (mapIter = mapFontStyles.rbegin(); mapIter != mapFontStyles.rend(); ++mapIter) {
         SPItem *item = mapIter->first;
         Glib::ustring fonts = mapIter->second;
 
@@ -248,7 +248,7 @@ SelContainer FontSubstitution::getFontReplacedItems(SPDocument* doc, Glib::ustri
             Glib::ustring err = Glib::ustring::compose(
                     _("Font '%1' substituted with '%2'"), fonts.c_str(), subName.c_str());
             setErrors.insert(err);
-            outList.push_front(item);
+            outList.push_back(item);
         }
     }
 
diff --git a/src/ui/dialog/font-substitution.h b/src/ui/dialog/font-substitution.h
index eed7adcf2..cdb4e22b4 100644
--- a/src/ui/dialog/font-substitution.h
+++ b/src/ui/dialog/font-substitution.h
@@ -25,13 +25,13 @@ public:
     FontSubstitution();
     virtual ~FontSubstitution();
     void checkFontSubstitutions(SPDocument* doc);
-    void show(Glib::ustring out, SelContainer &l);
+    void show(Glib::ustring out, std::vector<SPItem*> &l);
 
     static FontSubstitution &getInstance() { return *new FontSubstitution(); }
     Glib::ustring getSubstituteFontName (Glib::ustring font);
 
 protected:
-    SelContainer getFontReplacedItems(SPDocument* doc, Glib::ustring *out);
+    std::vector<SPItem*> getFontReplacedItems(SPDocument* doc, Glib::ustring *out);
 
 private:
     FontSubstitution(FontSubstitution const &d);
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index 1ef97b996..fa469dc4b 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -578,8 +578,8 @@ void GlyphsPanel::setTargetDesktop(SPDesktop *desktop)
 void GlyphsPanel::insertText()
 {
     SPItem *textItem = 0;
-        SelContainer itemlist=targetDesktop->selection->itemList();
-        for(SelContainer::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
+    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 = SP_ITEM(*i);
             break;
@@ -688,8 +688,8 @@ void GlyphsPanel::selectionModifiedCB(guint flags)
 void GlyphsPanel::calcCanInsert()
 {
     int items = 0;
-    SelContainer itemlist=targetDesktop->selection->itemList();
-    for(SelContainer::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
+    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;
         }
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index ba8616d9b..d62032e9d 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -175,9 +175,9 @@ void GridArrangeTab::arrange()
     desktop->getDocument()->ensureUpToDate();
 
     Inkscape::Selection *selection = desktop->getSelection();
-    const SelContainer items = selection ? selection->itemList() : SelContainer();
+    const std::vector<SPItem*> items = selection ? selection->itemList() : std::vector<SPItem*>();
     cnt=0;
-    for(SelContainer::const_iterator i = items.begin();i!=items.end();i++){
+    for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();i++){
         SPItem *item = SP_ITEM(*i);
         Geom::OptRect b = item->documentVisualBounds();
         if (!b) {
@@ -205,18 +205,17 @@ void GridArrangeTab::arrange()
     // require the sorting done before we can calculate row heights etc.
 
     g_return_if_fail(selection);
-    SelContainer rev(selection->itemList());
-    rev.sort(sp_compare_y_position_obj);
-    SelContainer sorted(rev);
-    sorted.sort(sp_compare_x_position_obj);
+    std::vector<SPItem*> sorted(selection->itemList());
+    sort(sorted.begin(),sorted.end(),sp_compare_y_position);
+    sort(sorted.begin(),sorted.end(),sp_compare_x_position);
 
 
     // Calculate individual Row and Column sizes if necessary
 
 
         cnt=0;
-        const SelContainer sizes(sorted);
-        for (SelContainer::const_iterator i = sizes.begin();i!=sizes.end();i++) {
+        const std::vector<SPItem*> sizes(sorted);
+        for (std::vector<SPItem*>::const_iterator i = sizes.begin();i!=sizes.end();i++) {
             SPItem *item = SP_ITEM(*i);
             Geom::OptRect b = item->documentVisualBounds();
             if (b) {
@@ -314,7 +313,7 @@ g_print("\n row = %f     col = %f selection x= %f selection y = %f", total_row_h
     }
 
     cnt=0;
-    SelContainer::iterator it = sorted.begin();
+    std::vector<SPItem*>::iterator it = sorted.begin();
     for (row_cnt=0; ((it != sorted.end()) && (row_cnt<NoOfRows)); row_cnt++) {
 
              GSList *current_row = NULL;
@@ -382,7 +381,7 @@ void GridArrangeTab::on_row_spinbutton_changed()
     Inkscape::Selection *selection = desktop ? desktop->selection : 0;
     g_return_if_fail( selection );
 
-    SelContainer const items = selection->itemList();
+    std::vector<SPItem*> const items = selection->itemList();
     int selcount = items.size();
 
     double PerCol = ceil(selcount / NoOfColsSpinner.get_value());
@@ -545,7 +544,7 @@ void GridArrangeTab::updateSelection()
     updating = true;
     SPDesktop *desktop = Parent->getDesktop();
     Inkscape::Selection *selection = desktop ? desktop->selection : 0;
-    SelContainer const items = selection ? selection->itemList() : SelContainer();
+    std::vector<SPItem*> const items = selection ? selection->itemList() : std::vector<SPItem*>();
 
     if (!items.empty()) {
         int selcount = items.size();
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 79e5b556d..6ad3d61ac 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -366,8 +366,8 @@ void IconPreviewPanel::refreshPreview()
                 if ( sel ) {
                     //g_message("found a selection to play with");
 
-                    SelContainer const items = sel->itemList();
-                    for(SelContainer::const_iterator i=items.begin();!target && i!=items.end();i++){
+                	std::vector<SPItem*> const items = sel->itemList();
+                    for(std::vector<SPItem*>::const_iterator i=items.begin();!target && i!=items.end();i++){
                         SPItem* item = SP_ITEM( *i);
                         gchar const *id = item->getId();
                         if ( id ) {
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 0ae3027c7..d60780f78 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -479,8 +479,8 @@ void ObjectsPanel::_objectsSelected( Selection *sel ) {
     _selectedConnection.block();
     _tree.get_selection()->unselect_all();
     SPItem *item = NULL;
-    SelContainer const items = sel->itemList();
-    for(SelContainer::const_iterator i=items.begin(); i!=items.end();i++){
+    std::vector<SPItem*> const items = sel->itemList();
+    for(std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end();i++){
         item = reinterpret_cast<SPItem *>(*i);
         if (setOpacity)
         {
diff --git a/src/ui/dialog/pixelartdialog.cpp b/src/ui/dialog/pixelartdialog.cpp
index 273a378e5..760391df6 100644
--- a/src/ui/dialog/pixelartdialog.cpp
+++ b/src/ui/dialog/pixelartdialog.cpp
@@ -372,8 +372,8 @@ void PixelArtDialogImpl::vectorize()
         return;
     }
 
-    SelContainer const items = desktop->selection->itemList();
-    for(SelContainer::const_iterator i=items.begin(); i!=items.end();i++){
+    std::vector<SPItem*> const items = desktop->selection->itemList();
+    for(std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end();i++){
         if ( !SP_IS_IMAGE(*i) )
             continue;
 
diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp
index 8a382fc93..a68e73caf 100644
--- a/src/ui/dialog/polar-arrange-tab.cpp
+++ b/src/ui/dialog/polar-arrange-tab.cpp
@@ -297,14 +297,14 @@ static void moveToPoint(int anchor, SPItem *item, Geom::Point p)
 void PolarArrangeTab::arrange()
 {
 	Inkscape::Selection *selection = parent->getDesktop()->getSelection();
-	const SelContainer tmp(selection->itemList());
+	const std::vector<SPItem*> tmp(selection->itemList());
 	SPGenericEllipse *referenceEllipse = NULL; // Last ellipse in selection
 
 	bool arrangeOnEllipse = !arrangeOnParametersRadio.get_active();
 	bool arrangeOnFirstEllipse = arrangeOnEllipse && arrangeOnFirstCircleRadio.get_active();
 
 	int count = 0;
-	for(SelContainer::const_iterator i=tmp.begin();i!=tmp.end();i++)
+	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++)
 	{
 		if(arrangeOnEllipse)
 		{
@@ -373,7 +373,7 @@ void PolarArrangeTab::arrange()
 	Geom::Point realCenter = Geom::Point(cx, cy) * transformation;
 
 	int i = 0;
-	for(SelContainer::const_iterator it=tmp.begin();it!=tmp.end();it++)
+	for(std::vector<SPItem*>::const_iterator it=tmp.begin();it!=tmp.end();it++)
 	{
 		SPItem *item = SP_ITEM(*it);
 
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index dc98b6032..351971294 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -81,7 +81,7 @@ static void draw_page(
                 width, height,
                 (unsigned long)(Inkscape::Util::Quantity::convert(width, "px", "in") * dpi),
                 (unsigned long)(Inkscape::Util::Quantity::convert(height, "px", "in") * dpi),
-                dpi, dpi, bgcolor, NULL, NULL, true, SelContainer());
+                dpi, dpi, bgcolor, NULL, NULL, true, std::vector<SPItem*>());
 
             // This doesn't seem to work:
             //context->set_cairo_context ( Cairo::Context::create (Cairo::ImageSurface::create_from_png (tmp_png) ), dpi, dpi );
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index da24ad605..72677c07e 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -123,7 +123,7 @@ static void editGradientImpl( SPDesktop* desktop, SPGradient* gr )
         bool shown = false;
         if ( desktop && desktop->doc() ) {
             Inkscape::Selection *selection = desktop->getSelection();
-            SelContainer const items = selection->itemList();
+            std::vector<SPItem*> const items = selection->itemList();
             if (!items.empty()) {
                 SPStyle query( desktop->doc() );
                 int result = objects_query_fillstroke((items), &query, true);
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index ba3a6b914..c2df5fc1c 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -669,8 +669,8 @@ bool TagsPanel::_handleButtonEvent(GdkEventButton* event)
                     if (col == _tree.get_column(COL_ADD - 1) && down_at_add) {
                         if (SP_IS_TAG(obj)) {
                             bool wasadded = false;
-                            SelContainer items=_desktop->selection->itemList();
-                        	for(SelContainer::const_iterator i=items.begin();i!=items.end();i++){
+                            std::vector<SPItem*> items=_desktop->selection->itemList();
+                        	for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
                                 SPObject *newobj = reinterpret_cast<SPObject *>(*i);
                                 bool addchild = true;
                                 for ( SPObject *child = obj->children; child != NULL; child = child->next) {
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index 593261ec5..1c1cf5937 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -418,8 +418,8 @@ SPItem *TextEdit::getSelectedTextItem (void)
     if (!SP_ACTIVE_DESKTOP)
         return NULL;
 
-    SelContainer tmp=SP_ACTIVE_DESKTOP->getSelection()->itemList();
-	for(SelContainer::const_iterator i=tmp.begin();i!=tmp.end();i++)
+    std::vector<SPItem*> tmp=SP_ACTIVE_DESKTOP->getSelection()->itemList();
+	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++)
     {
         if (SP_IS_TEXT(*i) || SP_IS_FLOWTEXT(*i))
             return SP_ITEM (*i);
@@ -436,8 +436,8 @@ unsigned TextEdit::getSelectedTextCount (void)
 
     unsigned int items = 0;
 
-    SelContainer tmp=SP_ACTIVE_DESKTOP->getSelection()->itemList();
-	for(SelContainer::const_iterator i=tmp.begin();i!=tmp.end();i++)
+    std::vector<SPItem*> tmp=SP_ACTIVE_DESKTOP->getSelection()->itemList();
+	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++)
     {
         if (SP_IS_TEXT(*i) || SP_IS_FLOWTEXT(*i))
             ++items;
@@ -540,11 +540,11 @@ void TextEdit::onApply()
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
 
     unsigned items = 0;
-    const SelContainer item_list = desktop->getSelection()->itemList();
+    const std::vector<SPItem*> item_list = desktop->getSelection()->itemList();
     SPCSSAttr *css = fillTextStyle ();
     sp_desktop_set_style(desktop, css, true);
 
-	for(SelContainer::const_iterator i=item_list.begin();i!=item_list.end();i++){
+	for(std::vector<SPItem*>::const_iterator i=item_list.begin();i!=item_list.end();i++){
         // apply style to the reprs of all text objects in the selection
         if (SP_IS_TEXT (*i)) {
 
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 8c52144e0..0f81a7e58 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -741,12 +741,12 @@ void Transformation::applyPageMove(Inkscape::Selection *selection)
         if (_check_move_relative.get_active()) {
             // shift each object relatively to the previous one
             using Inkscape::Util::GSListConstIterator;
-            SelContainer selected(selection->itemList());
+            std::vector<SPItem*> selected(selection->itemList());
             if (selected.empty()) return;
 
             if (fabs(x) > 1e-6) {
                 std::vector< BBoxSort  > sorted;
-                for (SelContainer::iterator it(selected.begin());
+                for (std::vector<SPItem*>::iterator it(selected.begin());
                      it != selected.end();
                      ++it)
                 {
@@ -771,7 +771,7 @@ void Transformation::applyPageMove(Inkscape::Selection *selection)
             }
             if (fabs(y) > 1e-6) {
                 std::vector< BBoxSort  > sorted;
-                for (SelContainer::iterator it(selected.begin());
+                for (std::vector<SPItem*>::iterator it(selected.begin());
                      it != selected.end();
                      ++it)
                 {
@@ -816,8 +816,8 @@ void Transformation::applyPageScale(Inkscape::Selection *selection)
     bool transform_stroke = prefs->getBool("/options/transform/stroke", true);
     bool preserve = prefs->getBool("/options/preservetransform/value", false);
     if (prefs->getBool("/dialogs/transformation/applyseparately")) {
-        SelContainer tmp=selection->itemList();
-    	for(SelContainer::const_iterator i=tmp.begin();i!=tmp.end();i++){
+    	std::vector<SPItem*> tmp=selection->itemList();
+    	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++){
             SPItem *item = SP_ITEM(*i);
             Geom::OptRect bbox_pref = item->desktopPreferredBounds();
             Geom::OptRect bbox_geom = item->desktopGeometricBounds();
@@ -880,8 +880,8 @@ void Transformation::applyPageRotate(Inkscape::Selection *selection)
     }
 
     if (prefs->getBool("/dialogs/transformation/applyseparately")) {
-        SelContainer tmp=selection->itemList();
-    	for(SelContainer::const_iterator i=tmp.begin();i!=tmp.end();i++){
+    	std::vector<SPItem*> tmp=selection->itemList();
+    	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++){
             SPItem *item = SP_ITEM(*i);
             sp_item_rotate_rel(item, Geom::Rotate (angle*M_PI/180.0));
         }
@@ -900,8 +900,8 @@ void Transformation::applyPageSkew(Inkscape::Selection *selection)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     if (prefs->getBool("/dialogs/transformation/applyseparately")) {
-    	SelContainer items=selection->itemList();
-    	for(SelContainer::const_iterator i = items.begin();i!=items.end();i++){
+    	std::vector<SPItem*> items=selection->itemList();
+    	for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();i++){
             SPItem *item = SP_ITEM(*i);
 
             if (!_units_skew.isAbsolute()) { // percentage
@@ -1002,8 +1002,8 @@ void Transformation::applyPageTransform(Inkscape::Selection *selection)
     }
 
     if (_check_replace_matrix.get_active()) {
-        SelContainer tmp=selection->itemList();
-    	for(SelContainer::const_iterator i=tmp.begin();i!=tmp.end();i++){
+    	std::vector<SPItem*> tmp=selection->itemList();
+    	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++){
             SPItem *item = SP_ITEM(*i);
             item->set_item_transform(displayed);
             SP_OBJECT(item)->updateRepr();