From 04f4605f539c6ed5e95f53daaaca1bf0054a028a Mon Sep 17 00:00:00 2001
From: Julien
Date: Mon, 6 Jun 2011 19:08:21 -0400
Subject: TESTBED: Rename error variable to err (was hiding error() symbol)

---
 engines/testbed/savegame.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines')

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;
-- 
cgit v1.2.3