Renamed various container isEmpty() methods to empty() to match STL conventions

svn-id: r21472

2 files changed, 7 insertions, 7 deletions

diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 6e89c95f73..63cb075401 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -257,7 +257,7 @@ void listTargets() {
 		String name(iter->_key);
 		String description(iter->_value.get("description"));
 
-		if (description.isEmpty()) {
+		if (description.empty()) {
 			// FIXME: At this point, we should check for a "gameid" override
 			// to find the proper desc. In fact, the platform probably should
 			// be taken into account, too.
@@ -634,7 +634,7 @@ void GameDetector::setTarget(const String &target) {
 }
 
 bool GameDetector::detectMain() {
-	if (_targetName.isEmpty()) {
+	if (_targetName.empty()) {
 		warning("No game was specified...");
 		return false;
 	}
@@ -656,7 +656,7 @@ bool GameDetector::detectMain() {
 	printf("Trying to start game '%s'\n", game.description.c_str());
 
 	String gameDataPath(ConfMan.get("path"));
-	if (gameDataPath.isEmpty()) {
+	if (gameDataPath.empty()) {
 		warning("No path was provided. Assuming the data files are in the current directory");
 		gameDataPath = "./";
 	} else if (gameDataPath.lastChar() != '/'
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