X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcollection.h;h=5521975402d0526773a44bf6210c9577b87d0f79;hb=a887b3f7518605c22e4b70eeb9fe136acb2ea632;hp=39e6f43b2b3674b12c9d96e4de64f1fc1a2d4e49;hpb=ecaedcbad1193cefc7b54508e43233e94d6dbeed;p=libs%2Fdatafile.git

diff --git a/source/collection.h b/source/collection.h
index 39e6f43..5521975 100644
--- a/source/collection.h
+++ b/source/collection.h
@@ -1,6 +1,7 @@
 #ifndef MSP_DATAFILE_COLLECTION_H_
 #define MSP_DATAFILE_COLLECTION_H_
 
+#include <msp/core/attributes.h>
 #include <msp/core/maputils.h>
 #include <msp/core/refptr.h>
 #include "collectionsource.h"
@@ -68,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;
@@ -127,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);
@@ -170,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);
 	}
@@ -184,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);
 	}
@@ -236,6 +237,11 @@ protected:
 	template<typename T>
 	CollectionItemType<T> &add_type();
 
+	/** Returns a mutable reference to an existing type descriptor.  This can be
+	used to e.g. override the creator function of a type added by a base class. */
+	template<typename T>
+	CollectionItemType<T> &modify_type();
+
 private:
 	/** Returns the descriptor for a type, or null if one isn't defined.  An
 	optional name can be given to prioritize matching types. */
@@ -260,7 +266,8 @@ public:
 	IO::Seekable *open_raw(const std::string &) const;
 
 protected:
-	IO::Seekable *open_from_sources(const std::string &n) { return open_raw(n); }
+	// Deprecated.  Use open_raw instead.
+	DEPRECATED IO::Seekable *open_from_sources(const std::string &n) { return open_raw(n); }
 
 private:
 	void gather_names_from_sources(std::list<std::string> &, const CollectionItemTypeBase &) const;
@@ -486,6 +493,16 @@ CollectionItemType<T> &Collection::add_type()
 	return *type;
 }
 
+template<typename T>
+CollectionItemType<T> &Collection::modify_type()
+{
+	for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
+		if(CollectionItemType<T> *t = dynamic_cast<CollectionItemType<T> *>(*j))
+			return *t;
+
+	throw std::logic_error("type not found in collection");
+}
+
 template<typename T>
 CollectionItemTypeBase *Collection::get_type(const std::string &name) const
 {