diff options
author | Max Horn | 2010-11-01 16:02:28 +0000 |
---|---|---|
committer | Max Horn | 2010-11-01 16:02:28 +0000 |
commit | e27b05ef358102fd60235a5f78d7d51e9f25a5f4 (patch) | |
tree | 50e994a47741bf619de730f6a3ece5d0a0cc7e95 /engines/kyra | |
parent | 7a853650047064fb15720bb58ce7c5eec28ef606 (diff) | |
download | scummvm-rg350-e27b05ef358102fd60235a5f78d7d51e9f25a5f4.tar.gz scummvm-rg350-e27b05ef358102fd60235a5f78d7d51e9f25a5f4.tar.bz2 scummvm-rg350-e27b05ef358102fd60235a5f78d7d51e9f25a5f4.zip |
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
Diffstat (limited to 'engines/kyra')
-rw-r--r-- | engines/kyra/resource_intern.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/staticres.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp index 445ea579a0..dff8759d55 100644 --- a/engines/kyra/resource_intern.cpp +++ b/engines/kyra/resource_intern.cpp @@ -102,7 +102,7 @@ int TlkArchive::listMembers(Common::ArchiveMemberList &list) { uint count = 0; for (; count < _entryCount; ++count) { - const Common::String name = Common::String::printf("%08u.AUD", _fileEntries[count * 2 + 0]); + const Common::String name = Common::String::format("%08u.AUD", _fileEntries[count * 2 + 0]); list.push_back(Common::ArchiveMemberList::value_type(new Common::GenericArchiveMember(name, this))); } diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index c9450e3f27..c5658c0445 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -230,7 +230,7 @@ const char *KyraEngine_v1::getSavegameFilename(int num) { Common::String KyraEngine_v1::getSavegameFilename(const Common::String &target, int num) { assert(num >= 0 && num <= 999); - return target + Common::String::printf(".%03d", num); + return target + Common::String::format(".%03d", num); } bool KyraEngine_v1::saveFileLoadable(int slot) { diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index edfa61e5b4..cf270942bf 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -209,7 +209,7 @@ bool StaticResource::tryKyraDatLoad() { return false; // load the ID map for our game - const Common::String filenamePattern = Common::String::printf("0%01X%01X%01X000%01X", game, platform, special, lang); + const Common::String filenamePattern = Common::String::format("0%01X%01X%01X000%01X", game, platform, special, lang); Common::SeekableReadStream *idMap = _vm->resource()->createReadStream(filenamePattern); if (!idMap) return false; @@ -328,7 +328,7 @@ bool StaticResource::prefetchId(int id) { ResData data; data.id = id; data.type = dDesc->_value.type; - Common::SeekableReadStream *fileStream = _vm->resource()->createReadStream(Common::String::printf("%08X", dDesc->_value.filename)); + Common::SeekableReadStream *fileStream = _vm->resource()->createReadStream(Common::String::format("%08X", dDesc->_value.filename)); if (!fileStream) return false; |