mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: Make local helpers and variables of static linkage

Browse source 
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>
This commit is contained in:
Berthold Stoeger 2018-02-06 19:58:07 +01:00 • committed by Robert C. Helling
parent 218ea94831
commit 9986ce25d7
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/imagedownloader.cpp
View file

@ -9,7 +9,7 @@
#include <QtConcurrent> #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)); return QUrl::fromUserInput(QString("https://cloud.subsurface-divelog.org/images/").append(hash));
} }
@ -78,11 +78,11 @@ void ImageDownloader::saveImage(QNetworkReply *reply)
} }
QSet<QString> queuedPictures; static void loadPicture(struct picture *picture, bool fromHash)
QMutex pictureQueueMutex;
void loadPicture(struct picture *picture, bool fromHash)
{ {
static QSet<QString> queuedPictures;
static QMutex pictureQueueMutex;
if (!picture) if (!picture)
return; return;
QMutexLocker locker(&pictureQueueMutex); QMutexLocker locker(&pictureQueueMutex);

3
core/imagedownloader.h
View file

@ -8,9 +8,6 @@
typedef QPair<QString, QByteArray> SHashedFilename; typedef QPair<QString, QByteArray> SHashedFilename;
extern QUrl cloudImageURL(const char *hash);
class ImageDownloader : public QObject { class ImageDownloader : public QObject {
Q_OBJECT; Q_OBJECT;
public: public: