From 7dbff807a4a71d1bd81f438fe0facd833add3293 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 31 Jul 2009 17:09:24 +0200 Subject: This commit removes rekonq KDEnetwork dependencies. All this just to support KDE 4.2 Anyway this will be dropped with rekonq 0.3.. --- src/kaccessmanager.cpp | 40 +++++++++++++++++++++++++++++++++++----- src/kaccessmanager.h | 10 +++++----- 2 files changed, 40 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/kaccessmanager.cpp b/src/kaccessmanager.cpp index c298ed88..a79ff865 100644 --- a/src/kaccessmanager.cpp +++ b/src/kaccessmanager.cpp @@ -53,7 +53,7 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent) - : KNetworkAccessManager(parent) + : QNetworkAccessManager(parent) { connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)), SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*))); @@ -67,10 +67,8 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent) loadSettings(); - QNetworkDiskCache *diskCache = new QNetworkDiskCache(this); - QString location = KStandardDirs::locateLocal("cache", "", true); - diskCache->setCacheDirectory(location); - setCache(diskCache); + // resetting disk cache + resetDiskCache(); } @@ -129,6 +127,38 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent } +void NetworkAccessManager::resetDiskCache() +{ + if(!m_diskCache) + { + m_diskCache = new QNetworkDiskCache(this); + QString location = KStandardDirs::locateLocal("cache", "", true); + kDebug() << location; + + m_diskCache->setCacheDirectory(location); + setCache(m_diskCache); + } + else + { + QString location = m_diskCache->cacheDirectory(); +// setCache(0); +// delete m_diskCache; + + QDir cacheDir(location + QString("/http") ); + QStringList fileList = cacheDir.entryList(); + foreach(QString str, fileList) + { + QFile file(str); + file.remove(); + } + +// m_diskCache = new QNetworkDiskCache(this); +// m_diskCache->setCacheDirectory(location); +// setCache(m_diskCache); + } +} + + void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth) { MainWindow *mainWindow = Application::instance()->mainWindow(); diff --git a/src/kaccessmanager.h b/src/kaccessmanager.h index ed5c208d..8a88594f 100644 --- a/src/kaccessmanager.h +++ b/src/kaccessmanager.h @@ -22,20 +22,20 @@ #ifndef KACCESSMANAGER_H #define KACCESSMANAGER_H -//KDE Network Includes -#include -#include -// Forward Declarations +// Qt Includes +#include -class NetworkAccessManager : public KNetworkAccessManager +class NetworkAccessManager : public QNetworkAccessManager { Q_OBJECT public: NetworkAccessManager(QObject *parent = 0); + void resetDiskCache(); + public slots: void loadSettings(); -- cgit v1.2.1