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

[fingolfin at users.sourceforge.net]

Revision: 44603
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44603&view=rev
Author:   fingolfin
Date:     2009-10-04 11:58:52 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
Reduce usage of Common::String::emptyString

Modified Paths:
--------------
    scummvm/trunk/common/config-manager.h
    scummvm/trunk/common/fs.cpp
    scummvm/trunk/engines/parallaction/disk.h
    scummvm/trunk/engines/parallaction/disk_br.cpp

Modified: scummvm/trunk/common/config-manager.h
===================================================================
--- scummvm/trunk/common/config-manager.h	2009-10-04 11:42:26 UTC (rev 44602)
+++ scummvm/trunk/common/config-manager.h	2009-10-04 11:58:52 UTC (rev 44603)
@@ -132,10 +132,10 @@
 	//
 	// Some additional convenience accessors.
 	//
-	int					getInt(const String &key, const String &domName = String::emptyString) const;
-	bool				getBool(const String &key, const String &domName = String::emptyString) const;
-	void				setInt(const String &key, int value, const String &domName = String::emptyString);
-	void				setBool(const String &key, bool value, const String &domName = String::emptyString);
+	int					getInt(const String &key, const String &domName = String()) const;
+	bool				getBool(const String &key, const String &domName = String()) const;
+	void				setInt(const String &key, int value, const String &domName = String());
+	void				setBool(const String &key, bool value, const String &domName = String());
 
 
 	void				registerDefault(const String &key, const String &value);

Modified: scummvm/trunk/common/fs.cpp
===================================================================
--- scummvm/trunk/common/fs.cpp	2009-10-04 11:42:26 UTC (rev 44602)
+++ scummvm/trunk/common/fs.cpp	2009-10-04 11:58:52 UTC (rev 44603)
@@ -249,7 +249,7 @@
 }
 
 FSDirectory *FSDirectory::getSubDirectory(const String &name, int depth, bool flat) {
-	return getSubDirectory(String::emptyString, name, depth, flat);
+	return getSubDirectory(String(), name, depth, flat);
 }
 
 FSDirectory *FSDirectory::getSubDirectory(const String &prefix, const String &name, int depth, bool flat) {

Modified: scummvm/trunk/engines/parallaction/disk.h
===================================================================
--- scummvm/trunk/engines/parallaction/disk.h	2009-10-04 11:42:26 UTC (rev 44602)
+++ scummvm/trunk/engines/parallaction/disk.h	2009-10-04 11:58:52 UTC (rev 44603)
@@ -224,8 +224,8 @@
 	uint16			_language;
 	Common::String		_currentPart;
 
-	Common::SeekableReadStream *tryOpenFile(const Common::String &name, const Common::String &ext = Common::String::emptyString);
-	Common::SeekableReadStream *openFile(const Common::String &name, const Common::String &ext = Common::String::emptyString);
+	Common::SeekableReadStream *tryOpenFile(const Common::String &name, const Common::String &ext = Common::String());
+	Common::SeekableReadStream *openFile(const Common::String &name, const Common::String &ext = Common::String());
 	void errorFileNotFound(const Common::String &filename);
 
 public:

Modified: scummvm/trunk/engines/parallaction/disk_br.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_br.cpp	2009-10-04 11:42:26 UTC (rev 44602)
+++ scummvm/trunk/engines/parallaction/disk_br.cpp	2009-10-04 11:58:52 UTC (rev 44603)
@@ -442,7 +442,7 @@
 	_sset.add("base", _baseDir, 5, false);
 
 	const Common::String subDirNames[3] = { "fonts", "backs", "common" };
-	const Common::String subDirPrefixes[3] = { "fonts", "backs", Common::String::emptyString };
+	const Common::String subDirPrefixes[3] = { "fonts", "backs", "" };
 	// The common sub directory, doesn't exist in the Amiga demo
 	uint numDir = (_vm->getFeatures() & GF_DEMO) ? 2 : 3;
 	for (uint i = 0; i < numDir; i++)


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