Some more code reformatting

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

diff --git a/source/input.h b/source/input.h
index e03dea1e839714e23416b8fed7fea7cb68f8ed97..e5748662d5a899b9f5b4b6201c69687c084da401 100644 (file)
--- a/source/input.h
+++ b/source/input.h
@@ -7,23 +7,25 @@ Distributed under the LGPL
 #ifndef MSP_DATAFILE_INPUT_H_
 #define MSP_DATAFILE_INPUT_H_
 
-#include <istream>
+#include <msp/io/base.h>
 
 namespace Msp {
 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 in; }
-private:
-       std::istream &in;
-       unsigned line;
-       int next;
+       operator bool() const;
 };  
 
 } // namespace DataFile