From: Jussi Laitinen Date: Thu, 27 May 2010 09:51:59 +0000 (+0300) Subject: Added no caching attribute to ImageFetcher and SituareService requests. X-Git-Tag: v0.5~5^2~8^2~3 X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=db70b4248b175f4176cb94b1cd33453a0b33923a;p=situare Added no caching attribute to ImageFetcher and SituareService requests. --- diff --git a/src/map/mapengine.cpp b/src/map/mapengine.cpp index 13a736e..19f49ba 100644 --- a/src/map/mapengine.cpp +++ b/src/map/mapengine.cpp @@ -41,7 +41,7 @@ #include "ownlocationitem.h" #include "mapengine.h" -#include "engine/networkaccessmanager.h" +#include "network/networkaccessmanager.h" MapEngine::MapEngine(QObject *parent) : QObject(parent), diff --git a/src/map/mapfetcher.cpp b/src/map/mapfetcher.cpp index 84eef04..9e8726f 100644 --- a/src/map/mapfetcher.cpp +++ b/src/map/mapfetcher.cpp @@ -31,7 +31,7 @@ #include "mapfetcher.h" #include "mapcommon.h" -#include "engine/networkaccessmanager.h" +#include "network/networkaccessmanager.h" const int MAX_PARALLEL_DOWNLOADS = 2; ///< Max simultaneous parallel downloads const int NOT_FOUND = -1; ///< Return value if matching request is not found from the list diff --git a/src/map/mapfetcher.h b/src/map/mapfetcher.h index 12a5809..702f953 100644 --- a/src/map/mapfetcher.h +++ b/src/map/mapfetcher.h @@ -27,7 +27,7 @@ #include #include "maptilerequest.h" -#include "engine/networkaccessmanager.h" +#include "network/networkaccessmanager.h" class QNetworkReply; class QUrl; diff --git a/src/network/networkaccessmanager.cpp b/src/network/networkaccessmanager.cpp index f276103..f539c62 100644 --- a/src/network/networkaccessmanager.cpp +++ b/src/network/networkaccessmanager.cpp @@ -51,11 +51,10 @@ QAbstractNetworkCache *NetworkAccessManager::cache() const void NetworkAccessManager::connected() { - qWarning() << __PRETTY_FUNCTION__; + qDebug() << __PRETTY_FUNCTION__; //Loop through all requests and calls get method. foreach (const QNetworkRequest &request, m_requestQueue) { - qWarning() << __PRETTY_FUNCTION__ << "get():" << request.url().toString(); QNetworkReply *reply = m_networkAccessManagerPrivate->get(request); m_temporaryReplyQueue.insert(request.url().toString(), reply); } @@ -65,7 +64,7 @@ void NetworkAccessManager::connected() void NetworkAccessManager::downloadFinished(QNetworkReply *reply) { - qWarning() << __PRETTY_FUNCTION__ << reply->url().toString(); + qDebug() << __PRETTY_FUNCTION__; QString key = m_temporaryReplyQueue.key(reply, ""); @@ -88,11 +87,10 @@ void NetworkAccessManager::downloadFinished(QNetworkReply *reply) QNetworkReply *NetworkAccessManager::get(const QNetworkRequest &request) { - qWarning() << __PRETTY_FUNCTION__ << request.url().toString(); + qDebug() << __PRETTY_FUNCTION__; //Disconnected from network, queue request and return empty reply. if (!m_networkHandler->isConnected()) { - qWarning() << __PRETTY_FUNCTION__ << "not connected"; m_requestQueue.append(request); m_networkHandler->connect(); QNetworkReply *reply = new NetworkReply(request, this); @@ -101,7 +99,6 @@ QNetworkReply *NetworkAccessManager::get(const QNetworkRequest &request) } //Connected, use normal get method. else { - qWarning() << __PRETTY_FUNCTION__ << "connected"; return m_networkAccessManagerPrivate->get(request); } } diff --git a/src/network/networkhandler.cpp b/src/network/networkhandler.cpp index 5b9c724..68d3ee2 100644 --- a/src/network/networkhandler.cpp +++ b/src/network/networkhandler.cpp @@ -23,9 +23,10 @@ #include "networkhandler.h" -static QDBusConnection dBusConnection = QDBusConnection::systemBus(); const int CONNECTION_STATE_INDEX = 7; +static QDBusConnection dBusConnection = QDBusConnection::systemBus(); + NetworkHandler::NetworkHandler(QObject *parent) : QObject(parent), m_connected(false), @@ -43,13 +44,12 @@ NetworkHandler::NetworkHandler(QObject *parent) void NetworkHandler::stateChanged(const QDBusMessage &message) { - qDebug() << __PRETTY_FUNCTION__ << message.arguments(); + qDebug() << __PRETTY_FUNCTION__; - if (message.arguments().count() >= 8) { + if (message.arguments().count() > CONNECTION_STATE_INDEX) { bool conversionOk; int connectionState = message.arguments().at(CONNECTION_STATE_INDEX).toInt(&conversionOk); - qWarning() << __PRETTY_FUNCTION__ << "Connection state: " << connectionState; if (conversionOk) { if ((connectionState == ICD_STATE_DISCONNECTED) && (isConnected())) { diff --git a/src/situareservice/imagefetcher.cpp b/src/situareservice/imagefetcher.cpp index a4e0763..6de18fc 100644 --- a/src/situareservice/imagefetcher.cpp +++ b/src/situareservice/imagefetcher.cpp @@ -24,7 +24,7 @@ #include #include #include "imagefetcher.h" -#include "engine/networkaccessmanager.h" +#include "network/networkaccessmanager.h" ImageFetcher::ImageFetcher(NetworkAccessManager *manager, QObject *parent) : QObject(parent) @@ -52,6 +52,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); diff --git a/src/situareservice/situareservice.cpp b/src/situareservice/situareservice.cpp index 1b5276d..c74e7dc 100644 --- a/src/situareservice/situareservice.cpp +++ b/src/situareservice/situareservice.cpp @@ -29,7 +29,7 @@ #include "situarecommon.h" #include "parser.h" #include "ui/avatarimage.h" -#include "engine/networkaccessmanager.h" +#include "network/networkaccessmanager.h" SituareService::SituareService(QObject *parent) : QObject(parent), @@ -51,14 +51,10 @@ SituareService::~SituareService() { qDebug() << __PRETTY_FUNCTION__; - delete m_networkManager; - m_networkManager = 0; if(m_user) { delete m_user; m_user = 0; } - delete m_imageFetcher; - m_imageFetcher = 0; qDeleteAll(m_friendsList.begin(), m_friendsList.end()); m_friendsList.clear(); @@ -231,6 +227,7 @@ void SituareService::sendRequest(const QUrl &url, const QString &cookieType, con QNetworkRequest request; request.setUrl(url); + request.setAttribute(QNetworkRequest::CacheSaveControlAttribute, false); request.setRawHeader(cookieType.toAscii(), cookie.toUtf8()); QNetworkReply *reply = m_networkManager->get(request); diff --git a/src/src.pro b/src/src.pro index d6fe687..3c3833d 100644 --- a/src/src.pro +++ b/src/src.pro @@ -43,11 +43,11 @@ SOURCES += main.cpp \ map/gpslocationitem.cpp \ ui/zoombuttonpanel.cpp \ ui/userinfo.cpp \ - engine/networkhandler.cpp \ ui/sidepanel.cpp \ - engine/networkaccessmanager.cpp \ - engine/networkreply.cpp \ - ui/zoombutton.cpp + ui/zoombutton.cpp \ + network/networkaccessmanager.cpp \ + network/networkhandler.cpp \ + network/networkreply.cpp HEADERS += ui/mainwindow.h \ map/mapengine.h \ map/mapview.h \ @@ -88,11 +88,11 @@ HEADERS += ui/mainwindow.h \ ui/zoombuttonpanel.h \ common.h \ ui/userinfo.h \ - engine/networkhandler.h \ ui/sidepanel.h \ - engine/networkaccessmanager.h \ - engine/networkreply.h \ - ui/zoombutton.h + ui/zoombutton.h \ + network/networkaccessmanager.h \ + network/networkhandler.h \ + network/networkreply.h QT += network \ webkit