diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-05-26 14:29:42 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-05-26 14:29:42 +0200 |
| commit | ccb09a51449cfac70cedf33875e317b4005263f4 (patch) | |
| tree | 8e43e16f56e3eb6304ee1d7904f7301e3409a0b3 | |
| parent | Working on adopting WebView search bar.. (diff) | |
| download | rekonq-ccb09a51449cfac70cedf33875e317b4005263f4.tar.xz | |
Fixing Compilation
| -rw-r--r-- | src/networkaccessmanager.cpp | 4 | ||||
| -rw-r--r-- | src/networkaccessmanager.h | 2 | ||||
| -rw-r--r-- | src/webpage.cpp | 1 | ||||
| -rw-r--r-- | src/webpage.h | 3 | ||||
| -rw-r--r-- | src/webview.h | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp index 2c42f5d2..ddab6ffe 100644 --- a/src/networkaccessmanager.cpp +++ b/src/networkaccessmanager.cpp @@ -63,7 +63,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(); @@ -159,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(); diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h index ae356743..8416d6a2 100644 --- a/src/networkaccessmanager.h +++ b/src/networkaccessmanager.h @@ -45,7 +45,7 @@ private slots: 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 }; diff --git a/src/webpage.cpp b/src/webpage.cpp index 664c812b..bfc128b8 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -34,6 +34,7 @@ #include "networkaccessmanager.h" #include "download.h" #include "history.h" +#include "webview.h" // KDE Includes #include <KStandardDirs> diff --git a/src/webpage.h b/src/webpage.h index 87fd3549..abb25171 100644 --- a/src/webpage.h +++ b/src/webpage.h @@ -44,7 +44,8 @@ class QAuthenticator; class QMouseEvent; class QNetworkProxy; class QNetworkReply; -class QSslError; + +class WebView; class WebPage : public KWebPage diff --git a/src/webview.h b/src/webview.h index ab69f799..ae420de4 100644 --- a/src/webview.h +++ b/src/webview.h @@ -45,7 +45,7 @@ class QAuthenticator; class QMouseEvent; class QNetworkProxy; class QNetworkReply; -class QSslError; +class WebPage; class WebView : public KWebView |