diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-05-28 12:08:45 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-05-28 12:08:45 +0200 |
| commit | f4054a4adf480b4960f6925c3f5e65a919ff3f6e (patch) | |
| tree | 3e00a232e9ee8ef93f6a7ee2b970cad6bdea0c3d /src/networkaccessmanager.cpp | |
| parent | Removed QDialog instances (diff) | |
| parent | cosmetic (diff) | |
| download | rekonq-f4054a4adf480b4960f6925c3f5e65a919ff3f6e.tar.xz | |
Fixed mainwindow conflicts
Diffstat (limited to 'src/networkaccessmanager.cpp')
| -rw-r--r-- | src/networkaccessmanager.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index cbf263b6..2eba844a 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -40,6 +40,7 @@ // Qt Includes #include <QtCore/QPointer> +#include <QtCore/QIODevice> #include <QtGui/QStyle> #include <QtGui/QTextDocument> @@ -47,11 +48,12 @@ #include <QtNetwork/QAuthenticator> #include <QtNetwork/QNetworkProxy> #include <QtNetwork/QNetworkReply> +#include <QtNetwork/QNetworkRequest> #include <QtNetwork/QSslError> NetworkAccessManager::NetworkAccessManager(QObject *parent) - : QNetworkAccessManager(parent) + : AccessManager(parent) { connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)), SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*))); @@ -60,7 +62,7 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent) #ifndef QT_NO_OPENSSL connect(this, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)), - SLOT(sslErrors(QNetworkReply*, const QList<QSslError>&))); + SLOT(slotSSLErrors(QNetworkReply*, const QList<QSslError>&))); #endif loadSettings(); @@ -74,9 +76,9 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent) void NetworkAccessManager::loadSettings() { - QNetworkProxy proxy; if (ReKonfig::isProxyEnabled()) { + QNetworkProxy proxy; if (ReKonfig::proxyType() == 0) { proxy.setType(QNetworkProxy::Socks5Proxy); @@ -89,8 +91,9 @@ void NetworkAccessManager::loadSettings() proxy.setPort(ReKonfig::proxyPort()); proxy.setUser(ReKonfig::proxyUserName()); proxy.setPassword(ReKonfig::proxyPassword()); + + setProxy(proxy); } - setProxy(proxy); } @@ -156,7 +159,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox #ifndef QT_NO_OPENSSL -void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error) +void NetworkAccessManager::slotSSLErrors(QNetworkReply *reply, const QList<QSslError> &error) { MainWindow *mainWindow = Application::instance()->mainWindow(); @@ -164,7 +167,9 @@ void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError for (int i = 0; i < error.count(); ++i) errorStrings += error.at(i).errorString(); QString errors = errorStrings.join(QLatin1String("\n")); - int ret = KMessageBox::warningContinueCancel(mainWindow, i18n("SSL Errors:\n\n") + reply->url().toString() + "\n\n" + QString(errors) + "\n\n"); + int ret = KMessageBox::warningContinueCancel(mainWindow, + i18n("SSL Errors:\n\n") + reply->url().toString() + "\n\n" + QString(errors) + "\n\n"); + if (ret == KMessageBox::Yes) reply->ignoreSslErrors(); } |