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, 4 insertions, 6 deletions

diff --git a/src/mainview.h b/src/mainview.h
index d16743b1..23db69c0 100644
--- a/src/mainview.h
+++ b/src/mainview.h
@@ -71,11 +71,10 @@ public:
 public:
 
     UrlBar *urlBar() const;
-    WebView *webView(int index) const;
+    WebTab *webTab(int index) const;
 
     TabBar *tabBar() const;
-    WebView *currentWebView() const;
-    int webViewIndex(WebView *webView) const;
+    WebTab *currentWebTab() const;
 
     /**
      * show and hide TabBar if user doesn't choose
@@ -95,7 +94,7 @@ public:
      * @param nearParent  decide if you wanna create new tab near current or not
      * @return the webview embedded in the new tab
      */
-    WebView *newWebView(bool focused = true, bool nearParent = false);
+    WebTab *newWebTab(bool focused = true, bool nearParent = false);
 
     QList<HistoryItem> recentlyClosedTabs();
 
@@ -146,8 +145,7 @@ private slots:
 
     void postLaunch();
 
-    void createWalletBar(const QString &, const QUrl &);
-
+    
 protected:
     virtual void resizeEvent(QResizeEvent *event);