Put a few std::vector<SPitem*>

(bzr r13922.1.5)

1 files changed, 27 insertions, 27 deletions

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();