diff options
author | Max Horn | 2010-11-18 16:38:03 +0000 |
---|---|---|
committer | Max Horn | 2010-11-18 16:38:03 +0000 |
commit | a008d1405582e1a25e5dea57b19d03899f44542d (patch) | |
tree | bbe73d970029d3acd94a5f47f266b00e4490c520 /engines/gob | |
parent | 4707b610fca45c0762e25994594fc58557945a02 (diff) | |
download | scummvm-rg350-a008d1405582e1a25e5dea57b19d03899f44542d.tar.gz scummvm-rg350-a008d1405582e1a25e5dea57b19d03899f44542d.tar.bz2 scummvm-rg350-a008d1405582e1a25e5dea57b19d03899f44542d.zip |
ENGINES: Do not use MemoryReadStream where (Seekable)ReadStream suffices; avoid using 'using'
svn-id: r54323
Diffstat (limited to 'engines/gob')
-rw-r--r-- | engines/gob/resources.cpp | 4 | ||||
-rw-r--r-- | engines/gob/resources.h | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/gob/resources.cpp b/engines/gob/resources.cpp index b5b3d7aaa2..9b0cc39215 100644 --- a/engines/gob/resources.cpp +++ b/engines/gob/resources.cpp @@ -71,7 +71,7 @@ int16 Resource::getHeight() const { return _height; } -Common::MemoryReadStream *Resource::stream() const { +Common::SeekableReadStream *Resource::stream() const { return _stream; } @@ -95,7 +95,7 @@ int32 TextItem::getSize() const { return _size; } -Common::MemoryReadStream *TextItem::stream() const { +Common::SeekableReadStream *TextItem::stream() const { return _stream; } diff --git a/engines/gob/resources.h b/engines/gob/resources.h index 7511185954..9921dc6e76 100644 --- a/engines/gob/resources.h +++ b/engines/gob/resources.h @@ -29,7 +29,7 @@ #include "common/str.h" namespace Common { - class MemoryReadStream; + class SeekableReadStream; } namespace Gob { @@ -47,7 +47,7 @@ public: int16 getWidth () const; int16 getHeight() const; - Common::MemoryReadStream *stream() const; + Common::SeekableReadStream *stream() const; private: byte *_data; @@ -56,7 +56,7 @@ private: int16 _height; bool _needFree; - Common::MemoryReadStream *_stream; + Common::SeekableReadStream *_stream; }; class TextItem { @@ -67,13 +67,13 @@ public: byte *getData() const; int32 getSize() const; - Common::MemoryReadStream *stream() const; + Common::SeekableReadStream *stream() const; private: byte *_data; int32 _size; - Common::MemoryReadStream *_stream; + Common::SeekableReadStream *_stream; }; class Resources { |