FIxing conflicts

Merge branch 'rekonq04' into dev04try

Conflicts:
	src/CMakeLists.txt

1 files changed, 8 insertions, 4 deletions

diff --git a/src/webview.h b/src/webview.h
index e860b8c8..4fa87978 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -33,13 +33,13 @@
 #include <KUrl>
 
 // Qt Includes
-#include <QWebView>
+#include <KWebView>
 
 // Forward Declarations
 class WebPage;
 
 
-class WebView : public QWebView
+class WebView : public KWebView
 {
     Q_OBJECT
 
@@ -55,9 +55,8 @@ public:
     
 protected:
     void contextMenuEvent(QContextMenuEvent *event);
-    void mousePressEvent(QMouseEvent *event);
+    void mousePressEvent(QMouseEvent *event);// need to be ported
     void mouseMoveEvent(QMouseEvent *event);
-    void wheelEvent(QWheelEvent *event);
     void keyPressEvent(QKeyEvent *event);
     
 private slots:
@@ -72,6 +71,11 @@ private slots:
     void openLinkInNewWindow();
     void openLinkInNewTab();
 
+    void loadInNewTab(const KUrl &url);
+    
+    void downloadRequest(const KUrl &url);
+    void downloadRequest(const QNetworkRequest &request);
+
 private:
     WebPage *m_page;
     int m_progress;