diff options
Diffstat (limited to 'engines/testbed')
-rw-r--r-- | engines/testbed/graphics.cpp | 4 | ||||
-rw-r--r-- | engines/testbed/misc.cpp | 2 | ||||
-rw-r--r-- | engines/testbed/sound.cpp | 8 | ||||
-rw-r--r-- | engines/testbed/testbed.cpp | 4 | ||||
-rw-r--r-- | engines/testbed/testsuite.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/engines/testbed/graphics.cpp b/engines/testbed/graphics.cpp index 086db21c67..079239c920 100644 --- a/engines/testbed/graphics.cpp +++ b/engines/testbed/graphics.cpp @@ -769,7 +769,7 @@ TestExitStatus GFXtests::scaledCursors() { // Switch Graphics mode // FIXME: Crashes with "3x" mode now.: - info = Common::String::printf("Testing : Scaled cursors with GFX Mode %s\n", gfxMode->name); + info = Common::String::format("Testing : Scaled cursors with GFX Mode %s\n", gfxMode->name); if (Testsuite::handleInteractiveInput(info, "OK", "Skip", kOptionRight)) { Testsuite::logPrintf("\tInfo! Skipping sub-test : Scaled Cursors :: GFX Mode %s\n", gfxMode->name); gfxMode++; @@ -1104,7 +1104,7 @@ TestExitStatus GFXtests::pixelFormats() { Common::Point pt(0, 170); Common::String msg; - msg = Common::String::printf("Testing Pixel Formats, %d of %d", numFormatsTested, pfList.size()); + msg = Common::String::format("Testing Pixel Formats, %d of %d", numFormatsTested, pfList.size()); Testsuite::writeOnScreen(msg, pt, true); // CopyRectToScreen could have been used, but that may involve writing code which diff --git a/engines/testbed/misc.cpp b/engines/testbed/misc.cpp index 2159974c51..36687f570e 100644 --- a/engines/testbed/misc.cpp +++ b/engines/testbed/misc.cpp @@ -28,7 +28,7 @@ namespace Testbed { Common::String MiscTests::getHumanReadableFormat(TimeDate &td) { - return Common::String::printf("%d:%d:%d on %d/%d/%d (dd/mm/yyyy)", td.tm_hour, td.tm_min, td.tm_sec, td.tm_mday, td.tm_mon + 1, td.tm_year + 1900); + return Common::String::format("%d:%d:%d on %d/%d/%d (dd/mm/yyyy)", td.tm_hour, td.tm_min, td.tm_sec, td.tm_mday, td.tm_mon + 1, td.tm_year + 1900); } void MiscTests::timerCallback(void *arg) { diff --git a/engines/testbed/sound.cpp b/engines/testbed/sound.cpp index e256621553..615793da74 100644 --- a/engines/testbed/sound.cpp +++ b/engines/testbed/sound.cpp @@ -193,7 +193,7 @@ TestExitStatus SoundSubsystem::audiocdOutput() { AudioCD.play(i, 1, 0, 0); while (AudioCD.isPlaying()) { g_system->delayMillis(500); - Testsuite::writeOnScreen(Common::String::printf("Playing Now: track%02d", i), pt); + Testsuite::writeOnScreen(Common::String::format("Playing Now: track%02d", i), pt); } g_system->delayMillis(500); } @@ -234,19 +234,19 @@ TestExitStatus SoundSubsystem::sampleRates() { Common::Point pt(0, 100); mixer->playStream(Audio::Mixer::kPlainSoundType, &handle, s1); - Testsuite::writeOnScreen(Common::String::printf("Playing at smaple rate: %d", s1->getRate()), pt); + Testsuite::writeOnScreen(Common::String::format("Playing at smaple rate: %d", s1->getRate()), pt); g_system->delayMillis(1000); mixer->stopHandle(handle); g_system->delayMillis(1000); mixer->playStream(Audio::Mixer::kSpeechSoundType, &handle, s2); - Testsuite::writeOnScreen(Common::String::printf("Playing at sample rate : %d", s2->getRate()), pt); + Testsuite::writeOnScreen(Common::String::format("Playing at sample rate : %d", s2->getRate()), pt); g_system->delayMillis(1000); mixer->stopHandle(handle); g_system->delayMillis(1000); mixer->playStream(Audio::Mixer::kSFXSoundType, &handle, s3); - Testsuite::writeOnScreen(Common::String::printf("Playing at sample rate : %d", s3->getRate()), pt); + Testsuite::writeOnScreen(Common::String::format("Playing at sample rate : %d", s3->getRate()), pt); g_system->delayMillis(1000); mixer->stopHandle(handle); g_system->delayMillis(1000); diff --git a/engines/testbed/testbed.cpp b/engines/testbed/testbed.cpp index 071fba8c2c..1ceecb8ebf 100644 --- a/engines/testbed/testbed.cpp +++ b/engines/testbed/testbed.cpp @@ -48,10 +48,10 @@ void TestbedExitDialog::init() { GUI::ListWidget::ColorList colors; for (Common::Array<Testsuite *>::const_iterator i = _testsuiteList.begin(); i != _testsuiteList.end(); ++i) { - strArray.push_back(Common::String::printf("%s :", (*i)->getDescription())); + strArray.push_back(Common::String::format("%s :", (*i)->getDescription())); colors.push_back(GUI::ThemeEngine::kFontColorNormal); if ((*i)->isEnabled()) { - strArray.push_back(Common::String::printf("Passed: %d Failed: %d Skipped: %d", (*i)->getNumTestsPassed(), (*i)->getNumTestsFailed(), (*i)->getNumTestsSkipped())); + strArray.push_back(Common::String::format("Passed: %d Failed: %d Skipped: %d", (*i)->getNumTestsPassed(), (*i)->getNumTestsFailed(), (*i)->getNumTestsSkipped())); } else { strArray.push_back("Skipped"); } diff --git a/engines/testbed/testsuite.cpp b/engines/testbed/testsuite.cpp index 8cb9ffe309..fa8764e869 100644 --- a/engines/testbed/testsuite.cpp +++ b/engines/testbed/testsuite.cpp @@ -233,7 +233,7 @@ uint Testsuite::parseEvents() { } void Testsuite::updateStats(const char *prefix, const char *info, uint testNum, uint numTests, Common::Point pt) { - Common::String text = Common::String::printf(" Running %s: %s (%d of %d) ", prefix, info, testNum, numTests); + Common::String text = Common::String::format(" Running %s: %s (%d of %d) ", prefix, info, testNum, numTests); writeOnScreen(text, pt); uint barColor = kColorSpecial; // below the text a rectangle denoting the progress in the testsuite can be drawn. |