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, 0 insertions, 55 deletions

diff --git a/src/webview.cpp b/src/webview.cpp
index a1033fb6..0ba04bc2 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -59,17 +59,10 @@
 WebView::WebView(QWidget* parent)
     : KWebView(parent, false)
     , m_page( new WebPage(this) )
-    , m_progress(0)
     , m_mousePos(QPoint(0,0))
 {
     setPage(m_page);
 
-    connect(m_page, SIGNAL(statusBarMessage(const QString&)), this, SLOT(setStatusBarText(const QString&)));
-    
-    connect(this, SIGNAL(loadProgress(int)), this, SLOT(updateProgress(int)));
-    connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
-    connect(this, SIGNAL(linkMiddleOrCtrlClicked(const KUrl &)), this, SLOT(loadInNewTab(const KUrl &)) );
-
     // download system
     connect(this, SIGNAL(linkShiftClicked(const KUrl &)), m_page, SLOT(downloadUrl(const KUrl &)));
     connect(m_page, SIGNAL(downloadRequested(const QNetworkRequest &)), m_page, SLOT(downloadRequest(const QNetworkRequest &)));
@@ -81,36 +74,6 @@ WebView::~WebView()
 }
 
 
-WebPage *WebView::page()
-{
-    return m_page;
-}
-
-
-KUrl WebView::url() const 
-{ 
-    return KUrl(QWebView::url()); 
-}
-
-
-int WebView::progress()
-{
-    return m_progress;
-}
-
-
-QString WebView::lastStatusBarText() const
-{ 
-    return m_statusBarText; 
-}
-
-
-void WebView::setStatusBarText(const QString &string) 
-{ 
-    m_statusBarText = string; 
-}
-
-
 void WebView::contextMenuEvent(QContextMenuEvent *event)
 {
     QWebHitTestResult result = page()->mainFrame()->hitTestContent(event->pos());
@@ -356,18 +319,6 @@ void WebView::search()
 }
 
 
-void WebView::updateProgress(int p)
-{
-    m_progress = p;
-}
-
-
-void WebView::loadFinished(bool)
-{
-    m_progress = 0;
-}
-
-
 void WebView::printFrame()
 {
     Application::instance()->mainWindow()->printRequested(page()->currentFrame());
@@ -422,9 +373,3 @@ void WebView::keyPressEvent(QKeyEvent *event)
     
     KWebView::keyPressEvent(event);
 }
-
-
-void WebView::loadInNewTab(const KUrl &url)
-{
-    Application::instance()->loadUrl(url, Rekonq::NewCurrentTab);
-}