diff options
| author | Max Horn | 2009-10-04 11:58:52 +0000 |
|---|---|---|
| committer | Max Horn | 2009-10-04 11:58:52 +0000 |
| commit | 696fd7af203e28c1f3821ceea56b48d83d28fdd5 (patch) | |
| tree | 8fb69e98c832f9e381e03de786c3fb25b5fbd782 | |
| parent | f8e8e764ceeca1ae61a6058cca7fdf94718c4518 (diff) | |
| download | scummvm-rg350-696fd7af203e28c1f3821ceea56b48d83d28fdd5.tar.gz scummvm-rg350-696fd7af203e28c1f3821ceea56b48d83d28fdd5.tar.bz2 scummvm-rg350-696fd7af203e28c1f3821ceea56b48d83d28fdd5.zip | |
Reduce usage of Common::String::emptyString
svn-id: r44603
| -rw-r--r-- | common/config-manager.h | 8 | ||||
| -rw-r--r-- | common/fs.cpp | 2 | ||||
| -rw-r--r-- | engines/parallaction/disk.h | 4 | ||||
| -rw-r--r-- | engines/parallaction/disk_br.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/common/config-manager.h b/common/config-manager.h index bc734dbdc3..75e6ee6449 100644 --- a/common/config-manager.h +++ b/common/config-manager.h @@ -132,10 +132,10 @@ public: // // 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); diff --git a/common/fs.cpp b/common/fs.cpp index 1bc1c370b9..fac4dae733 100644 --- a/common/fs.cpp +++ b/common/fs.cpp @@ -249,7 +249,7 @@ SeekableReadStream *FSDirectory::createReadStreamForMember(const String &name) c } 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) { diff --git a/engines/parallaction/disk.h b/engines/parallaction/disk.h index a9da429473..8f0768b09c 100644 --- a/engines/parallaction/disk.h +++ b/engines/parallaction/disk.h @@ -224,8 +224,8 @@ protected: 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: diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp index 46c849e6f2..2506da52b8 100644 --- a/engines/parallaction/disk_br.cpp +++ b/engines/parallaction/disk_br.cpp @@ -442,7 +442,7 @@ void AmigaDisk_br::init() { _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++) |