Use the functions from maputils.h in various places

[libs/datafile.git] / source / parser.h

diff --git a/source/parser.h b/source/parser.h
index c830c3c8367f5c082788ad864f23eed84266439a..a89799bd0558cf54c6fbb2e547e406afd9b132a4 100644 (file)
--- a/source/parser.h
+++ b/source/parser.h
@@ -1,14 +1,6 @@
-/* $Id$
-
-This file is part of libmspdatafile
-Copyright © 2006-2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_DATAFILE_PARSER_H_
 #define MSP_DATAFILE_PARSER_H_
 
-#include <istream>
 #include <string>
 #include "input.h"
 
@@ -28,12 +20,13 @@ class Parser
 {
 private:
        Input       in;
+       std::string main_src;
        std::string src;
        bool        good;
        ParserMode  *mode;
 
 public:
-       Parser(std::istream &i, const std::string &s);
+       Parser(IO::Base &i, const std::string &s);
        ~Parser();
 
        /**