[Scummvm-cvs-logs] CVS: scummvm/common file.cpp,1.47,1.48 file.h,1.16,1.17

[Max Horn]

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

Modified Files:
	file.cpp file.h 
Log Message:
some cleanup

Index: file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- file.cpp	24 Sep 2003 06:19:30 -0000	1.47
+++ file.cpp	10 Oct 2003 13:55:06 -0000	1.48
@@ -23,7 +23,7 @@
 #include "common/util.h"
 
 
-char *File::_defaultDirectory = 0;
+Common::String File::_defaultDirectory;
 
 
 FILE *File::fopenNoCase(const char *filename, const char *directory, const char *mode) {
@@ -119,9 +119,8 @@
 	return NULL;
 }
 
-void File::setDefaultDirectory(const char *directory) {
-	free(_defaultDirectory);
-	_defaultDirectory = strdup(directory);
+void File::setDefaultDirectory(const Common::String &directory) {
+	_defaultDirectory = directory;
 }
 
 File::File() {
@@ -147,7 +146,7 @@
 	
 	// If no directory was specified, use the default directory (if any).
 	if (directory == NULL)
-		directory = _defaultDirectory ? _defaultDirectory : "";
+		directory = _defaultDirectory.isEmpty() ? "" : _defaultDirectory.c_str();
 
 	clearIOFailed();
 

Index: file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- file.h	17 Sep 2003 21:06:15 -0000	1.16
+++ file.h	10 Oct 2003 13:55:06 -0000	1.17
@@ -24,6 +24,7 @@
 
 #include "stdafx.h"
 #include "common/scummsys.h"
+#include "common/str.h"
 
 class File {
 private:
@@ -35,7 +36,7 @@
 
 	static FILE *fopenNoCase(const char *filename, const char *directory, const char *mode);
 	
-	static char *_defaultDirectory;
+	static Common::String _defaultDirectory;
 
 public:
 	enum {
@@ -43,10 +44,11 @@
 		kFileWriteMode = 2
 	};
 	
-	static void setDefaultDirectory(const char *directory);
+	static void setDefaultDirectory(const Common::String &directory);
 	
 	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);
 	void close();
 	bool isOpen();