X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Floader.h;h=3c4785c493017eadeef3f2c20bb70e05b4bb9cf8;hb=7df5e45c7f414f6a07681dc4ec2abb63b091a309;hp=126de575ba027fb0cd241ee4a8f5beb0654550b7;hpb=e2a4cefe59dd3e6e1b2fac2fb7232326bb2b0787;p=libs%2Fdatafile.git

diff --git a/source/loader.h b/source/loader.h
index 126de57..3c4785c 100644
--- a/source/loader.h
+++ b/source/loader.h
@@ -1,15 +1,7 @@
-/* $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_
 
 #include <map>
-#include <msp/io/buffered.h>
 #include <msp/io/file.h>
 #include "except.h"
 #include "loaderaction.h"
@@ -202,10 +194,9 @@ Loads an object from a file.  The object must have a public Loader class.
 template<typename T>
 void load(T &obj, const std::string &fn)
 {
-	IO::File in(fn);
-	IO::Buffered buf(in);
+	IO::BufferedFile in(fn);
 
-	Parser parser(buf, fn);
+	Parser parser(in, fn);
 	typename T::Loader loader(obj);
 	loader.load(parser);
 }
@@ -213,10 +204,9 @@ void load(T &obj, const std::string &fn)
 template<typename T, typename U>
 void load(T &obj, const std::string &fn, U &arg)
 {
-	IO::File in(fn);
-	IO::Buffered buf(in);
+	IO::BufferedFile in(fn);
 
-	Parser parser(buf, fn);
+	Parser parser(in, fn);
 	typename T::Loader loader(obj, arg);
 	loader.load(parser);
 }