From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 19 Apr 2020 13:22:51 +0000 (+0300)
Subject: Prefer vector over list
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=a887b3f7518605c22e4b70eeb9fe136acb2ea632;p=libs%2Fdatafile.git

Prefer vector over list
---

diff --git a/source/collection.cpp b/source/collection.cpp
index 9f135f0..129c0a8 100644
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -44,7 +44,7 @@ const Variant &Collection::get_var(const string &name, const CollectionItemTypeB
 	return get_item(items, name);
 }
 
-void Collection::gather_items(list<const Variant *> *vars, list<string> *names, const CollectionItemTypeBase &type, bool include_sources) const
+void Collection::gather_items(vector<const Variant *> *vars, list<string> *names, const CollectionItemTypeBase &type, bool include_sources) const
 {
 	for(ItemMap::const_iterator i=items.begin(); i!=items.end(); ++i)
 		if(type.check_item_type(i->second))
diff --git a/source/collection.h b/source/collection.h
index 005abd0..5521975 100644
--- 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);
 	}
diff --git a/source/loader.cpp b/source/loader.cpp
index a05e5f0..55492b6 100644
--- a/source/loader.cpp
+++ b/source/loader.cpp
@@ -116,7 +116,7 @@ void Loader::load_statement(const Statement &st)
 
 		if(!aux_loaders.empty() && !has_action(key))
 		{
-			for(list<Loader *>::const_iterator i=aux_loaders.begin(); i!=aux_loaders.end(); ++i)
+			for(vector<Loader *>::const_iterator i=aux_loaders.begin(); i!=aux_loaders.end(); ++i)
 				if((*i)->has_action(key))
 					return (*i)->load_statement(st);
 		}
diff --git a/source/loader.h b/source/loader.h
index 3e39872..de0b32d 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -44,7 +44,7 @@ private:
 	const Statement *cur_st;
 	bool sub_loaded;
 	bool direct;
-	std::list<Loader *> aux_loaders;
+	std::vector<Loader *> aux_loaders;
 protected:
 	bool check_sub_loads;