From 9edb4f3fa91b3907809375794d75a1b1a77c94a0 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 6 Nov 2015 10:39:59 -0800 Subject: Move ImageDownloader out of the desktop widgets This required a bit more untangling, but with this it seems we can build subsurface-mobile again (at least on the desktop). Interesting is the removal from inside the ImageDownloader of the call to DivePictureModel::instance()->updateDivePictures() - which actually could cause some interesting recursion issues. If it turns out we did indeed need this, it needs to be re-architected. Signed-off-by: Dirk Hohndel --- qt-models/divepicturemodel.cpp | 1 + qt-models/divepicturemodel.h | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) (limited to 'qt-models') diff --git a/qt-models/divepicturemodel.cpp b/qt-models/divepicturemodel.cpp index bb5db33b7..55f20cef9 100644 --- a/qt-models/divepicturemodel.cpp +++ b/qt-models/divepicturemodel.cpp @@ -2,6 +2,7 @@ #include "dive.h" #include "metrics.h" #include "divelist.h" +#include "imagedownloader.h" #include diff --git a/qt-models/divepicturemodel.h b/qt-models/divepicturemodel.h index 7390fc5eb..18a96d893 100644 --- a/qt-models/divepicturemodel.h +++ b/qt-models/divepicturemodel.h @@ -5,13 +5,6 @@ #include #include -typedef QPair SHashedFilename; - -class SHashedImage : public QImage { -public: - SHashedImage(struct picture *picture); -}; - struct PhotoHelper { QImage image; int offsetSeconds; -- cgit v1.2.3-70-g09d2