From 04a0850cb6f7750859a10ea3fe3c7a48e94728dc Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 11 Nov 2009 02:14:26 +0100
Subject: Moving to kdewebkit. First step

---
 src/webpage.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/webpage.h')

diff --git a/src/webpage.h b/src/webpage.h
index 45fc0c51..725788ee 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -32,22 +32,23 @@
 #define WEBPAGE_H
 
 
+// KDE Includes
+#include <KWebPage>
+
 // Qt Includes
-#include <QWebPage>
 #include <QUrl>
 
 // Forward Declarations
 class QWebFrame;
 class QNetworkReply;
-class QUrl;
 
 
-class WebPage : public QWebPage
+class WebPage : public KWebPage
 {
     Q_OBJECT
 
 public:
-    explicit WebPage(QObject *parent = 0);
+    explicit WebPage(QObject *parent = 0, qlonglong windowId = 0);
     ~WebPage();
     
 public slots:
@@ -59,13 +60,10 @@ protected:
     
     virtual bool acceptNavigationRequest(QWebFrame *frame, 
                                          const QNetworkRequest &request, 
-                                         NavigationType type);
-
-    virtual QString userAgentForUrl(const QUrl& url) const;
+                                         NavigationType type);//
     
 protected Q_SLOTS:    
     virtual void handleUnsupportedContent(QNetworkReply *reply);
-    virtual void downloadRequested(const QNetworkRequest &request);
 
 private:
     friend class WebView;
-- 
cgit v1.2.1


From 06d7bc99ae16724d9b23bf0a589a6583dfdb0b46 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 12 Nov 2009 02:50:14 +0100
Subject: Fixes and improvements in rekonq web classes

---
 src/webpage.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/webpage.h')

diff --git a/src/webpage.h b/src/webpage.h
index 725788ee..fed877ae 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -50,13 +50,14 @@ class WebPage : public KWebPage
 public:
     explicit WebPage(QObject *parent = 0, qlonglong windowId = 0);
     ~WebPage();
-    
+
+    virtual bool authorizedRequest(const QUrl &url) const;
+
 public slots:
     void manageNetworkErrors(QNetworkReply* reply);
 
 protected:
     WebPage *createWindow(WebWindowType type);
-    virtual WebPage *newWindow(WebWindowType type);
     
     virtual bool acceptNavigationRequest(QWebFrame *frame, 
                                          const QNetworkRequest &request, 
-- 
cgit v1.2.1


From c50290e8fdbce0e7736a717cf44c8ab8b062fe77 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 12 Nov 2009 15:35:05 +0100
Subject: KIO download system ported to kdewebkit signals and functions

---
 src/webpage.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/webpage.h')

diff --git a/src/webpage.h b/src/webpage.h
index fed877ae..eb558220 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -54,14 +54,14 @@ public:
     virtual bool authorizedRequest(const QUrl &url) const;
 
 public slots:
-    void manageNetworkErrors(QNetworkReply* reply);
+    void manageNetworkErrors(QNetworkReply *reply);
 
 protected:
     WebPage *createWindow(WebWindowType type);
     
     virtual bool acceptNavigationRequest(QWebFrame *frame, 
                                          const QNetworkRequest &request, 
-                                         NavigationType type);//
+                                         NavigationType type);
     
 protected Q_SLOTS:    
     virtual void handleUnsupportedContent(QNetworkReply *reply);
-- 
cgit v1.2.1