aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJulien2011-06-06 19:08:21 -0400
committerJulien2011-06-07 03:56:52 -0400
commit04f4605f539c6ed5e95f53daaaca1bf0054a028a (patch)
treef4936363156a85376e463acdec9c01f9b3a4ff0b /engines
parent63625428366c8be0ed832924dbdb52f2e81df74e (diff)
downloadscummvm-rg350-04f4605f539c6ed5e95f53daaaca1bf0054a028a.tar.gz
scummvm-rg350-04f4605f539c6ed5e95f53daaaca1bf0054a028a.tar.bz2
scummvm-rg350-04f4605f539c6ed5e95f53daaaca1bf0054a028a.zip
TESTBED: Rename error variable to err (was hiding error() symbol)
Diffstat (limited to 'engines')
-rw-r--r--engines/testbed/savegame.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/testbed/savegame.cpp b/engines/testbed/savegame.cpp
index b90c79aa11..226e9880a6 100644
--- a/engines/testbed/savegame.cpp
+++ b/engines/testbed/savegame.cpp
@@ -133,11 +133,11 @@ TestExitStatus SaveGametests::testListingSavefile() {
writeDataToFile("tBedSavefileToList.1", "Save me!");
writeDataToFile("tBedSavefileToList.2", "Save me!");
- Common::Error error = saveFileMan->getError();
+ Common::Error err = saveFileMan->getError();
- if (error.getCode() != Common::kNoError) {
+ if (err.getCode() != Common::kNoError) {
// Abort. Some Error in writing files
- Testsuite::logDetailedPrintf("Error while creating savefiles: %s\n", error.getDesc().c_str());
+ Testsuite::logDetailedPrintf("Error while creating savefiles: %s\n", err.getDesc().c_str());
return kTestFailed;
}
@@ -171,8 +171,8 @@ TestExitStatus SaveGametests::testErrorMessages() {
// Try opening a non existing file
readAndVerifyData("tBedSomeNonExistentSaveFile.0", "File doesn't exists!");
- Common::Error error = saveFileMan->getError();
- if (error.getCode() == Common::kNoError) {
+ Common::Error err = saveFileMan->getError();
+ if (err.getCode() == Common::kNoError) {
// blunder! how come?
Testsuite::logDetailedPrintf("SaveFileMan.getError() failed\n");
return kTestFailed;