From d361249be9ec31d575713739f032394383052705 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 22 May 2009 15:42:00 +0200
Subject: Compiles && link with webkitKDE modulo the load method

---
 src/CMakeLists.txt |  5 +++++
 src/mainview.cpp   |  2 +-
 src/webview.cpp    | 13 ++++++++-----
 src/webview.h      | 10 ++++++----
 4 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd7414a5..7fba4466 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,6 +41,11 @@ KDE4_ADD_KCFG_FILES( rekonq_SRCS rekonq.kcfgc )
 
 ### ------------------------------------------
 
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${KDEWEBKIT_INCLUDE_DIR}
+    )
+
 ADD_DEFINITIONS( ${KDE4_DEFINITIONS} ${KDEWEBKIT_DEFINITIONS} )
 
 KDE4_ADD_EXECUTABLE( rekonq ${rekonq_SRCS} )
diff --git a/src/mainview.cpp b/src/mainview.cpp
index 8f3bf197..8f35fdd8 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -658,7 +658,7 @@ void MainView::loadUrl(const KUrl &url)
 
     if (webView)
     {
-        webView->load(loadingUrl);
+//         webView->load(loadingUrl,0L,0L); FIXME NOW!!
         webView->setFocus();
     }
 }
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)
 {
diff --git a/src/webview.h b/src/webview.h
index eba02505..6cddf77f 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -27,6 +27,9 @@
 // KDE Includes
 #include <KUrl>
 
+#include <kdewebkit/kwebpage.h>
+#include <kdewebkit/kwebview.h>
+
 // Qt Includes
 #include <QWebPage>
 
@@ -44,7 +47,7 @@ class QNetworkReply;
 class QSslError;
 
 
-class WebPage : public QWebPage
+class WebPage : public KWebPage
 {
     Q_OBJECT
 
@@ -60,7 +63,7 @@ protected:
                                  const QNetworkRequest &request,
                                  NavigationType type);
 
-    QWebPage *createWindow(QWebPage::WebWindowType type);
+    KWebPage *createWindow(QWebPage::WebWindowType type);
     QObject *createPlugin(const QString &classId,
                           const QUrl &url,
                           const QStringList &paramNames,
@@ -85,7 +88,7 @@ private:
 #include <QWebView>
 
 
-class WebView : public QWebView
+class WebView : public KWebView
 {
     Q_OBJECT
 
@@ -130,4 +133,3 @@ private:
 };
 
 #endif
-
-- 
cgit v1.2.1