[Scummvm-git-logs] scummvm master -> 0acdd23a8eb67080e0573fa853d02489ac80c5cb

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0acdd23a8e GUI: Fix GCC Shadowing Warnings in Theme Engine Header


Commit: 0acdd23a8eb67080e0573fa853d02489ac80c5cb
    https://github.com/scummvm/scummvm/commit/0acdd23a8eb67080e0573fa853d02489ac80c5cb
Author: D G Turner (digitall at scummvm.org)
Date: 2021-03-28T02:54:23+01:00

Commit Message:
GUI: Fix GCC Shadowing Warnings in Theme Engine Header

Changed paths:
    gui/ThemeEngine.h


diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h
index 6233856b35..50f47499e5 100644
--- a/gui/ThemeEngine.h
+++ b/gui/ThemeEngine.h
@@ -173,13 +173,13 @@ enum TextColor {
 
 class LangExtraFont {
 public:
-	LangExtraFont(TextData textId, Common::Array<Common::Language> &lngs, const Common::String &file, const Common::String &scalableFile, int ps) : _langs(lngs) {
-		storeFileNames(textId, file, scalableFile, ps);
+	LangExtraFont(TextData textId, Common::Array<Common::Language> &lngs, const Common::String &filename, const Common::String &scalableFile, int ps) : _langs(lngs) {
+		storeFileNames(textId, filename, scalableFile, ps);
 	}
 
-	void storeFileNames(TextData textId, const Common::String &file, const Common::String &scalableFile, int ps) {
+	void storeFileNames(TextData textId, const Common::String &filename, const Common::String &scalableFile, int ps) {
 		assert(textId < kTextDataMAX);
-		_fontFilesStd[textId] = file;
+		_fontFilesStd[textId] = filename;
 		_fontFilesScalable[textId] = scalableFile;
 		_fontSize[textId] = ps;
 	}