diff options
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/networkaccessmanager.cpp (renamed from src/networkmanager.cpp) | 0 | ||||
| -rw-r--r-- | src/networkaccessmanager.h | 45 | ||||
| -rw-r--r-- | src/networkmanager.h | 60 |
4 files changed, 40 insertions, 67 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e8c39158..a0bcbfb1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ ### ------- SETTING REKONQ FILES.. SET( rekonq_SRCS - networkmanager.cpp + networkaccessmanager.cpp autosaver.cpp application.cpp mainwindow.cpp diff --git a/src/networkmanager.cpp b/src/networkaccessmanager.cpp index 3d4091bb..3d4091bb 100644 --- a/src/networkmanager.cpp +++ b/src/networkaccessmanager.cpp diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h index eb3ee071..3bfa7eff 100644 --- a/src/networkaccessmanager.h +++ b/src/networkaccessmanager.h @@ -2,7 +2,8 @@ * * This file is a part of the rekonq project * -* Copyright (C) 2009 by Andrea Diamantini <adjam7 at gmail dot com> +* 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 @@ -18,10 +19,42 @@ * ============================================================ */ -#include <kdeversion.h> +#ifndef NETWORKMANAGER_H +#define NETWORKMANAGER_H -#if KDE_IS_VERSION(4,2,70) - #include "networkmanager.h" -#else - #include "kaccessmanager.h" +// KDE Includes +// #include <KIO/AccessManager> + +#include <QtNetwork/QNetworkAccessManager> + +// Forward Declarations +class QNetworkDiskCache; + +// using namespace KIO; + +class NetworkAccessManager : public QNetworkAccessManager +{ + Q_OBJECT + +public: + NetworkAccessManager(QObject *parent = 0); + + void resetDiskCache(); + +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 + +private: + QNetworkDiskCache *m_diskCache; + +}; + +#endif // NETWORKMANAGER_H diff --git a/src/networkmanager.h b/src/networkmanager.h deleted file mode 100644 index 3bfa7eff..00000000 --- a/src/networkmanager.h +++ /dev/null @@ -1,60 +0,0 @@ -/* ============================================================ -* -* 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 NETWORKMANAGER_H -#define NETWORKMANAGER_H - -// KDE Includes -// #include <KIO/AccessManager> - -#include <QtNetwork/QNetworkAccessManager> - -// Forward Declarations -class QNetworkDiskCache; - -// using namespace KIO; - -class NetworkAccessManager : public QNetworkAccessManager -{ - Q_OBJECT - -public: - NetworkAccessManager(QObject *parent = 0); - - void resetDiskCache(); - -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 - -private: - QNetworkDiskCache *m_diskCache; - -}; - -#endif // NETWORKMANAGER_H |