diff options
Diffstat (limited to 'engines/testbed/testbed.cpp')
| -rw-r--r-- | engines/testbed/testbed.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/engines/testbed/testbed.cpp b/engines/testbed/testbed.cpp index a4e6429e44..071fba8c2c 100644 --- a/engines/testbed/testbed.cpp +++ b/engines/testbed/testbed.cpp @@ -39,9 +39,6 @@ namespace Testbed { -// Initialize static member for TestbedExitDialog -bool TestbedExitDialog::_rerun = false; - void TestbedExitDialog::init() { _xOffset = 25; _yOffset = 0; @@ -62,10 +59,10 @@ void TestbedExitDialog::init() { } addList(0, _yOffset, 500, 200, strArray, &colors); - text = "More Details can be viewed in the Log file : " + Testsuite::getLogFile(); + text = "More Details can be viewed in the Log file : " + ConfParams.getLogFilename(); addText(450, 20, text, Graphics::kTextAlignLeft, 0, 0); - if (Testsuite::getLogDir().size()) { - text = "Directory : " + Testsuite::getLogDir(); + if (ConfParams.getLogDirectory().size()) { + text = "Directory : " + ConfParams.getLogDirectory(); } else { text = "Directory : ."; } @@ -78,7 +75,7 @@ void TestbedExitDialog::init() { void TestbedExitDialog::handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) { switch (cmd) { case kCmdRerunTestbed : - _rerun = true; + ConfParams.setRerunFlag(true); cmd = GUI::kCloseCmd; default: GUI::Dialog::handleCommand(sender, cmd, data); @@ -133,7 +130,7 @@ TestbedEngine::TestbedEngine(OSystem *syst) } TestbedEngine::~TestbedEngine() { - Testsuite::deleteWriteStream(); + ConfParams.deleteWriteStream(); // Remove all of our debug levels here DebugMan.clearAllDebugChannels(); @@ -176,7 +173,7 @@ Common::Error TestbedEngine::run() { Testsuite::clearEntireScreen(); cfMan.selectTestsuites(); // Init logging - Testsuite::initLogging(true); + ConfParams.initLogging(true); invokeTestsuites(cfMan); // Check if user wanted to exit. if (Engine::shouldQuit()) { @@ -187,7 +184,7 @@ Common::Error TestbedEngine::run() { tbDialog.init(); tbDialog.run(); - } while (TestbedExitDialog::rerunRequired()); + } while (ConfParams.isRerunRequired()); return Common::kNoError; } |