Rewrite BufferedFile as a standalone class

[libs/core.git] / source / io / file.h

diff --git a/source/io/file.h b/source/io/file.h
index 90a1041ccda6520db5386b724f43fe6e936bfe85..d34273477736c21efdd01335e75306b52f7ba990 100644 (file)
--- a/source/io/file.h
+++ b/source/io/file.h
@@ -52,6 +52,9 @@ public:
        write access is requested and the file does exist, it is created.  Otherwise
        a missing file is an error. */
        File(const std::string &, Mode = M_READ, CreateMode = C_OVERWRITE);
+private:
+       void platform_init(const std::string &, CreateMode);
+public:
        virtual ~File();
 
        void set_block(bool);
@@ -78,7 +81,29 @@ inline File::CreateMode operator&(File::CreateMode m, File::CreateMode n)
 inline File::CreateMode operator~(File::CreateMode m)
 { return File::CreateMode(~static_cast<int>(m)); }
 
-typedef Filtered<File, Buffered> BufferedFile;
+
+class BufferedFile: public Seekable
+{
+private:
+       File file;
+       Buffered buffer;
+       SeekOffset position;
+
+public:
+       BufferedFile(const std::string &, Mode = M_READ, File::CreateMode = File::C_OVERWRITE);
+
+protected:
+       virtual unsigned do_write(const char *, unsigned);
+       virtual unsigned do_read(char *, unsigned);
+public:
+       virtual unsigned put(char);
+
+       virtual bool getline(std::string &);
+       virtual int get();
+
+       virtual SeekOffset seek(SeekOffset, SeekType);
+       virtual SeekOffset tell() const { return position; }
+};
 
 } // namespace IO
 } // namespace Msp