← Back to branch summary

~ubuntu-branches/ubuntu/quantal/arora/quantal

« back to all changes in this revision

Viewing changes to src/network/networkaccessmanager.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Roderick B. Greening
  • Date: 2009-10-01 16:08:58 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20091001160858-h1wnt3ddyzl07nih
Tags: 0.10.0-0ubuntu1
* New upstream release 
* Remove patches
  - kubuntu_01_google_lucky.diff - Open Search now used upstream
  - kubuntu_02_default_bookmarks.diff - bookmarks fixed upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/network/networkaccessmanager.cpp
62
62
 
63
63
#include "networkaccessmanager.h"
64
64
 
 
65
#include "adblockmanager.h"
 
66
#include "adblocknetwork.h"
 
67
#include "adblockschemeaccesshandler.h"
65
68
#include "acceptlanguagedialog.h"
 
69
#include "autofillmanager.h"
66
70
#include "browserapplication.h"
67
71
#include "browsermainwindow.h"
68
72
#include "cookiejar.h"
85
89
#include <qdatetime.h>
86
90
 
87
91
NetworkAccessManager::NetworkAccessManager(QObject *parent)
88
 
    : QNetworkAccessManager(parent)
 
92
    : NetworkAccessManagerProxy(parent)
 
93
    , m_adblockNetwork(0)
89
94
{
90
95
    connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
91
96
            SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*)));
101
106
 
102
107
    // Register custom scheme handlers
103
108
    setSchemeHandler(QLatin1String("file"), new FileAccessHandler(this));
 
109
    setSchemeHandler(QLatin1String("abp"), new AdBlockSchemeAccessHandler(this));
104
110
    setCookieJar(new CookieJar);
105
111
}
106
112
 
327
333
 
328
334
QNetworkReply *NetworkAccessManager::createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
329
335
{
 
336
    if (op == PostOperation && outgoingData) {
 
337
        QByteArray outgoingDataByteArray = outgoingData->peek(1024 * 1024);
 
338
        BrowserApplication::autoFillManager()->post(request, outgoingDataByteArray);
 
339
    }
 
340
 
330
341
    QNetworkReply *reply = 0;
331
342
 
332
343
    // Check if there is a valid handler registered for the requested URL scheme
342
353
    if (!m_acceptLanguage.isEmpty())
343
354
        req.setRawHeader("Accept-Language", m_acceptLanguage);
344
355
 
 
356
    // Adblock
 
357
    if (op == QNetworkAccessManager::GetOperation) {
 
358
        if (!m_adblockNetwork)
 
359
            m_adblockNetwork = AdBlockManager::instance()->network();
 
360
        reply = m_adblockNetwork->block(req);
 
361
        if (reply)
 
362
            return reply;
 
363
    }
 
364
 
345
365
    reply = QNetworkAccessManager::createRequest(op, req, outgoingData);
346
366
    emit requestCreated(op, req, reply);
347
367
    return reply;
348
368
}
 
369