From 917f77ae0b51a55be3f1294e17cfffc4811a2d26 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Sun, 6 Mar 2016 21:32:12 -0300 Subject: [PATCH 05/10] Remove uneeded variable Signed-off-by: Tomaz Canabrava --- desktop-widgets/mainwindow.cpp | 2 +- subsurface-core/qthelper.cpp | 5 ++--- subsurface-core/qthelper.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index ca36cb7..a3d6c43 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -592,7 +592,7 @@ void learnImageDirs(QStringList dirnames) { QList > futures; foreach (QString dir, dirnames) { - futures << QtConcurrent::run(learnImages, QDir(dir), 10, false); + futures << QtConcurrent::run(learnImages, QDir(dir), 10); } DivePictureModel::instance()->updateDivePicturesWhenDone(futures); } diff --git a/subsurface-core/qthelper.cpp b/subsurface-core/qthelper.cpp index 72221ea..7c67e09 100644 --- a/subsurface-core/qthelper.cpp +++ b/subsurface-core/qthelper.cpp @@ -1129,14 +1129,13 @@ extern "C" void cache_picture(struct picture *picture) QtConcurrent::run(hashPicture, picture); } -void learnImages(const QDir dir, int max_recursions, bool recursed) +void learnImages(const QDir dir, int max_recursions) { - QDir current(dir); QStringList filters, files; if (max_recursions) { foreach (QString dirname, dir.entryList(QStringList(), QDir::NoDotAndDotDot | QDir::Dirs)) { - learnImages(QDir(dir.filePath(dirname)), max_recursions - 1, true); + learnImages(QDir(dir.filePath(dirname)), max_recursions - 1); } } diff --git a/subsurface-core/qthelper.h b/subsurface-core/qthelper.h index 09073e2..3a5ef60 100644 --- a/subsurface-core/qthelper.h +++ b/subsurface-core/qthelper.h @@ -23,7 +23,7 @@ void read_hashes(); void write_hashes(); void updateHash(struct picture *picture); QByteArray hashFile(const QString filename); -void learnImages(const QDir dir, int max_recursions, bool recursed); +void learnImages(const QDir dir, int max_recursions); void add_hash(const QString filename, QByteArray hash); void hashPicture(struct picture *picture); QString localFilePath(const QString originalFilename); -- 2.5.4 (Apple Git-61)