diff options
| -rw-r--r-- | qt-models/divepicturemodel.cpp | 9 | ||||
| -rw-r--r-- | qt-models/divepicturemodel.h | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/qt-models/divepicturemodel.cpp b/qt-models/divepicturemodel.cpp index 9286dc54c..e5b40b748 100644 --- a/qt-models/divepicturemodel.cpp +++ b/qt-models/divepicturemodel.cpp @@ -7,8 +7,7 @@ #include <QtConcurrent> -extern QHash <QString, QImage > thumbnailCache; - +extern QHash <QString, QImage> thumbnailCache; SPixmap scaleImages(picturepointer picture) { @@ -28,7 +27,6 @@ SPixmap scaleImages(picturepointer picture) return ret; } - DivePictureModel *DivePictureModel::instance() { static DivePictureModel *self = new DivePictureModel(); @@ -39,8 +37,7 @@ DivePictureModel::DivePictureModel() : numberOfPictures(0) { } - -void DivePictureModel::updateDivePicturesWhenDone(QList<QFuture<void> > futures) +void DivePictureModel::updateDivePicturesWhenDone(QList<QFuture<void>> futures) { Q_FOREACH (QFuture<void> f, futures) { f.waitForFinished(); @@ -108,7 +105,7 @@ QVariant DivePictureModel::data(const QModelIndex &index, int role) const switch (role) { case Qt::UserRole: ret = QVariant::fromValue((int)stringPixmapCache[key].offsetSeconds); - break; + break; case Qt::DisplayRole: ret = key; } diff --git a/qt-models/divepicturemodel.h b/qt-models/divepicturemodel.h index b00444548..b0494d355 100644 --- a/qt-models/divepicturemodel.h +++ b/qt-models/divepicturemodel.h @@ -26,7 +26,7 @@ public: virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; virtual void updateDivePictures(); - void updateDivePicturesWhenDone(QList<QFuture<void> >); + void updateDivePicturesWhenDone(QList<QFuture<void>>); void removePicture(const QString& fileUrl, bool last); protected: |