diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-05-22 15:42:00 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-05-22 15:42:00 +0200 |
commit | d361249be9ec31d575713739f032394383052705 (patch) | |
tree | a2adff3e2972cecdb26f01a0243c3fc08f004c40 /src/webview.cpp | |
parent | CMakeLists.. (diff) | |
download | rekonq-d361249be9ec31d575713739f032394383052705.tar.xz |
Compiles && link with webkitKDE modulo the load method
Diffstat (limited to 'src/webview.cpp')
-rw-r--r-- | src/webview.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/webview.cpp b/src/webview.cpp index 01fd0d00..1e713f5a 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -44,6 +44,9 @@ #include <KDebug> #include <KToolInvocation> +#include <kdewebkit/kwebpage.h> +#include <kdewebkit/kwebview.h> + // Qt Includes #include <QtGui/QContextMenuEvent> #include <QtGui/QWheelEvent> @@ -64,7 +67,7 @@ WebPage::WebPage(QObject *parent) - : QWebPage(parent) + : KWebPage(parent) , m_keyboardModifiers(Qt::NoModifier) , m_pressedButtons(Qt::NoButton) { @@ -151,7 +154,7 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r { webView = Application::instance()->newWebView(); webView->setFocus(); - webView->load(request); +// webView->load(request); FIXME NOW!! m_keyboardModifiers = Qt::NoModifier; m_pressedButtons = Qt::NoButton; return false; @@ -169,7 +172,7 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r { webView = Application::instance()->newWebView(); webView->setFocus(); - webView->load(request); +// webView->load(request); FIXME NOW!! return false; } } @@ -178,7 +181,7 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r } -QWebPage *WebPage::createWindow(QWebPage::WebWindowType type) +KWebPage *WebPage::createWindow(QWebPage::WebWindowType type) { kDebug() << "creating window as new tab.. "; @@ -291,7 +294,7 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) WebView::WebView(QWidget* parent) - : QWebView(parent) + : KWebView(parent) , m_page(new WebPage(this)) , m_progress(0) { |