[Scummvm-git-logs] scummvm master -> 0ff6909fbd4b46c6983255279cb1f93bb5a60c0c
sev-
noreply at scummvm.org
Fri May 3 21:52:39 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
0ff6909fbd COMMON: Remove deprecated SeekableSubReadStreamEndian class
Commit: 0ff6909fbd4b46c6983255279cb1f93bb5a60c0c
https://github.com/scummvm/scummvm/commit/0ff6909fbd4b46c6983255279cb1f93bb5a60c0c
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2024-05-03T23:52:36+02:00
Commit Message:
COMMON: Remove deprecated SeekableSubReadStreamEndian class
Changed paths:
common/substream.h
diff --git a/common/substream.h b/common/substream.h
index ef5b0e63421..1ae816d5c50 100644
--- a/common/substream.h
+++ b/common/substream.h
@@ -88,30 +88,6 @@ public:
virtual bool seek(int64 offset, int whence = SEEK_SET);
};
-/**
- * This is a SeekableSubReadStream subclass which adds non-endian
- * read methods whose endianness is set on the stream creation.
- *
- * Manipulating the parent stream directly /will/ mess up a substream.
- * @see SubReadStream
- */
-class SeekableSubReadStreamEndian : virtual public SeekableSubReadStream, virtual public SeekableReadStreamEndian {
-public:
- WARN_DEPRECATED("Use SeekableReadStreamEndianWrapper with SeekableSubReadStream instead")
- SeekableSubReadStreamEndian(SeekableReadStream *parentStream, uint32 begin, uint32 end, bool bigEndian, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO)
- : SeekableSubReadStream(parentStream, begin, end, disposeParentStream),
- SeekableReadStreamEndian(bigEndian),
- ReadStreamEndian(bigEndian) {
- }
-
- int64 pos() const override { return SeekableSubReadStream::pos(); }
- int64 size() const override { return SeekableSubReadStream::size(); }
-
- bool seek(int64 offset, int whence = SEEK_SET) override { return SeekableSubReadStream::seek(offset, whence); }
- void hexdump(int len, int bytesPerLine = 16, int startOffset = 0) { SeekableSubReadStream::hexdump(len, bytesPerLine, startOffset); }
- bool skip(uint32 offset) override { return SeekableSubReadStream::seek(offset, SEEK_CUR); }
-};
-
/**
* A seekable substream that removes the exclusivity demand required by the
* normal SeekableSubReadStream, at the cost of seek()ing the parent stream
More information about the Scummvm-git-logs
mailing list