[Scummvm-cvs-logs] CVS: scummvm/backends/fs fs.h,1.15,1.16

Max Horn fingolfin at users.sourceforge.net
Wed Feb 4 16:23:31 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/fs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6094/backends/fs

Modified Files:
	fs.h 
Log Message:
renamed (Const)Iterator to (const_)iterator; changed size() to return an uint

Index: fs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/fs/fs.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- fs.h	1 Feb 2004 01:31:49 -0000	1.15
+++ fs.h	5 Feb 2004 00:19:53 -0000	1.16
@@ -151,14 +151,14 @@
  */
 class FSList : Common::List<FilesystemNode *> {
 public:
-	class ConstIterator {
+	class const_iterator {
 		friend class FSList;
 		FilesystemNode **_data;
-		ConstIterator(FilesystemNode **data) : _data(data) { }
+		const_iterator(FilesystemNode **data) : _data(data) { }
 	public:
 		const FilesystemNode &operator *() const { return **_data; }
 		const FilesystemNode *operator->() const { return *_data; }
-		bool operator !=(const ConstIterator &iter) const { return _data != iter._data; }
+		bool operator !=(const const_iterator &iter) const { return _data != iter._data; }
 		void operator ++() { ++_data; }
 	};
 
@@ -187,12 +187,12 @@
 
 	int size() const	{ return _size; }
 
-	ConstIterator	begin() const {
-		return ConstIterator(_data);
+	const_iterator	begin() const {
+		return const_iterator(_data);
 	}
 
-	ConstIterator	end() const {
-		return ConstIterator(_data + _size);
+	const_iterator	end() const {
+		return const_iterator(_data + _size);
 	}
 
 };





More information about the Scummvm-git-logs mailing list