[Scummvm-git-logs] scummvm master -> 6ad598e11c6fdb8537e40fc4d39eb1a800c54c68

[sev-]

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:
6ad598e11c DIRECTOR: DECOMPILER: Fix shadowed variables warnings


Commit: 6ad598e11c6fdb8537e40fc4d39eb1a800c54c68
    https://github.com/scummvm/scummvm/commit/6ad598e11c6fdb8537e40fc4d39eb1a800c54c68
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-15T00:24:28+02:00

Commit Message:
DIRECTOR: DECOMPILER: Fix shadowed variables warnings

Changed paths:
    engines/director/lingo/lingodec/ast.h
    engines/director/lingo/lingodec/names.h


diff --git a/engines/director/lingo/lingodec/ast.h b/engines/director/lingo/lingodec/ast.h
index 2dbbf36107b..0c21cd3fa46 100644
--- a/engines/director/lingo/lingodec/ast.h
+++ b/engines/director/lingo/lingodec/ast.h
@@ -106,7 +106,7 @@ struct LabelNode : Node {
 struct LoopNode : StmtNode {
 	uint32 startIndex;
 
-	LoopNode(NodeType t, uint32 startIndex) : StmtNode(t), startIndex(startIndex) {
+	LoopNode(NodeType t, uint32 startIndex_) : StmtNode(t), startIndex(startIndex_) {
 		isLoop = true;
 	}
 	virtual ~LoopNode() = default;
@@ -316,8 +316,8 @@ struct MemberExprNode : ExprNode {
 	Common::SharedPtr<Node> memberID;
 	Common::SharedPtr<Node> castID;
 
-	MemberExprNode(Common::String type, Common::SharedPtr<Node> memberID, Common::SharedPtr<Node> castID)
-		: ExprNode(kMemberExprNode), type(type) {
+	MemberExprNode(Common::String type_, Common::SharedPtr<Node> memberID, Common::SharedPtr<Node> castID)
+		: ExprNode(kMemberExprNode), type(type_) {
 		this->memberID = Common::move(memberID);
 		this->memberID->parent = this;
 		if (castID) {
@@ -348,8 +348,8 @@ struct AssignmentStmtNode : StmtNode {
 	Common::SharedPtr<Node> value;
 	bool forceVerbose;
 
-	AssignmentStmtNode(Common::SharedPtr<Node> var, Common::SharedPtr<Node> val, bool forceVerbose = false)
-		: StmtNode(kAssignmentStmtNode), forceVerbose(forceVerbose) {
+	AssignmentStmtNode(Common::SharedPtr<Node> var, Common::SharedPtr<Node> val, bool forceVerbose_ = false)
+		: StmtNode(kAssignmentStmtNode), forceVerbose(forceVerbose_) {
 		variable = Common::move(var);
 		variable->parent = this;
 		value = Common::move(val);
@@ -386,8 +386,8 @@ struct RepeatWhileStmtNode : LoopNode {
 	Common::SharedPtr<Node> condition;
 	Common::SharedPtr<BlockNode> block;
 
-	RepeatWhileStmtNode(uint32 startIndex, Common::SharedPtr<Node> c)
-		: LoopNode(kRepeatWhileStmtNode, startIndex) {
+	RepeatWhileStmtNode(uint32 startIndex_, Common::SharedPtr<Node> c)
+		: LoopNode(kRepeatWhileStmtNode, startIndex_) {
 		condition = Common::move(c);
 		condition->parent = this;
 		block = Common::SharedPtr<BlockNode>(new BlockNode());
@@ -404,8 +404,8 @@ struct RepeatWithInStmtNode : LoopNode {
 	Common::SharedPtr<Node> list;
 	Common::SharedPtr<BlockNode> block;
 
-	RepeatWithInStmtNode(uint32 startIndex, Common::String v, Common::SharedPtr<Node> l)
-		: LoopNode(kRepeatWithInStmtNode, startIndex) {
+	RepeatWithInStmtNode(uint32 startIndex_, Common::String v, Common::SharedPtr<Node> l)
+		: LoopNode(kRepeatWithInStmtNode, startIndex_) {
 		varName = v;
 		list = Common::move(l);
 		list->parent = this;
@@ -425,8 +425,8 @@ struct RepeatWithToStmtNode : LoopNode {
 	Common::SharedPtr<Node> end;
 	Common::SharedPtr<BlockNode> block;
 
-	RepeatWithToStmtNode(uint32 startIndex, Common::String v, Common::SharedPtr<Node> s, bool up, Common::SharedPtr<Node> e)
-		: LoopNode(kRepeatWithToStmtNode, startIndex), up(up) {
+	RepeatWithToStmtNode(uint32 startIndex_, Common::String v, Common::SharedPtr<Node> s, bool up, Common::SharedPtr<Node> e)
+		: LoopNode(kRepeatWithToStmtNode, startIndex_), up(up) {
 		varName = v;
 		start = Common::move(s);
 		start->parent = this;
diff --git a/engines/director/lingo/lingodec/names.h b/engines/director/lingo/lingodec/names.h
index cd434371472..10a764b5fda 100644
--- a/engines/director/lingo/lingodec/names.h
+++ b/engines/director/lingo/lingodec/names.h
@@ -52,7 +52,7 @@ struct ScriptNames {
 
 	unsigned int version;
 
-	ScriptNames(unsigned int version) : version(version) {}
+	ScriptNames(unsigned int version_) : version(version_) {}
 	void read(Common::SeekableReadStream &stream);
 	bool validName(int id) const;
 	Common::String getName(int id) const;