diff options
| author | Panagiotis Papadopoulos <pano_90@gmx.net> | 2009-06-21 23:08:53 +0200 |
|---|---|---|
| committer | Panagiotis Papadopoulos <pano_90@gmx.net> | 2009-06-21 23:08:53 +0200 |
| commit | 4e4c628ca96fb9cc2810cfd1c93ce4db2ed77c2d (patch) | |
| tree | 933b7f75f631da867c342bbf86cb3b0d68e2d6fe /src/networkmanager.cpp | |
| parent | Modified strings in the WebKit settings a bit (diff) | |
| parent | 0.1.6 version with new notifying system (diff) | |
| download | rekonq-4e4c628ca96fb9cc2810cfd1c93ce4db2ed77c2d.tar.xz | |
Merge commit 'rekonq-master/master'
Diffstat (limited to 'src/networkmanager.cpp')
| -rw-r--r-- | src/networkmanager.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/networkmanager.cpp b/src/networkmanager.cpp index bbe89816..2cf65e1c 100644 --- a/src/networkmanager.cpp +++ b/src/networkmanager.cpp @@ -51,13 +51,9 @@ #include <QtNetwork/QNetworkRequest> #include <QtNetwork/QSslError> -#if KDE_IS_VERSION(4,2,70) -NetworkAccessManager::NetworkAccessManager(QObject *parent) - : KIO::AccessManager(parent) -#else + NetworkAccessManager::NetworkAccessManager(QObject *parent) - : KNetworkAccessManager(parent) -#endif + : AccessManager(parent) { connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)), SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*))); @@ -101,7 +97,6 @@ void NetworkAccessManager::loadSettings() } - void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthenticator *auth) { MainWindow *mainWindow = Application::instance()->mainWindow(); |