diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-10-02 15:55:07 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-10-02 15:55:07 +0200 |
commit | a67b0137ad0a8a4399de23238aa3cafdfdd3522f (patch) | |
tree | 920805afeb088400ff073d1581cf282ec0713fa3 /src/networkaccessmanager.cpp | |
parent | Merge branch 'DEVS' (diff) | |
download | rekonq-a67b0137ad0a8a4399de23238aa3cafdfdd3522f.tar.xz |
Simpler KIO management (no more metadata)
Diffstat (limited to 'src/networkaccessmanager.cpp')
-rw-r--r-- | src/networkaccessmanager.cpp | 60 |
1 files changed, 24 insertions, 36 deletions
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index f95fa456..c21d54df 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -191,39 +191,27 @@ void NetworkAccessManager::slotSSLErrors(QNetworkReply *reply, const QList<QSslE #endif -KIO::MetaData& NetworkAccessManager::sessionMetaData() -{ - return m_sessionMetaData; -} - - -KIO::MetaData& NetworkAccessManager::requestMetaData() -{ - return m_requestMetaData; -} - - -QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData) -{ - // TODO implement Ad-Block here (refuse connections..) - - QNetworkRequest request(req); - KIO::MetaData metaData = m_sessionMetaData; - metaData += m_requestMetaData; - - QVariant attr = req.attribute(QNetworkRequest::User); - if (attr.isValid() && attr.type() == QVariant::Map) - { - metaData += attr.toMap(); - } - - if (!metaData.isEmpty()) - { - attr = metaData.toVariant(); - request.setAttribute(QNetworkRequest::User, attr); - } - - // Clear the per request meta data... - m_requestMetaData.clear(); - return AccessManager::createRequest(op, request, outgoingData); -} +// QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData) +// { +// // TODO implement Ad-Block here (refuse connections..) +// +// QNetworkRequest request(req); +// KIO::MetaData metaData = m_sessionMetaData; +// metaData += m_requestMetaData; +// +// QVariant attr = req.attribute(QNetworkRequest::User); +// if (attr.isValid() && attr.type() == QVariant::Map) +// { +// metaData += attr.toMap(); +// } +// +// if (!metaData.isEmpty()) +// { +// attr = metaData.toVariant(); +// request.setAttribute(QNetworkRequest::User, attr); +// } +// +// // Clear the per request meta data... +// m_requestMetaData.clear(); +// return AccessManager::createRequest(op, request, outgoingData); +// } |