diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-02-17 12:21:13 +0100 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2018-03-05 18:04:57 +0200 |
| commit | a0d02bacf31fbfe45c679bf176ece6bb4843f53a (patch) | |
| tree | 80be0833526c7375cb2d80cc6548c65a66dab2a0 | |
| parent | f8835751dccdf33a0150993f2fb9a2656bb8b973 (diff) | |
| download | subsurface-a0d02bacf31fbfe45c679bf176ece6bb4843f53a.tar.gz | |
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 <bstoeger@mail.tuwien.ac.at>
| -rw-r--r-- | core/imagedownloader.cpp | 2 | ||||
| -rw-r--r-- | core/qthelper.cpp | 9 |
2 files changed, 1 insertions, 10 deletions
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 @@ -1186,15 +1186,6 @@ QString fileFromHash(const char *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) { if (!picture) |