From 4524e2b0b39f47996cd8acc0c938c47753f31854 Mon Sep 17 00:00:00 2001
From: "Robert C. Helling" <helling@atdotde.de>
Date: Mon, 18 Mar 2019 21:26:05 +0100
Subject: [PATCH] Desktop: fix another variable name conflict

Addresses LGTM.com issue.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 desktop-widgets/findmovedimagesdialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/desktop-widgets/findmovedimagesdialog.cpp b/desktop-widgets/findmovedimagesdialog.cpp
index 32f885fca..a0ef0d9b4 100644
--- a/desktop-widgets/findmovedimagesdialog.cpp
+++ b/desktop-widgets/findmovedimagesdialog.cpp
@@ -93,7 +93,7 @@ struct Dir {
 	double progressFrom, progressTo;
 };
 
-QVector<FindMovedImagesDialog::Match> FindMovedImagesDialog::learnImages(const QString &dir, int maxRecursions, QVector<QString> imagePathsIn)
+QVector<FindMovedImagesDialog::Match> FindMovedImagesDialog::learnImages(const QString &rootdir, int maxRecursions, QVector<QString> imagePathsIn)
 {
 	QMap<QString, ImageMatch> matches;
 
@@ -112,7 +112,7 @@ QVector<FindMovedImagesDialog::Match> FindMovedImagesDialog::learnImages(const Q
 
 	QVector<QVector<Dir>> stack; // Use a stack to recurse into directories
 	stack.reserve(maxRecursions + 1);
-	stack.append({ { dir, 0.0, 1.0 } });
+	stack.append({ { rootdir, 0.0, 1.0 } });
 	while (!stack.isEmpty()) {
 		if (stack.last().isEmpty()) {
 			stack.removeLast();