X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fobjectpass.h;h=e3cac702362191a33759ed3da535ba6e384633a4;hp=e8190fa7f7c98e4cf13044b08fb446f750ec6d98;hb=927a1aa0a3a27e463ec0efc08bd08e7c4e969909;hpb=56c9bfa0b47583fb9067705a69c3639a17d4a097

diff --git a/source/objectpass.h b/source/objectpass.h
index e8190fa7..e3cac702 100644
--- a/source/objectpass.h
+++ b/source/objectpass.h
@@ -8,7 +8,7 @@ Distributed under the LGPL
 #ifndef MSP_GL_OBJECTPASS_H_
 #define MSP_GL_OBJECTPASS_H_
 
-#include <msp/datafile/collection.h>
+#include <msp/datafile/objectloader.h>
 
 namespace Msp {
 namespace GL {
@@ -18,19 +18,10 @@ class ProgramData;
 
 struct ObjectPass
 {
-	class Loader: public DataFile::Loader
+	class Loader: public DataFile::CollectionObjectLoader<ObjectPass>
 	{
-	public:
-		typedef DataFile::Collection Collection;
-
-	private:
-		ObjectPass &pass;
-		Collection &coll;
-
 	public:
 		Loader(ObjectPass &, Collection &);
-		ObjectPass &get_object() const { return pass; }
-		Collection &get_collection() const { return coll; }
 	private:
 		void shader(const std::string &);
 	};