I tried a bit, but this is not working pretty well :(

We are actually creating two widget for request.
I'll merge it anyway to let you fix it :)

Merge commit 'refs/merge-requests/72' of git://gitorious.org/rekonq/mainline into m72

Conflicts:
	src/mainview.cpp
	src/webview.cpp

1 files changed, 6 insertions, 19 deletions

diff --git a/src/webview.h b/src/webview.h
index 2b3b97a4..60c8c9fc 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -30,9 +30,6 @@
 
 
 // KDE Includes
-#include <KUrl>
-
-// Qt Includes
 #include <KWebView>
 
 // Forward Declarations
@@ -44,39 +41,29 @@ class WebView : public KWebView
     Q_OBJECT
 
 public:
-    explicit WebView(QWidget *parent = 0);
+    explicit WebView(QWidget *parent);
     ~WebView();
-    
-    WebPage *page();
-    KUrl url() const;
-    QString lastStatusBarText() const;
-    int progress();
+
+    WebPage *page() { return m_page; }
     QPoint mousePos();
-    
+
 protected:
     void contextMenuEvent(QContextMenuEvent *event);
     void mousePressEvent(QMouseEvent *event);// need to be ported
     void mouseMoveEvent(QMouseEvent *event);
     void keyPressEvent(QKeyEvent *event);
-    
+
 private slots:
-    void setStatusBarText(const QString &string);
     void search();
-    void updateProgress(int progress);
-    void loadFinished(bool);
 
     void printFrame();
 
-    void viewImage(Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
     void openLinkInNewWindow();
     void openLinkInNewTab();
+    void viewImage(Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
 
-    void loadInNewTab(const KUrl &url);
-    
 private:
     WebPage *const m_page;
-    int m_progress;
-    QString m_statusBarText;
     QPoint m_mousePos;
 };