diff options
Diffstat (limited to 'common/file.h')
| -rw-r--r-- | common/file.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/common/file.h b/common/file.h index ead42c0788..9669158503 100644 --- a/common/file.h +++ b/common/file.h @@ -27,7 +27,9 @@ #include "common/str.h" #include "common/stream.h" -class File : public Common::SeekableReadStream, public Common::WriteStream { +namespace Common { + +class File : public SeekableReadStream, public WriteStream { protected: /** POSIX file handle to the actual file; 0 if no file is open. */ FILE *_handle; @@ -39,10 +41,10 @@ protected: int32 _refcount; /** The name of this file, for debugging. */ - Common::String _name; + String _name; - static Common::StringList _defaultDirectories; + static StringList _defaultDirectories; public: enum AccessMode { @@ -50,7 +52,7 @@ public: kFileWriteMode = 2 }; - static void addDefaultDirectory(const Common::String &directory); + static void addDefaultDirectory(const String &directory); static void resetDefaultDirectories(); File(); @@ -76,4 +78,6 @@ public: uint32 write(const void *dataPtr, uint32 dataSize); }; +} // End of namespace Common + #endif |