summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2019-03-18 21:26:05 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-03-18 19:40:32 -0700
commit4524e2b0b39f47996cd8acc0c938c47753f31854 (patch)
tree5ba3d7d80f31daa23f7b9e5807ff6dad4c61566b
parentc7abca2f42976f799a1d96f8fb81adb75f903ca9 (diff)
downloadsubsurface-4524e2b0b39f47996cd8acc0c938c47753f31854.tar.gz
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>
-rw-r--r--desktop-widgets/findmovedimagesdialog.cpp4
1 files 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();