Updated error handling, added error contexts. Fixed fullscreen button

[situare] / src / situareservice / imagefetcher.cpp

diff --git a/src/situareservice/imagefetcher.cpp b/src/situareservice/imagefetcher.cpp
index a4e0763..b89edaa 100644 (file)
--- a/src/situareservice/imagefetcher.cpp
+++ b/src/situareservice/imagefetcher.cpp
@@ -24,7 +24,8 @@
 #include <QNetworkReply>
 #include <QPixmap>
 #include "imagefetcher.h"
-#include "engine/networkaccessmanager.h"
+#include "network/networkaccessmanager.h"
+#include "common.h"
 
 ImageFetcher::ImageFetcher(NetworkAccessManager *manager, QObject *parent)
     : QObject(parent)
@@ -52,6 +53,7 @@ void ImageFetcher::startNextDownload()
     QUrl url = m_downloadQueue.dequeue();
 
     QNetworkRequest request(url);
+    request.setAttribute(QNetworkRequest::CacheSaveControlAttribute, false);
     request.setRawHeader("User-Agent", "Situare");
     QNetworkReply *reply = m_manager->get(request);
 
@@ -75,7 +77,7 @@ void ImageFetcher::downloadFinished(QNetworkReply *reply)
             emit imageReceived(url, image);
         }
         else {
-            emit error(reply->errorString());
+            emit error(ErrorContext::SITUARE, SituareError::IMAGE_DOWNLOAD_FAILED);
         }
 
         m_currentDownloads.removeAll(reply);