ADL: Fix GCC 4.9 shadow warnings

scummvm · Jun 6, 2016 · 0c2d2b2 · 0c2d2b2
1 parent f8d75bb
commit 0c2d2b2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/engines/adl/adl.cpp b/engines/adl/adl.cpp
@@ -855,19 +855,19 @@ Common::String AdlEngine::getWord(const Common::String &line, uint &index) const
 	}
 }
 
-Common::String AdlEngine::formatVerbError(const Common::String &verbStr) const {
+Common::String AdlEngine::formatVerbError(const Common::String &verb) const {
 	Common::String err = _strings.verbError;
-	for (uint i = 0; i < verbStr.size(); ++i)
-		err.setChar(verbStr[i], i + 19);
+	for (uint i = 0; i < verb.size(); ++i)
+		err.setChar(verb[i], i + 19);
 	return err;
 }
 
-Common::String AdlEngine::formatNounError(const Common::String &verbStr, const Common::String &nounStr) const {
+Common::String AdlEngine::formatNounError(const Common::String &verb, const Common::String &noun) const {
 	Common::String err = _strings.nounError;
-	for (uint i = 0; i < verbStr.size(); ++i)
-		err.setChar(verbStr[i], i + 19);
-	for (uint i = 0; i < nounStr.size(); ++i)
-		err.setChar(nounStr[i], i + 30);
+	for (uint i = 0; i < verb.size(); ++i)
+		err.setChar(verb[i], i + 19);
+	for (uint i = 0; i < noun.size(); ++i)
+		err.setChar(noun[i], i + 30);
 	return err;
 }
 

diff --git a/engines/adl/adl.h b/engines/adl/adl.h
@@ -234,8 +234,8 @@ friend class Console;
 	Common::String inputString(byte prompt = 0) const;
 	byte inputKey(bool showCursor = true) const;
 
-	virtual Common::String formatVerbError(const Common::String &verbStr) const;
-	virtual Common::String formatNounError(const Common::String &verbStr, const Common::String &nounStr) const;
+	virtual Common::String formatVerbError(const Common::String &verb) const;
+	virtual Common::String formatNounError(const Common::String &verb, const Common::String &noun) const;
 	void loadWords(Common::ReadStream &stream, WordMap &map, Common::StringArray &pri) const;
 	void readCommands(Common::ReadStream &stream, Commands &commands);
 	void checkInput(byte verb, byte noun);

diff --git a/engines/adl/hires6.cpp b/engines/adl/hires6.cpp
@@ -363,11 +363,11 @@ void HiRes6Engine::showRoom() {
 	_linesPrinted = 0;
 }
 
-Common::String HiRes6Engine::formatVerbError(const Common::String &verbStr) const {
+Common::String HiRes6Engine::formatVerbError(const Common::String &verb) const {
 	Common::String err = _strings.verbError;
 
-	for (uint i = 0; i < verbStr.size(); ++i)
-		err.setChar(verbStr[i], i + 24);
+	for (uint i = 0; i < verb.size(); ++i)
+		err.setChar(verb[i], i + 24);
 
 	err.setChar(APPLECHAR(' '), 32);
 
@@ -380,11 +380,11 @@ Common::String HiRes6Engine::formatVerbError(const Common::String &verbStr) cons
 	return err;
 }
 
-Common::String HiRes6Engine::formatNounError(const Common::String &verbStr, const Common::String &nounStr) const {
+Common::String HiRes6Engine::formatNounError(const Common::String &verb, const Common::String &noun) const {
 	Common::String err = _strings.nounError;
 
-	for (uint i = 0; i < nounStr.size(); ++i)
-		err.setChar(nounStr[i], i + 24);
+	for (uint i = 0; i < noun.size(); ++i)
+		err.setChar(noun[i], i + 24);
 
 	for (uint  i = 35; i > 31; --i)
 		err.setChar(APPLECHAR(' '), i);

diff --git a/engines/adl/hires6.h b/engines/adl/hires6.h
@@ -74,8 +74,8 @@ class HiRes6Engine : public AdlEngine_v3 {
 	void initGameState();
 	void printRoomDescription();
 	void showRoom();
-	Common::String formatVerbError(const Common::String &verbStr) const;
-	Common::String formatNounError(const Common::String &verbStr, const Common::String &nounStr) const;
+	Common::String formatVerbError(const Common::String &verb) const;
+	Common::String formatNounError(const Common::String &verb, const Common::String &noun) const;
 
 	// AdlEngine_v2
 	void printString(const Common::String &str);