Prefer vector over list

[libs/datafile.git] / source / collection.h

diff --git a/source/collection.h b/source/collection.h
index 005abd0db39e3c54c8b934ea784e5431164d70e4..5521975402d0526773a44bf6210c9577b87d0f79 100644 (file)
--- a/source/collection.h
+++ b/source/collection.h
@@ -69,8 +69,8 @@ public:
 
 private:
        typedef std::map<std::string, Variant> ItemMap;
-       typedef std::list<CollectionItemTypeBase *> TypeList;
-       typedef std::list<const CollectionSource *> SourceList;
+       typedef std::vector<CollectionItemTypeBase *> TypeList;
+       typedef std::vector<const CollectionSource *> SourceList;
 
        TypeList types;
        ItemMap items;
@@ -128,18 +128,18 @@ private:
        T &extract(const Variant &var) const;
 
        template<typename T>
-       std::list<T *> extract_list(const std::list<const Variant *> &vars) const
+       std::list<T *> extract_list(const std::vector<const Variant *> &vars) const
        {
                std::list<T *> result;
-               for(std::list<const Variant *>::const_iterator i=vars.begin(); i!=vars.end(); ++i)
+               for(std::vector<const Variant *>::const_iterator i=vars.begin(); i!=vars.end(); ++i)
                        result.push_back(&extract<T>(**i));
                return result;
        }
 
-       void gather_items(std::list<const Variant *> *, std::list<std::string> *, const CollectionItemTypeBase &, bool) const;
+       void gather_items(std::vector<const Variant *> *, std::list<std::string> *, const CollectionItemTypeBase &, bool) const;
 
        template<typename T>
-       void gather_items(std::list<const Variant *> *vars, std::list<std::string> *names, const CollectionItemTypeBase *type, bool include_sources) const
+       void gather_items(std::vector<const Variant *> *vars, std::list<std::string> *names, const CollectionItemTypeBase *type, bool include_sources) const
        {
                if(type || (type = get_type<T>()))
                        gather_items(vars, names, *type, include_sources);
@@ -171,7 +171,7 @@ public:
        template<typename T>
        std::list<T *> get_list() const
        {
-               std::list<const Variant *> vars;
+               std::vector<const Variant *> vars;
                gather_items<typename RemoveConst<T>::Type>(&vars, 0, 0, false);
                return extract_list<T>(vars);
        }
@@ -185,7 +185,7 @@ public:
                if(type)
                        load_items_from_sources(*type);
 
-               std::list<const Variant *> vars;
+               std::vector<const Variant *> vars;
                gather_items<typename RemoveConst<T>::Type>(&vars, 0, type, true);
                return extract_list<T>(vars);
        }