X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcollection.h;h=3d5b7f0a6abce95bc8aa5d6ec05749be3ec6f8b2;hb=8955db30f9cd1c1566b349da29e669f065f84e36;hp=66c50fe69d2c86e85ce38ac1e2b4bb73fd8672b3;hpb=495920e971324d29bd4933b8a319fb5668ca5562;p=libs%2Fdatafile.git

diff --git a/source/collection.h b/source/collection.h
index 66c50fe..3d5b7f0 100644
--- a/source/collection.h
+++ b/source/collection.h
@@ -55,34 +55,27 @@ public:
 		template<typename T> friend class CollectionItemType;
 
 	private:
-		template<typename T, typename S, bool = NeedsCollection<typename T::Loader>::value>
-		struct Add;
-
 		Collection &coll;
 
 	public:
 		Loader(Collection &);
 		Collection &get_object() const { return coll; }
 	private:
-		template<typename T, typename S, typename C>
-		void coll_item(const std::string &n)
-		{
-			RefPtr<T> it = new T;
-			load_sub(*it, dynamic_cast<C &>(coll));
-			coll.add<S>(n, it.get());
-			it.release();
-		}
-
 		template<typename T, typename S>
 		void item(const std::string &n)
 		{
 			RefPtr<T> it = new T;
-			load_sub(*it);
+			ItemLoader<T> ldr(*it, coll);
+			load_sub_with(ldr);
 			coll.add<S>(n, it.get());
 			it.release();
 		}
 	};
 
+protected:
+	template<typename T, bool = NeedsCollection<typename T::Loader>::value>
+	class ItemLoader;
+
 private:
 	typedef std::map<std::string, Variant> ItemMap;
 	typedef std::list<CollectionItemTypeBase *> TypeList;
@@ -146,7 +139,7 @@ public:
 	{
 		typedef typename RemoveConst<T>::Type NCT;
 
-		T *ptr = get_item(items, name).value<RefPtr<NCT> >();
+		T *ptr = get_item(items, name).value<RefPtr<NCT> >().get();
 		if(!ptr)
 			throw key_error(typeid(ItemMap));
 		return *ptr;
@@ -159,7 +152,7 @@ public:
 
 private:
 	template<typename T>
-	void collect_items(std::list<T *> *objects, std::list<std::string> *names, std::list<std::string> *future_names)
+	void collect_items(std::list<T *> *objects, std::list<std::string> *names, std::list<std::string> *future_names) const
 	{
 		typedef RefPtr<typename RemoveConst<T>::Type> RPNCT;
 
@@ -272,19 +265,22 @@ protected:
 	CollectionItemType<T> &add_type();
 };
 
-
-template<typename T, typename S>
-struct Collection::Loader::Add<T, S, false>
+template<typename T>
+class Collection::ItemLoader<T, false>: public T::Loader
 {
-	static void add(Loader &loader, const std::string &kwd)
-	{ loader.add(kwd, &Loader::item<T, S>); }
+public:
+	ItemLoader(T &o, Collection &):
+		T::Loader(o)
+	{ }
 };
 
-template<typename T, typename S>
-struct Collection::Loader::Add<T, S, true>
+template<typename T>
+class Collection::ItemLoader<T, true>: public T::Loader
 {
-	static void add(Loader &loader, const std::string &kwd)
-	{ loader.add(kwd, &Loader::coll_item<T, S, typename T::Loader::Collection>); }
+public:
+	ItemLoader(T &o, Collection &c):
+		T::Loader(o, dynamic_cast<typename T::Loader::Collection &>(c))
+	{ }
 };
 
 
@@ -383,7 +379,7 @@ private:
 		{ return RefPtr<S>(0); }
 
 		virtual void add_to_loader(Collection::Loader &loader, const std::string &kwd)
-		{ Collection::Loader::Add<T, S>::add(loader, kwd); }
+		{ loader.add(kwd, &Collection::Loader::item<T, S>); }
 	};
 
 	CreatorBase *creat;