Merge branch 'master' into local-svn

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@979225 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 54 insertions, 0 deletions

diff --git a/src/kaccessmanager.h b/src/kaccessmanager.h
new file mode 100644
index 00000000..8325c890
--- /dev/null
+++ b/src/kaccessmanager.h
@@ -0,0 +1,54 @@
+/* ============================================================
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
+* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it
+* and/or modify it under the terms of the GNU General
+* Public License as published by the Free Software Foundation;
+* either version 3, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* ============================================================ */
+
+
+#ifndef KACCESSMANAGER_H
+#define KACCESSMANAGER_H
+
+//KDE Network Includes
+#include <kdenetwork/knetworkaccessmanager.h>
+#include <kdenetwork/knetworkreply.h>
+
+// Forward Declarations
+class QNetworkRequest;
+class QIODevice;
+
+
+class NetworkAccessManager : public KNetworkAccessManager
+{
+    Q_OBJECT
+
+public:
+    NetworkAccessManager(QObject *parent = 0);
+
+public slots:
+    void loadSettings();
+
+private slots:
+    void authenticationRequired(QNetworkReply *reply, QAuthenticator *auth);
+    void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth);
+
+#ifndef QT_NO_OPENSSL
+    void slotSSLErrors(QNetworkReply *reply, const QList<QSslError> &error);
+#endif
+
+};
+
+#endif // KACCESSMANAGER_H