libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-19 00:15:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reduce usage of Common::String::emptyString

Browse Source 
svn-id: r44603
This commit is contained in:
Max Horn 2009-10-04 11:58:52 +00:00
parent f8e8e764ce
commit 696fd7af20
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/config-manager.h
View File

@ -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);

2
common/fs.cpp
View File

@ -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) {

4
engines/parallaction/disk.h
View File

@ -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:

2
engines/parallaction/disk_br.cpp
View File

@ -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++)