From e27b05ef358102fd60235a5f78d7d51e9f25a5f4 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 1 Nov 2010 16:02:28 +0000 Subject: COMMON: Rename String::printf() to String::format() This is a first step towards getting rid of all uses of regular printf, fprintf, vprintf, vfprintf, puts, fputs, etc. in our codebase. The name format() reflects the purpose of the function, and parallels String.format() in Java, boost::format, and others. svn-id: r54004 --- engines/agos/animation.cpp | 4 ++-- engines/agos/saveload.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'engines/agos') diff --git a/engines/agos/animation.cpp b/engines/agos/animation.cpp index af85c50114..4fe8f8e6bc 100644 --- a/engines/agos/animation.cpp +++ b/engines/agos/animation.cpp @@ -250,7 +250,7 @@ bool MoviePlayerDXA::load() { } } - Common::String videoName = Common::String::printf("%s.dxa", baseName); + Common::String videoName = Common::String::format("%s.dxa", baseName); if (!loadFile(videoName)) error("Failed to load video file %s", videoName.c_str()); @@ -410,7 +410,7 @@ MoviePlayerSMK::MoviePlayerSMK(AGOSEngine_Feeble *vm, const char *name) } bool MoviePlayerSMK::load() { - Common::String videoName = Common::String::printf("%s.smk", baseName); + Common::String videoName = Common::String::format("%s.smk", baseName); if (!loadFile(videoName)) error("Failed to load video file %s", videoName.c_str()); diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp index ffa95506c5..eefa2460ec 100644 --- a/engines/agos/saveload.cpp +++ b/engines/agos/saveload.cpp @@ -154,7 +154,7 @@ void AGOSEngine::quickLoadOrSave() { Subroutine *sub; success = loadGame(genSaveName(_saveLoadSlot)); if (!success) { - buf = Common::String::printf(_("Failed to load game state from file:\n\n%s"), filename); + buf = Common::String::format(_("Failed to load game state from file:\n\n%s"), filename); } else if (getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) { drawIconArray(2, me(), 0, 0); setBitFlag(97, true); @@ -189,7 +189,7 @@ void AGOSEngine::quickLoadOrSave() { } else { success = saveGame(_saveLoadSlot, _saveLoadName); if (!success) - buf = Common::String::printf(_("Failed to save game state to file:\n\n%s"), filename); + buf = Common::String::format(_("Failed to save game state to file:\n\n%s"), filename); } if (!success) { @@ -197,7 +197,7 @@ void AGOSEngine::quickLoadOrSave() { dialog.runModal(); } else if (_saveLoadType == 1) { - buf = Common::String::printf(_("Successfully saved game state in file:\n\n%s"), filename); + buf = Common::String::format(_("Successfully saved game state in file:\n\n%s"), filename); GUI::TimedMessageDialog dialog(buf, 1500); dialog.runModal(); -- cgit v1.2.3