X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Ffile.h;h=f23cc93e7d013b71dc33cbe060cd83ce939fbe4a;hp=5fb0353211b2e99d23384afa2924e87ee78acc10;hb=991fabc1956b73a4007859058fb44171000b452e;hpb=8642ac1b4478419630911a51a53fe8ef5fb46647

diff --git a/source/io/file.h b/source/io/file.h
index 5fb0353..f23cc93 100644
--- a/source/io/file.h
+++ b/source/io/file.h
@@ -4,7 +4,6 @@
 #include <stdexcept>
 #include <string>
 #include "buffered.h"
-#include "filtered.h"
 #include "handle.h"
 #include "seekable.h"
 
@@ -15,12 +14,14 @@ class file_not_found: public std::runtime_error
 {
 public:
 	file_not_found(const std::string &fn): std::runtime_error(fn) { }
+	~file_not_found() throw() override = default;
 };
 
 class file_already_exists: public std::runtime_error
 {
 public:
 	file_already_exists(const std::string &fn): std::runtime_error(fn) { }
+	~file_already_exists() throw() override = default;
 };
 
 
@@ -50,21 +51,25 @@ 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);
-	virtual ~File();
+private:
+	void platform_init(const std::string &, CreateMode);
+public:
+	~File() override;
 
-	void set_block(bool);
+	void set_block(bool) override;
+	void set_inherit(bool) override;
 
 protected:
-	virtual unsigned do_write(const char *, unsigned);
-	virtual unsigned do_read(char *, unsigned);
+	std::size_t do_write(const char *, std::size_t) override;
+	std::size_t do_read(char *, std::size_t) override;
 
 public:
-	virtual void sync();
+	void sync();
 
-	virtual SeekOffset seek(SeekOffset, SeekType);
-	virtual SeekOffset tell() const;
+	SeekOffset seek(SeekOffset, SeekType) override;
+	SeekOffset tell() const override;
 
-	virtual const Handle &get_handle(Mode);
+	const Handle &get_handle(Mode) override;
 };
 
 inline File::CreateMode operator|(File::CreateMode m, File::CreateMode n)
@@ -76,7 +81,34 @@ 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);
+
+	void set_block(bool) override;
+	void set_inherit(bool) override;
+
+protected:
+	std::size_t do_write(const char *, std::size_t) override;
+	std::size_t do_read(char *, std::size_t) override;
+public:
+	std::size_t put(char) override;
+
+	bool getline(std::string &) override;
+	int get() override;
+
+	const Handle &get_handle(Mode) override;
+
+	SeekOffset seek(SeekOffset, SeekType) override;
+	SeekOffset tell() const override { return position; }
+};
 
 } // namespace IO
 } // namespace Msp