From 9868721cc739f470db6d4b92b62bc03fc6390127 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Wed, 24 Sep 2014 20:27:05 +0200
Subject: [PATCH] Use object registry for webview.tabbedbrowser.

---
 qutebrowser/browser/webpage.py | 4 ++--
 qutebrowser/widgets/webview.py | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/webpage.py b/qutebrowser/browser/webpage.py
index 74c5f834c..bdfef0848 100644
--- a/qutebrowser/browser/webpage.py
+++ b/qutebrowser/browser/webpage.py
@@ -301,10 +301,10 @@ class BrowserPage(QWebPage):
             log.webview.debug(url.errorString())
             return False
         if self._view.open_target == usertypes.ClickTarget.tab:
-            self._view.tabbedbrowser.tabopen(url, False)
+            objreg.get('tabbed-browser').tabopen(url, False)
             return False
         elif self._view.open_target == usertypes.ClickTarget.tab_bg:
-            self._view.tabbedbrowser.tabopen(url, True)
+            objreg.get('tabbed-browser').tabopen(url, True)
             return False
         else:
             self.change_title.emit(urlstr)
diff --git a/qutebrowser/widgets/webview.py b/qutebrowser/widgets/webview.py
index f12eef131..a24d49439 100644
--- a/qutebrowser/widgets/webview.py
+++ b/qutebrowser/widgets/webview.py
@@ -43,9 +43,6 @@ class WebView(QWebView):
 
     Attributes:
         hintmanager: The HintManager instance for this view.
-        tabbedbrowser: The TabbedBrowser this WebView is part of.
-                       We need this rather than signals to make createWindow
-                       work.
         progress: loading progress of this page.
         scroll_pos: The current scroll position as (x%, y%) tuple.
         statusbar_message: The current javscript statusbar message.
@@ -77,11 +74,10 @@ class WebView(QWebView):
     load_status_changed = pyqtSignal(str)
     url_text_changed = pyqtSignal(str)
 
-    def __init__(self, parent):
+    def __init__(self, parent=None):
         super().__init__(parent)
         self.load_status = LoadStatus.none
         self._check_insertmode = False
-        self.tabbedbrowser = parent
         self.inspector = None
         self.scroll_pos = (-1, -1)
         self.statusbar_message = ''
@@ -404,7 +400,7 @@ class WebView(QWebView):
         if wintype == QWebPage.WebModalDialog:
             log.webview.warning("WebModalDialog requested, but we don't "
                                 "support that!")
-        return self.tabbedbrowser.tabopen()
+        return objreg.get('tabbed-browser').tabopen()
 
     def paintEvent(self, e):
         """Extend paintEvent to emit a signal if the scroll position changed.