[Scummvm-cvs-logs] SF.net SVN: scummvm:[42910] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 42910
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42910&view=rev
Author:   fingolfin
Date:     2009-07-29 21:39:00 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
Removed last traces of clearIOFailed. Yay :)

Modified Paths:
--------------
    scummvm/trunk/common/file.cpp
    scummvm/trunk/common/file.h
    scummvm/trunk/engines/scumm/resource_v2.cpp
    scummvm/trunk/engines/scumm/resource_v3.cpp

Modified: scummvm/trunk/common/file.cpp
===================================================================
--- scummvm/trunk/common/file.cpp	2009-07-29 20:42:55 UTC (rev 42909)
+++ scummvm/trunk/common/file.cpp	2009-07-29 21:39:00 UTC (rev 42910)
@@ -124,11 +124,6 @@
 	return !_handle || (eos() || err());
 }
 
-void File::clearIOFailed() {
-	if (_handle)
-		_handle->clearErr();
-}
-
 bool File::err() const {
 	assert(_handle);
 	return _handle->err();

Modified: scummvm/trunk/common/file.h
===================================================================
--- scummvm/trunk/common/file.h	2009-07-29 20:42:55 UTC (rev 42909)
+++ scummvm/trunk/common/file.h	2009-07-29 21:39:00 UTC (rev 42910)
@@ -133,12 +133,6 @@
 	 */
 	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

Modified: scummvm/trunk/engines/scumm/resource_v2.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource_v2.cpp	2009-07-29 20:42:55 UTC (rev 42909)
+++ scummvm/trunk/engines/scumm/resource_v2.cpp	2009-07-29 21:39:00 UTC (rev 42910)
@@ -138,7 +138,7 @@
 	_fileHandle->seek(_numScripts * 3, SEEK_CUR);
 	_numSounds = _fileHandle->readByte();
 
-	_fileHandle->clearIOFailed();
+	_fileHandle->clearErr();
 	_fileHandle->seek(0, SEEK_SET);
 
 	readMAXS(0);

Modified: scummvm/trunk/engines/scumm/resource_v3.cpp
===================================================================
--- scummvm/trunk/engines/scumm/resource_v3.cpp	2009-07-29 20:42:55 UTC (rev 42909)
+++ scummvm/trunk/engines/scumm/resource_v3.cpp	2009-07-29 21:39:00 UTC (rev 42910)
@@ -80,7 +80,7 @@
 	_fileHandle->seek(_numScripts * 3, SEEK_CUR);
 	_numSounds = _fileHandle->readByte();
 
-	_fileHandle->clearIOFailed();
+	_fileHandle->clearErr();
 	_fileHandle->seek(0, SEEK_SET);
 
 	readMAXS(0);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.