aboutsummaryrefslogtreecommitdiff
path: root/base/main.cpp
diff options
context:
space:
mode:
authorMax Horn2006-03-28 09:42:54 +0000
committerMax Horn2006-03-28 09:42:54 +0000
commit9f93e5bb81a54a98eb7957209662f152e2962679 (patch)
treeffd439f7aa7347bd7ba806c2131be458a7112ef1 /base/main.cpp
parent950c3451a2dbadffa6437e98a20eb3a4163216e2 (diff)
downloadscummvm-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 'base/main.cpp')
-rw-r--r--base/main.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/base/main.cpp b/base/main.cpp
index 6eacd122f8..56a820f438 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -297,11 +297,11 @@ static int runGame(GameDetector &detector, OSystem &system, const Common::String
Common::String caption(ConfMan.get("description", detector._targetName));
Common::String desc = GameDetector::findGame(detector._gameid).description;
- if (caption.isEmpty() && !desc.isEmpty())
+ if (caption.empty() && !desc.empty())
caption = desc;
- if (caption.isEmpty())
+ if (caption.empty())
caption = detector._targetName;
- if (!caption.isEmpty()) {
+ if (!caption.empty()) {
system.setWindowCaption(caption.c_str());
}
@@ -494,7 +494,7 @@ extern "C" int main(int argc, char *argv[]) {
system.setWindowCaption(gScummVMFullVersion);
// Unless a game was specified, show the launcher dialog
- if (detector._targetName.isEmpty())
+ if (detector._targetName.empty())
running = launcherDialog(detector, system);
else
// Setup a dummy palette, for the mouse cursor, in case an error