Add an intermediate Seekable interface class

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

diff --git a/source/io/file.h b/source/io/file.h
index 47111609e8adb238f5bfef24132f81c6e8a9b8a2..d59cd577fc0f33e1acbcbb62bcaa9fa0bb31c141 100644 (file)
--- a/source/io/file.h
+++ b/source/io/file.h
@@ -3,10 +3,9 @@
 
 #include <stdexcept>
 #include <string>
-#include "base.h"
 #include "buffered.h"
 #include "filtered.h"
-#include "seek.h"
+#include "seekable.h"
 
 namespace Msp {
 namespace IO {
@@ -23,7 +22,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,11 +55,8 @@ 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; }