From 9986ce25d77d7abe8bdf5c1fca6ac98893ff2f10 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Tue, 6 Feb 2018 19:58:07 +0100 Subject: Cleanup: Make local helpers and variables of static linkage In core/imagedownloader.cpp the helpers cloudImageUrl() and loadPicture() are made of static linkage. The global variables queuedPictures and pictureQueueMutex were moved into the loadPicture() function, because they are used only there. Signed-off-by: Berthold Stoeger --- core/imagedownloader.cpp | 10 +++++----- core/imagedownloader.h | 3 --- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'core') diff --git a/core/imagedownloader.cpp b/core/imagedownloader.cpp index 57e76e2ff..62308fb5d 100644 --- a/core/imagedownloader.cpp +++ b/core/imagedownloader.cpp @@ -9,7 +9,7 @@ #include -QUrl cloudImageURL(const char *hash) +static QUrl cloudImageURL(const char *hash) { return QUrl::fromUserInput(QString("https://cloud.subsurface-divelog.org/images/").append(hash)); } @@ -78,11 +78,11 @@ void ImageDownloader::saveImage(QNetworkReply *reply) } -QSet queuedPictures; -QMutex pictureQueueMutex; - -void loadPicture(struct picture *picture, bool fromHash) +static void loadPicture(struct picture *picture, bool fromHash) { + static QSet queuedPictures; + static QMutex pictureQueueMutex; + if (!picture) return; QMutexLocker locker(&pictureQueueMutex); diff --git a/core/imagedownloader.h b/core/imagedownloader.h index 51ccc5f7a..63d963ec3 100644 --- a/core/imagedownloader.h +++ b/core/imagedownloader.h @@ -8,9 +8,6 @@ typedef QPair SHashedFilename; -extern QUrl cloudImageURL(const char *hash); - - class ImageDownloader : public QObject { Q_OBJECT; public: -- cgit v1.2.3-70-g09d2