diff options
Diffstat (limited to 'core/fxcrt/fx_stream.h')
| -rw-r--r-- | core/fxcrt/fx_stream.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/core/fxcrt/fx_stream.h b/core/fxcrt/fx_stream.h index 08331e9bf0..d7944167c6 100644 --- a/core/fxcrt/fx_stream.h +++ b/core/fxcrt/fx_stream.h @@ -7,9 +7,9 @@ #ifndef CORE_FXCRT_FX_STREAM_H_ #define CORE_FXCRT_FX_STREAM_H_ -#include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_string.h" #include "core/fxcrt/fx_system.h" +#include "core/fxcrt/retain_ptr.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ #include <direct.h> @@ -36,7 +36,7 @@ void FX_CloseFolder(FX_FileHandle* handle); #define FX_FILEMODE_ReadOnly 1 #define FX_FILEMODE_Truncate 2 -class IFX_WriteStream : virtual public CFX_Retainable { +class IFX_WriteStream : virtual public Retainable { public: virtual bool WriteBlock(const void* pData, size_t size) = 0; virtual bool WriteString(const ByteStringView& str) = 0; @@ -49,7 +49,7 @@ class IFX_ArchiveStream : public IFX_WriteStream { virtual FX_FILESIZE CurrentOffset() const = 0; }; -class IFX_ReadStream : virtual public CFX_Retainable { +class IFX_ReadStream : virtual public Retainable { public: virtual bool IsEOF() = 0; virtual FX_FILESIZE GetPosition() = 0; @@ -70,7 +70,7 @@ class IFX_SeekableWriteStream : public IFX_WriteStream { class IFX_SeekableReadStream : public IFX_ReadStream { public: - static CFX_RetainPtr<IFX_SeekableReadStream> CreateFromFilename( + static RetainPtr<IFX_SeekableReadStream> CreateFromFilename( const char* filename); // IFX_ReadStream: @@ -85,11 +85,10 @@ class IFX_SeekableReadStream : public IFX_ReadStream { class IFX_SeekableStream : public IFX_SeekableReadStream, public IFX_SeekableWriteStream { public: - static CFX_RetainPtr<IFX_SeekableStream> CreateFromFilename( - const char* filename, - uint32_t dwModes); + static RetainPtr<IFX_SeekableStream> CreateFromFilename(const char* filename, + uint32_t dwModes); - static CFX_RetainPtr<IFX_SeekableStream> CreateFromFilename( + static RetainPtr<IFX_SeekableStream> CreateFromFilename( const wchar_t* filename, uint32_t dwModes); |