diff options
| author | Max Horn | 2009-07-29 21:39:00 +0000 |
|---|---|---|
| committer | Max Horn | 2009-07-29 21:39:00 +0000 |
| commit | 6df25f47c3a794eb7d10ecebc7d05cab8552dc9f (patch) | |
| tree | ecdadfbb713ad6f11ed6328bc9c05552fe98d387 | |
| parent | d91d68a9ca03b69d285517736c62d5cd9f70d63b (diff) | |
| download | scummvm-rg350-6df25f47c3a794eb7d10ecebc7d05cab8552dc9f.tar.gz scummvm-rg350-6df25f47c3a794eb7d10ecebc7d05cab8552dc9f.tar.bz2 scummvm-rg350-6df25f47c3a794eb7d10ecebc7d05cab8552dc9f.zip | |
Removed last traces of clearIOFailed. Yay :)
svn-id: r42910
| -rw-r--r-- | common/file.cpp | 5 | ||||
| -rw-r--r-- | common/file.h | 6 | ||||
| -rw-r--r-- | engines/scumm/resource_v2.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/resource_v3.cpp | 2 |
4 files changed, 2 insertions, 13 deletions
diff --git a/common/file.cpp b/common/file.cpp index 7836a7d4a8..69338f32f9 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -124,11 +124,6 @@ bool File::ioFailed() const { return !_handle || (eos() || err()); } -void File::clearIOFailed() { - if (_handle) - _handle->clearErr(); -} - bool File::err() const { assert(_handle); return _handle->err(); diff --git a/common/file.h b/common/file.h index a98d23a96a..892395a184 100644 --- a/common/file.h +++ b/common/file.h @@ -133,12 +133,6 @@ public: */ bool ioFailed() const; - /** - * DEPRECATED: Don't use this unless you are still using ioFailed(). - * Reset the I/O error status. - */ - void clearIOFailed(); - bool err() const; // implement abstract Stream method void clearErr(); // implement abstract Stream method bool eos() const; // implement abstract SeekableReadStream method diff --git a/engines/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp index 184f3d94df..e469c721b1 100644 --- a/engines/scumm/resource_v2.cpp +++ b/engines/scumm/resource_v2.cpp @@ -138,7 +138,7 @@ void ScummEngine_v2::readEnhancedIndexFile() { _fileHandle->seek(_numScripts * 3, SEEK_CUR); _numSounds = _fileHandle->readByte(); - _fileHandle->clearIOFailed(); + _fileHandle->clearErr(); _fileHandle->seek(0, SEEK_SET); readMAXS(0); diff --git a/engines/scumm/resource_v3.cpp b/engines/scumm/resource_v3.cpp index 420f71cf03..0728395055 100644 --- a/engines/scumm/resource_v3.cpp +++ b/engines/scumm/resource_v3.cpp @@ -80,7 +80,7 @@ void ScummEngine_v3old::readIndexFile() { _fileHandle->seek(_numScripts * 3, SEEK_CUR); _numSounds = _fileHandle->readByte(); - _fileHandle->clearIOFailed(); + _fileHandle->clearErr(); _fileHandle->seek(0, SEEK_SET); readMAXS(0); |