Some more code reformatting

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

diff --git a/source/input.h b/source/input.h
index 12d3eff08dff23156fe3f43a59037157e21aface..e5748662d5a899b9f5b4b6201c69687c084da401 100644 (file)
--- a/source/input.h
+++ b/source/input.h
@@ -1,31 +1,34 @@
-/*
-This file is part of libmspparser
-Copyright © 2006 Mikko Rasa, Mikkosoft Productions
+/* $Id$
+
+This file is part of libmspdatafile
+Copyright © 2006  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
-#ifndef MSP_PARSER_INPUT_H_
-#define MSP_PARSER_INPUT_H_
+#ifndef MSP_DATAFILE_INPUT_H_
+#define MSP_DATAFILE_INPUT_H_
 
-#include <istream>
+#include <msp/io/base.h>
 
 namespace Msp {
-namespace Parser {
+namespace DataFile {
 
 class Input
 {   
+private:
+       IO::Base &in;
+       unsigned line;
+       int next;
+
 public:
-       Input(std::istream &); 
+       Input(IO::Base &); 
+
        int get();
        int peek();
        unsigned get_line_number() const { return line; }
-       operator bool() const { return (bool)in; }
-private:
-       std::istream &in;
-       unsigned line;
-       int next;
+       operator bool() const;
 };  
 
-} // namespace Parser
+} // namespace DataFile
 } // namespace Msp
 
 #endif