X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Ffile.h;h=57dc6831449416a0a0e9af75626ac1702757c8ce;hp=47111609e8adb238f5bfef24132f81c6e8a9b8a2;hb=31e72f50fbb34d86877e5110401c49ce3fefd4bb;hpb=8f2711fba7a2817840038630d9cf9a2060ecbe8e

diff --git a/source/io/file.h b/source/io/file.h
index 4711160..57dc683 100644
--- a/source/io/file.h
+++ b/source/io/file.h
@@ -3,10 +3,10 @@
 
 #include <stdexcept>
 #include <string>
-#include "base.h"
 #include "buffered.h"
 #include "filtered.h"
-#include "seek.h"
+#include "handle.h"
+#include "seekable.h"
 
 namespace Msp {
 namespace IO {
@@ -23,7 +23,7 @@ A class for reading and writing files.
 
 Non-blocking mode is not supported on Win32.
 */
-class File: public Base
+class File: public Seekable
 {
 public:
 	enum CreateMode
@@ -56,13 +56,10 @@ protected:
 public:
 	virtual void sync();
 
-	/** Changes the read/write offset of the file.  Returns the new offset. */
-	virtual int seek(int, SeekType);
-	
-	/** Returns the current read/write offset of the file. */
-	virtual int tell() const;
+	virtual unsigned seek(int, SeekType);
+	virtual unsigned tell() const;
 
-	virtual Handle get_event_handle() { return handle; }
+	virtual const Handle &get_event_handle() { return handle; }
 
 private:
 	void check_access(Mode) const;