X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.h;h=416bda012dde1992e42417b3912f42721344da08;hb=d87f58bb5d86ff73fca840d448d1c330fd6aa905;hp=221361694282228b3e3e1c9b3508505d5b327f9c;hpb=eb0f6a0fc9ad34a54df2d9f22e4326c23ddb5bc6;p=libs%2Fdatafile.git diff --git a/source/loader.h b/source/loader.h index 2213616..416bda0 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 { @@ -159,42 +152,6 @@ protected: }; -/** -Deprecated. See ObjectLoader in objectloader.h. -*/ -template -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 -class BasicLoader2: public BasicLoader -{ -public: - typedef C Collection; - -protected: - C &coll; - -public: - BasicLoader2(O &o, C &c): BasicLoader(o), coll(c) { } - C &get_collection() const { return coll; } -}; - - /** Loads an object from a file. The object must have a public Loader class. */