[Scummvm-cvs-logs] CVS: scummvm/common file.cpp,1.50,1.51 file.h,1.19,1.20

[Max Horn]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv6368

Modified Files:
	file.cpp file.h 
Log Message:
be stricter about File::open params

Index: file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- file.cpp	30 Nov 2003 00:06:27 -0000	1.50
+++ file.cpp	25 Dec 2003 17:52:25 -0000	1.51
@@ -138,7 +138,7 @@
 	delete [] _name;
 }
 
-bool File::open(const char *filename, const char *directory, int mode, byte encbyte) {
+bool File::open(const char *filename, const char *directory, AccessMode mode, byte encbyte) {
 	if (_handle) {
 		debug(2, "File %s already opened", filename);
 		return false;

Index: file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- file.h	30 Nov 2003 00:06:27 -0000	1.19
+++ file.h	25 Dec 2003 17:52:25 -0000	1.20
@@ -39,7 +39,7 @@
 	static Common::String _defaultDirectory;
 
 public:
-	enum {
+	enum AccessMode {
 		kFileReadMode = 1,
 		kFileWriteMode = 2
 	};
@@ -49,7 +49,7 @@
 	File();
 	virtual ~File();
 	bool open(const char *filename, const Common::String &directory) { return open(filename, directory.c_str()); }
-	bool open(const char *filename, const char *directory = NULL, int mode = kFileReadMode, byte encbyte = 0);
+	bool open(const char *filename, const char *directory = NULL, AccessMode mode = kFileReadMode, byte encbyte = 0);
 	void close();
 	bool isOpen() const;
 	bool ioFailed() const;