[Scummvm-cvs-logs] SF.net SVN: scummvm:[34682] scummvm/trunk/engines/scumm

[fingolfin at users.sourceforge.net]

Revision: 34682
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34682&view=rev
Author:   fingolfin
Date:     2008-09-29 11:01:25 +0000 (Mon, 29 Sep 2008)

Log Message:
-----------
Added const qualifiers

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

Modified: scummvm/trunk/engines/scumm/file.cpp
===================================================================
--- scummvm/trunk/engines/scumm/file.cpp	2008-09-29 10:49:36 UTC (rev 34681)
+++ scummvm/trunk/engines/scumm/file.cpp	2008-09-29 11:01:25 UTC (rev 34682)
@@ -125,15 +125,15 @@
 }
 
 
-bool ScummFile::eos() {
+bool ScummFile::eos() const {
 	return _subFileLen ? (pos() >= _subFileLen) : File::eos(); // FIXME
 }
 
-int32 ScummFile::pos() {
+int32 ScummFile::pos() const {
 	return File::pos() - _subFileStart;
 }
 
-int32 ScummFile::size() {
+int32 ScummFile::size() const {
 	return _subFileLen ? _subFileLen : File::size();
 }
 

Modified: scummvm/trunk/engines/scumm/file.h
===================================================================
--- scummvm/trunk/engines/scumm/file.h	2008-09-29 10:49:36 UTC (rev 34681)
+++ scummvm/trunk/engines/scumm/file.h	2008-09-29 11:01:25 UTC (rev 34682)
@@ -39,9 +39,9 @@
 	virtual bool open(const Common::String &filename) = 0;
 	virtual bool openSubFile(const Common::String &filename) = 0;
 
-	virtual bool eos() = 0;
-	virtual int32 pos() = 0;
-	virtual int32 size() = 0;
+	virtual bool eos() const = 0;
+	virtual int32 pos() const = 0;
+	virtual int32 size() const = 0;
 	virtual bool seek(int32 offs, int whence = SEEK_SET) = 0;
 	virtual uint32 read(void *dataPtr, uint32 dataSize) = 0;
 };
@@ -66,9 +66,9 @@
 	bool ioFailed() const { return _myIoFailed || BaseScummFile::ioFailed(); }
 	void clearIOFailed() { _myIoFailed = false; BaseScummFile::clearIOFailed(); }
 
-	bool eos();
-	int32 pos();
-	int32 size();
+	bool eos() const;
+	int32 pos() const;
+	int32 size() const;
 	bool seek(int32 offs, int whence = SEEK_SET);
 	uint32 read(void *dataPtr, uint32 dataSize);
 };
@@ -111,9 +111,9 @@
 	bool openSubFile(const Common::String &filename);
 
 	void close();
-	bool eos() { return _stream->eos(); }
-	int32 pos() { return _stream->pos(); }
-	int32 size() { return _stream->size(); }
+	bool eos() const { return _stream->eos(); }
+	int32 pos() const { return _stream->pos(); }
+	int32 size() const { return _stream->size(); }
 	bool seek(int32 offs, int whence = SEEK_SET) { return _stream->seek(offs, whence); }
 	uint32 read(void *dataPtr, uint32 dataSize) { return _stream->read(dataPtr, dataSize); }
 };


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