From a0d02bacf31fbfe45c679bf176ece6bb4843f53a Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 17 Feb 2018 12:21:13 +0100 Subject: Cleanup: remove updateHash() function updateHash() and hashPicture() did the same thing, with the exception that hashPicture() marked the dive list as changed if a hash changed. This seems like a good idea in any case, therefore always use hashPicture(). Signed-off-by: Berthold Stoeger --- core/imagedownloader.cpp | 2 +- core/qthelper.cpp | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'core') diff --git a/core/imagedownloader.cpp b/core/imagedownloader.cpp index 42ab52f0f..3b55dfd06 100644 --- a/core/imagedownloader.cpp +++ b/core/imagedownloader.cpp @@ -120,7 +120,7 @@ SHashedImage::SHashedImage(struct picture *picture) : QImage() load(filename); if (!isNull()) { // Make sure the hash still matches the image file - QtConcurrent::run(updateHash, clone_picture(picture)); + QtConcurrent::run(hashPicture, clone_picture(picture)); } else { // Interpret filename as URL QtConcurrent::run(loadPicture, clone_picture(picture), false); diff --git a/core/qthelper.cpp b/core/qthelper.cpp index 30338a8cd..703e4e615 100644 --- a/core/qthelper.cpp +++ b/core/qthelper.cpp @@ -1185,15 +1185,6 @@ QString fileFromHash(const char *hash) return localFilenameOf[QByteArray::fromHex(hash)]; } -// This needs to operate on a copy of picture as it frees it after finishing! -void updateHash(struct picture *picture) { - if (!picture) - return; - QByteArray hash = hashFile(fileFromHash(picture->hash)); - learnHash(picture, hash); - picture_free(picture); -} - // This needs to operate on a copy of picture as it frees it after finishing! void hashPicture(struct picture *picture) { -- cgit v1.2.3-70-g09d2