diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-08-22 21:27:38 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-08-22 21:27:38 +0200 |
| commit | dcc43cd1018165624594cd7d2b496d0739745d43 (patch) | |
| tree | 262bb978b1b9bd2b8a43091a52b54ef1cdb7d702 /src | |
| parent | Merge branch 'OneUrlBar2' (diff) | |
| download | rekonq-dcc43cd1018165624594cd7d2b496d0739745d43.tar.xz | |
Rekonq 0.2.51 with (just) one urlbar and (just, again) KDE 4.3.1 support
Note that pointing to KDE 4.3.1 is due to the problems about POST connections
to be fixed
Diffstat (limited to 'src')
| -rw-r--r-- | src/networkaccessmanager.cpp | 2 | ||||
| -rw-r--r-- | src/networkaccessmanager.h | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index 473fa770..c99fa094 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -56,7 +56,7 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent) - : RekonqAccessManager(parent) + : AccessManager(parent) , m_diskCache(0) { connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)), diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h index a6c264f2..45a3e9f9 100644 --- a/src/networkaccessmanager.h +++ b/src/networkaccessmanager.h @@ -27,22 +27,18 @@ #ifndef NETWORKACCESSMANAGER_H #define NETWORKACCESSMANAGER_H -#include <kdeversion.h> -#if KDE_IS_VERSION(4, 2, 70) - #include <kio/accessmanager.h> - using namespace KIO; - typedef AccessManager RekonqAccessManager; -#else - #include <QtNetwork/QNetworkAccessManager> - typedef QNetworkAccessManager RekonqAccessManager; -#endif +// KDE Includes +#include <kio/accessmanager.h> // Forward Declarations class QNetworkDiskCache; -class NetworkAccessManager : public RekonqAccessManager +using namespace KIO; + + +class NetworkAccessManager : public AccessManager { Q_OBJECT |