X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.h;h=4ea7994e757f76476dda000f20c67fa44e21fee9;hb=e4beb0453a1cfe200fc97607afab94c3ddee1c65;hp=221361694282228b3e3e1c9b3508505d5b327f9c;hpb=eb0f6a0fc9ad34a54df2d9f22e4326c23ddb5bc6;p=libs%2Fdatafile.git

diff --git a/source/loader.h b/source/loader.h
index 2213616..4ea7994 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2006-2008, 2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_DATAFILE_LOADER_H_
 #define MSP_DATAFILE_LOADER_H_
 
@@ -38,7 +31,7 @@ When loading has finished successfully, the virtual function finish() is
 called.  Any post-processing of the data should be placed here and not in the
 destructor.
 
-See also classes BasicLoader and BasicLoader2.
+See also classes ObjectLoader and CollectionObjectLoader in objectloader.h.
 */
 class Loader
 {
@@ -59,15 +52,12 @@ private:
 	const Statement *cur_st;
 	bool sub_loaded;
 protected:
-	bool allow_pointer_reload;
 	bool check_sub_loads;
 
 	Loader();
 public:
 	virtual ~Loader();
 
-	bool is_pointer_reload_allowed() const { return allow_pointer_reload; }
-
 	/** Loads statements from a parser. */
 	void load(Parser &p);
 
@@ -159,42 +149,6 @@ protected:
 };
 
 
-/**
-Deprecated.  See ObjectLoader in objectloader.h.
-*/
-template<typename O>
-class BasicLoader: public Loader
-{
-public:
-	typedef O Object;
-
-protected:
-	O &obj;
-
-public:
-	BasicLoader(O &o): obj(o) { }
-	O &get_object() const { return obj; }
-};
-
-
-/**
-Deprecated.  See CollectionObjectLoader in objectloader.h.
-*/
-template<typename O, typename C>
-class BasicLoader2: public BasicLoader<O>
-{
-public:
-	typedef C Collection;
-
-protected:
-	C &coll;
-
-public:
-	BasicLoader2(O &o, C &c): BasicLoader<O>(o), coll(c) { }
-	C &get_collection() const { return coll; }
-};
-
-
 /**
 Loads an object from a file.  The object must have a public Loader class.
 */