summaryrefslogtreecommitdiff
path: root/src/networkaccessmanager.h
diff options
context:
space:
mode:
authoradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-05-28 10:06:17 +0000
committeradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-05-28 10:06:17 +0000
commit796f0b4b7bc8201bad2e1bad78a82ccd6bf182ec (patch)
treed56b2d70aa5e5e8932c5ef6f2403b6263fffd030 /src/networkaccessmanager.h
parentSVN_SILENT made messages (.desktop file) (diff)
parentcosmetic (diff)
downloadrekonq-796f0b4b7bc8201bad2e1bad78a82ccd6bf182ec.tar.xz
Merge branch 'master' into local-svn
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@973966 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/networkaccessmanager.h')
-rw-r--r--src/networkaccessmanager.h14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index 7da2f54f..8416d6a2 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -22,11 +22,15 @@
#ifndef NETWORKACCESSMANAGER_H
#define NETWORKACCESSMANAGER_H
-// Qt Includes
-#include <QtNetwork/QNetworkAccessManager>
+// KDE Includes
+#include <KIO/AccessManager>
+class QNetworkRequest;
+class QIODevice;
-class NetworkAccessManager : public QNetworkAccessManager
+using namespace KIO;
+
+class NetworkAccessManager : public AccessManager
{
Q_OBJECT
@@ -39,9 +43,11 @@ public slots:
private slots:
void authenticationRequired(QNetworkReply *reply, QAuthenticator *auth);
void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth);
+
#ifndef QT_NO_OPENSSL
- void sslErrors(QNetworkReply *reply, const QList<QSslError> &error);
+ void slotSSLErrors(QNetworkReply *reply, const QList<QSslError> &error);
#endif
+
};
#endif // NETWORKACCESSMANAGER_H