diff options
author | Johannes Schickel | 2012-03-11 00:51:20 +0100 |
---|---|---|
committer | Johannes Schickel | 2012-03-11 00:51:20 +0100 |
commit | 48efab4e5abd8954b7167074b46ff078f6e0d7f4 (patch) | |
tree | fdec16829249529eacdbe35e22f2a242e425c7d1 /common | |
parent | 5e52b0a5d46e4c5b230cba7464301484d27804f7 (diff) | |
download | scummvm-rg350-48efab4e5abd8954b7167074b46ff078f6e0d7f4.tar.gz scummvm-rg350-48efab4e5abd8954b7167074b46ff078f6e0d7f4.tar.bz2 scummvm-rg350-48efab4e5abd8954b7167074b46ff078f6e0d7f4.zip |
COMMON: Rename SafeSubReadStream to SafeSeekableSubReadStream.
It actually inherits from SeekableSubReadStream, so it should be named
accordingly.
Diffstat (limited to 'common')
-rw-r--r-- | common/stream.cpp | 2 | ||||
-rw-r--r-- | common/substream.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/common/stream.cpp b/common/stream.cpp index 30b3bca497..85647bfe3a 100644 --- a/common/stream.cpp +++ b/common/stream.cpp @@ -240,7 +240,7 @@ bool SeekableSubReadStream::seek(int32 offset, int whence) { return ret; } -uint32 SafeSubReadStream::read(void *dataPtr, uint32 dataSize) { +uint32 SafeSeekableSubReadStream::read(void *dataPtr, uint32 dataSize) { // Make sure the parent stream is at the right position seek(0, SEEK_CUR); diff --git a/common/substream.h b/common/substream.h index 6475b7aa14..1ad588a43d 100644 --- a/common/substream.h +++ b/common/substream.h @@ -99,14 +99,14 @@ public: * normal SeekableSubReadStream, at the cost of seek()ing the parent stream * before each read(). * - * More than one SafeSubReadStream to the same parent stream can be used + * More than one SafeSeekableSubReadStream to the same parent stream can be used * at the same time; they won't mess up each other. They will, however, * reposition the parent stream, so don't depend on its position to be - * the same after a read() or seek() on one of its SafeSubReadStream. + * the same after a read() or seek() on one of its SafeSeekableSubReadStream. */ -class SafeSubReadStream : public SeekableSubReadStream { +class SafeSeekableSubReadStream : public SeekableSubReadStream { public: - SafeSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO) + SafeSeekableSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO) : SeekableSubReadStream(parentStream, begin, end, disposeParentStream) { } |