X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcollection.h;h=5fcaab34f35345406de07e372a70cb972efc2a67;hb=0812e7601e9ef6081d01b243ba0365aed652d773;hp=e7d173d061ed7947750702d8fe1681cd2e44bcb5;hpb=1d9c21a8a301007fb242e05b69cc6390ec566273;p=libs%2Fdatafile.git

diff --git a/source/collection.h b/source/collection.h
index e7d173d..5fcaab3 100644
--- a/source/collection.h
+++ b/source/collection.h
@@ -9,7 +9,6 @@ Distributed under the LGPL
 #define MSP_DATAFILE_COLLECTION_H_
 
 #include <msp/core/refptr.h>
-#include "item.h"
 #include "loader.h"
 
 namespace Msp {
@@ -32,6 +31,14 @@ struct NeedsCollection
 	enum { result=(sizeof(f<T>(0))==sizeof(Yes)) };
 };
 
+template<typename T>
+struct RemoveConst
+{ typedef T Type; };
+
+template<typename T>
+struct RemoveConst<const T>
+{ typedef T Type; };
+
 /**
 A collection of objects that can be loaded from a datafile.  Each object is
 identified by a name, which must be unique across the entire collection.
@@ -98,12 +105,15 @@ private:
 		virtual ~ItemCreatorBase() { }
 
 		template<typename S>
-		S *create(Collection &coll, const std::string &name)
+		bool create(Collection &coll, const std::string &name, S *&ptr)
 		{
 			ItemCreatorBridge<S> *creator=dynamic_cast<ItemCreatorBridge<S> *>(this);
 			if(creator)
-				return creator->create(coll, name);
-			return 0;
+			{
+				ptr=creator->create(coll, name);
+				return true;
+			}
+			return false;
 		}
 	};
 
@@ -168,7 +178,10 @@ private:
 	ItemKeywordSeq keywords;
 	ItemCreatorSeq creators;
 
+	Collection(const Collection &);
+	Collection &operator=(const Collection &);
 public:
+	Collection() { }
 	virtual ~Collection();
 
 	/**
@@ -181,24 +194,26 @@ public:
 		if(items.count(name))
 			throw KeyError("Duplicate key '"+name+"' in collection");
 
-		items[name]=new Item<T>(d);
+		items[name]=new Item<typename RemoveConst<T>::Type>(d);
 	}
 
 	/**
 	Gets an object of a specific type from the collection.
 	*/
 	template<typename T>
-	T &get(const std::string &name) const
+	T *get(const std::string &name) const
 	{
+		typedef typename RemoveConst<T>::Type NCT;
+
 		ItemMap::const_iterator i=items.find(name);
 		if(i==items.end())
 			throw KeyError("Item '"+name+"' not found in collection");
 
-		const Item<T> *item=dynamic_cast<const Item<T> *>(i->second);
+		const Item<NCT> *item=dynamic_cast<const Item<NCT> *>(i->second);
 		if(!item)
 			throw TypeError("Item '"+name+"' is not of correct type");
 
-		return *item->data;
+		return item->data;
 	}
 
 	/**
@@ -207,26 +222,31 @@ public:
 	invoked.
 	*/
 	template<typename T>
-	T &get(const std::string &name)
+	T *get(const std::string &name)
 	{
+		typedef typename RemoveConst<T>::Type NCT;
+
 		ItemMap::const_iterator i=items.find(name);
 		if(i==items.end())
 		{
 			for(ItemCreatorSeq::iterator j=creators.begin(); j!=creators.end(); ++j)
-				if(T *d=(*j)->create<T>(*this, name))
+			{
+				NCT *d=0;
+				if((*j)->create(*this, name, d))
 				{
 					// We already know that the item didn't exist yet
-					items[name]=new Item<T>(d);
-					return *d;
+					items[name]=new Item<NCT>(d);
+					return d;
 				}
+			}
 			throw KeyError("Item '"+name+"' not found in collection");
 		}
 
-		const Item<T> *item=dynamic_cast<const Item<T> *>(i->second);
+		const Item<NCT> *item=dynamic_cast<const Item<NCT> *>(i->second);
 		if(!item)
 			throw TypeError("Item '"+name+"' is not of correct type");
 
-		return *item->data;
+		return item->data;
 	}
 
 	/**
@@ -237,11 +257,26 @@ public:
 	{
 		std::list<std::string> result;
 		for(ItemMap::const_iterator i=items.begin(); i!=items.end(); ++i)
-			if(dynamic_cast<const Item<T> *>(i->second))
+			if(dynamic_cast<const Item<typename RemoveConst<T>::Type> *>(i->second))
 				result.push_back(i->first);
 		return result;
 	}
 
+	/**
+	Returns a list of objects of a specific type in the collection.
+	*/
+	template<typename T>
+	std::list<T *> get_list() const
+	{
+		typedef typename RemoveConst<T>::Type NCT;
+
+		std::list<T *> result;
+		for(ItemMap::const_iterator i=items.begin(); i!=items.end(); ++i)
+			if(Item<NCT> *item=dynamic_cast<Item<NCT> *>(i->second))
+				result.push_back(item->data);
+		return result;
+	}
+
 	/**
 	Checks whether a name exists in the collection.  Does not care about the
 	type of the object.