diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-02-06 19:58:07 +0100 |
|---|---|---|
| committer |  Robert C. Helling <helling@atdotde.de> | 2018-02-07 09:44:43 +0100 |
| commit | 9986ce25d77d7abe8bdf5c1fca6ac98893ff2f10 (patch) | |
| tree | 9a0c84cb2307245e9956139cc06a977d07f86dc5 /core | |
| parent | 218ea948316fe9e1581935becac8f1225d16e955 (diff) | |
| download | subsurface-9986ce25d77d7abe8bdf5c1fca6ac98893ff2f10.tar.gz | |
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 <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
| -rw-r--r-- | core/imagedownloader.cpp | 10 | ||||
| -rw-r--r-- | core/imagedownloader.h | 3 |
2 files changed, 5 insertions, 8 deletions
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 <QtConcurrent> -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<QString> queuedPictures; -QMutex pictureQueueMutex; - -void loadPicture(struct picture *picture, bool fromHash) +static void loadPicture(struct picture *picture, bool fromHash) { + static QSet<QString> 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<QString, QByteArray> SHashedFilename; -extern QUrl cloudImageURL(const char *hash); - - class ImageDownloader : public QObject { Q_OBJECT; public: |