X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcollection.h;h=85ca843f5e1aba552ab2c2ed26a7241d30675d0b;hb=92644bf892df1220c8df67e1fc3da85dd02c53c5;hp=e7d173d061ed7947750702d8fe1681cd2e44bcb5;hpb=1d9c21a8a301007fb242e05b69cc6390ec566273;p=libs%2Fdatafile.git

diff --git a/source/collection.h b/source/collection.h
index e7d173d..85ca843 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.
@@ -168,7 +175,10 @@ private:
 	ItemKeywordSeq keywords;
 	ItemCreatorSeq creators;
 
+	Collection(const Collection &);
+	Collection &operator=(const Collection &);
 public:
+	Collection() { }
 	virtual ~Collection();
 
 	/**
@@ -181,7 +191,7 @@ 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);
 	}
 
 	/**
@@ -190,11 +200,13 @@ public:
 	template<typename T>
 	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");
 
@@ -209,20 +221,22 @@ public:
 	template<typename T>
 	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))
+				if(NCT *d=(*j)->create<NCT>(*this, name))
 				{
 					// We already know that the item didn't exist yet
-					items[name]=new Item<T>(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");