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

3 files changed, 9 insertions, 9 deletions

diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp
index 4381dad6f7..90f2e3ae34 100644
--- a/engines/toon/audio.cpp
+++ b/engines/toon/audio.cpp
@@ -98,7 +98,7 @@ void AudioManager::playMusic(Common::String dir, Common::String music) {
 	debugC(1, kDebugAudio, "playMusic(%s, %s)", dir.c_str(), music.c_str());
 
 	// two musics can be played at same time
-	Common::String path = Common::String::printf("act%d/%s/%s.mus", _vm->state()->_currentChapter, dir.c_str(), music.c_str());
+	Common::String path = Common::String::format("act%d/%s/%s.mus", _vm->state()->_currentChapter, dir.c_str(), music.c_str());
 
 	if (_currentMusicName == music)
 		return;
diff --git a/engines/toon/detection.cpp b/engines/toon/detection.cpp
index e9649b1560..4b8c987d1e 100644
--- a/engines/toon/detection.cpp
+++ b/engines/toon/detection.cpp
@@ -159,7 +159,7 @@ bool ToonMetaEngine::hasFeature(MetaEngineFeature f) const {
 }
 
 void ToonMetaEngine::removeSaveState(const char *target, int slot) const {
-	Common::String fileName = Common::String::printf("%s.%03d", target, slot);
+	Common::String fileName = Common::String::format("%s.%03d", target, slot);
 	g_system->getSavefileManager()->removeSavefile(fileName);
 }
 
@@ -209,7 +209,7 @@ SaveStateList ToonMetaEngine::listSaves(const char *target) const {
 }
 
 SaveStateDescriptor ToonMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
-	Common::String fileName = Common::String::printf("%s.%03d", target, slot);
+	Common::String fileName = Common::String::format("%s.%03d", target, slot);
 	Common::InSaveFile *file = g_system->getSavefileManager()->openForLoading(fileName);
 
 	if (file) {
diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 7a6a2fc87a..3f8d0b2b5f 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -948,7 +948,7 @@ void ToonEngine::loadScene(int32 SceneId, bool forGameLoad) {
 
 
 	// load package
-	strcpy(temp, createRoomFilename(Common::String::printf("%s.pak", _gameState->_locations[_gameState->_currentScene]._name).c_str()).c_str());
+	strcpy(temp, createRoomFilename(Common::String::format("%s.pak", _gameState->_locations[_gameState->_currentScene]._name).c_str()).c_str());
 	resources()->openPackage(temp, true);
 
 	strcpy(temp, state()->_locations[SceneId]._name);
@@ -993,7 +993,7 @@ void ToonEngine::loadScene(int32 SceneId, bool forGameLoad) {
 
 	strcpy(temp, state()->_locations[SceneId]._name);
 	strcat(temp, ".svi");
-	strcpy(temp2, createRoomFilename(Common::String::printf("%s.svl", _gameState->_locations[_gameState->_currentScene]._name).c_str()).c_str());
+	strcpy(temp2, createRoomFilename(Common::String::format("%s.svl", _gameState->_locations[_gameState->_currentScene]._name).c_str()).c_str());
 	_audioManager->loadAudioPack(1, temp, temp2);
 	strcpy(temp, state()->_locations[SceneId]._name);
 	strcpy(temp2, state()->_locations[SceneId]._name);
@@ -1580,7 +1580,7 @@ void ToonEngine::exitScene() {
 	_currentTextLineCharacterId = 0;
 
 	char temp[256];
-	strcpy(temp, createRoomFilename(Common::String::printf("%s.pak", _gameState->_locations[_gameState->_currentScene]._name).c_str()).c_str());
+	strcpy(temp, createRoomFilename(Common::String::format("%s.pak", _gameState->_locations[_gameState->_currentScene]._name).c_str()).c_str());
 	resources()->closePackage(temp);
 
 
@@ -2808,7 +2808,7 @@ bool ToonEngine::canLoadGameStateCurrently() {
 }
 
 Common::String ToonEngine::getSavegameName(int nr) {
-	return _targetName + Common::String::printf(".%03d", nr);
+	return _targetName + Common::String::format(".%03d", nr);
 }
 
 bool ToonEngine::saveGame(int32 slot, Common::String saveGameDesc) {
@@ -2828,7 +2828,7 @@ bool ToonEngine::saveGame(int32 slot, Common::String saveGameDesc) {
 		if (!saveGameDesc.empty()) {
 			savegameDescription = saveGameDesc;
 		} else {
-			savegameDescription = Common::String::printf("Quick save #%d", slot);
+			savegameDescription = Common::String::format("Quick save #%d", slot);
 		}
 	}
 
@@ -4329,7 +4329,7 @@ int32 ToonEngine::pauseSceneAnimationScript(int32 animScriptId, int32 tickToWait
 }
 
 Common::String ToonEngine::createRoomFilename(Common::String name) {
-	Common::String file = Common::String::printf("ACT%d/%s/%s", _gameState->_currentChapter, _gameState->_locations[_gameState->_currentScene]._name, name.c_str());
+	Common::String file = Common::String::format("ACT%d/%s/%s", _gameState->_currentChapter, _gameState->_locations[_gameState->_currentScene]._name, name.c_str());
 	return file;
 }