diff options
author | Max Horn | 2006-03-28 09:42:54 +0000 |
---|---|---|
committer | Max Horn | 2006-03-28 09:42:54 +0000 |
commit | 9f93e5bb81a54a98eb7957209662f152e2962679 (patch) | |
tree | ffd439f7aa7347bd7ba806c2131be458a7112ef1 /gui/options.cpp | |
parent | 950c3451a2dbadffa6437e98a20eb3a4163216e2 (diff) | |
download | scummvm-rg350-9f93e5bb81a54a98eb7957209662f152e2962679.tar.gz scummvm-rg350-9f93e5bb81a54a98eb7957209662f152e2962679.tar.bz2 scummvm-rg350-9f93e5bb81a54a98eb7957209662f152e2962679.zip |
Renamed various container isEmpty() methods to empty() to match STL conventions
svn-id: r21472
Diffstat (limited to 'gui/options.cpp')
-rw-r--r-- | gui/options.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gui/options.cpp b/gui/options.cpp index 504281e5f7..be99f0c8f6 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -514,7 +514,7 @@ void GlobalOptionsDialog::open() { Common::String extraPath(ConfMan.get("extrapath", _domain)); Common::String soundFont(ConfMan.get("soundfont", _domain)); - if (!dir.isEmpty()) { + if (!dir.empty()) { _savePath->setLabel(dir); } else { // Default to the current directory... @@ -523,13 +523,13 @@ void GlobalOptionsDialog::open() { _savePath->setLabel(buf); } - if (extraPath.isEmpty() || !ConfMan.hasKey("extrapath", _domain)) { + if (extraPath.empty() || !ConfMan.hasKey("extrapath", _domain)) { _extraPath->setLabel("None"); } else { _extraPath->setLabel(extraPath); } - if (soundFont.isEmpty() || !ConfMan.hasKey("soundfont", _domain)) { + if (soundFont.empty() || !ConfMan.hasKey("soundfont", _domain)) { _soundFont->setLabel("None"); } else { _soundFont->setLabel(soundFont); @@ -543,11 +543,11 @@ void GlobalOptionsDialog::close() { ConfMan.set("savepath", _savePath->getLabel(), _domain); String extraPath = _extraPath->getLabel(); - if (!extraPath.isEmpty() && (extraPath != "None")) + if (!extraPath.empty() && (extraPath != "None")) ConfMan.set("extrapath", extraPath, _domain); String soundFont = _soundFont->getLabel(); - if (!soundFont.isEmpty() && (soundFont != "None")) + if (!soundFont.empty() && (soundFont != "None")) ConfMan.set("soundfont", soundFont, _domain); } OptionsDialog::close(); |