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

[fingolfin at users.sourceforge.net]

Revision: 34396
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34396&view=rev
Author:   fingolfin
Date:     2008-09-06 21:23:08 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------
Got rid of File::eof()

Modified Paths:
--------------
    scummvm/trunk/common/file.h
    scummvm/trunk/engines/kyra/vqa.cpp
    scummvm/trunk/engines/m4/resource.cpp
    scummvm/trunk/engines/made/pmvplayer.cpp
    scummvm/trunk/engines/made/redreader.cpp

Modified: scummvm/trunk/common/file.h
===================================================================
--- scummvm/trunk/common/file.h	2008-09-06 21:14:32 UTC (rev 34395)
+++ scummvm/trunk/common/file.h	2008-09-06 21:23:08 UTC (rev 34396)
@@ -92,15 +92,6 @@
 	void clearIOFailed();
 	bool eos() const;
 
-	/**
-	 * Checks for end of file.
-	 *
-	 * @deprecated: use eos() instead
-	 *
-	 * @return: true if the end of file is reached, false otherwise.
-	 */
-	virtual bool eof() const { return eos(); }
-
 	virtual uint32 pos() const;
 	virtual uint32 size() const;
 	void seek(int32 offs, int whence = SEEK_SET);

Modified: scummvm/trunk/engines/kyra/vqa.cpp
===================================================================
--- scummvm/trunk/engines/kyra/vqa.cpp	2008-09-06 21:14:32 UTC (rev 34395)
+++ scummvm/trunk/engines/kyra/vqa.cpp	2008-09-06 21:23:08 UTC (rev 34396)
@@ -323,7 +323,7 @@
 					uint32 scanTag = readTag();
 					uint32 scanSize = _file.readUint32BE();
 
-					if (_file.eof())
+					if (_file.eos())
 						break;
 
 					if (scanTag == MKID_BE('VQFR')) {
@@ -396,7 +396,7 @@
 		uint32 tag = readTag();
 		uint32 size = _file.readUint32BE();
 
-		if (_file.eof()) {
+		if (_file.eos()) {
 			// This happens at the last frame. Apparently it has
 			// no sound?
 			break;
@@ -596,7 +596,7 @@
 			uint32 tag = readTag();
 			uint32 size = _file.readUint32BE();
 
-			if (_file.eof()) {
+			if (_file.eos()) {
 				warning("VQAMovie::play: Unexpected EOF");
 				break;
 			}

Modified: scummvm/trunk/engines/m4/resource.cpp
===================================================================
--- scummvm/trunk/engines/m4/resource.cpp	2008-09-06 21:14:32 UTC (rev 34395)
+++ scummvm/trunk/engines/m4/resource.cpp	2008-09-06 21:23:08 UTC (rev 34396)
@@ -76,11 +76,11 @@
 	}
 
 	/* load hagfile records and update the list */
-	while (!hashFile.eof()) {
+	while (!hashFile.eos()) {
 		HashHagEntry entry;
 		hashFile.read(entry.filename, kM4MaxFilenameSize);
 		entry.fileIndex = hashFile.readByte();
-		if (hashFile.eof())
+		if (hashFile.eos())
 			break;
 
 		changeExtension(_hagEntries[entry.fileIndex].filename, entry.filename, "HAG");

Modified: scummvm/trunk/engines/made/pmvplayer.cpp
===================================================================
--- scummvm/trunk/engines/made/pmvplayer.cpp	2008-09-06 21:14:32 UTC (rev 34395)
+++ scummvm/trunk/engines/made/pmvplayer.cpp	2008-09-06 21:23:08 UTC (rev 34396)
@@ -95,13 +95,13 @@
 	// get it to work well?
 	_audioStream = Audio::makeAppendableAudioStream(soundFreq, Audio::Mixer::FLAG_UNSIGNED);
 
-	while (!_abort && !_fd->eof()) {
+	while (!_abort && !_fd->eos()) {
 
 		int32 frameTime = _vm->_system->getMillis();
 
 		readChunk(chunkType, chunkSize);
 
-		if (_fd->eof())
+		if (_fd->eos())
 			break;
 
 		frameData = new byte[chunkSize];

Modified: scummvm/trunk/engines/made/redreader.cpp
===================================================================
--- scummvm/trunk/engines/made/redreader.cpp	2008-09-06 21:14:32 UTC (rev 34395)
+++ scummvm/trunk/engines/made/redreader.cpp	2008-09-06 21:23:08 UTC (rev 34396)
@@ -55,7 +55,7 @@
 
 bool RedReader::seekFile(Common::File &fd, FileEntry &fileEntry, const char *filename) {
 	char arcFilename[13];
-	while (!fd.eof()) {
+	while (!fd.eos()) {
 		fd.skip(8); // skip unknown
 		fileEntry.compSize = fd.readUint32LE();
 		fileEntry.origSize = fd.readUint32LE();


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