From 334f6cda4f76c5fb3f5565326e95e8f1b3c31870 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 8 Jul 2016 10:20:28 +0200 Subject: [PATCH] tab: Rename modeman to mode_manager To avoid it being mixed up with the modeman module --- qutebrowser/browser/tab.py | 8 ++++---- qutebrowser/browser/webengine/webenginetab.py | 6 +++--- qutebrowser/browser/webkit/webkittab.py | 6 +++--- tests/unit/browser/test_tab.py | 7 ++++--- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/qutebrowser/browser/tab.py b/qutebrowser/browser/tab.py index beac07e35..bfaef2194 100644 --- a/qutebrowser/browser/tab.py +++ b/qutebrowser/browser/tab.py @@ -220,14 +220,14 @@ class AbstractCaret(QObject): """Attribute of AbstractTab for caret browsing.""" - def __init__(self, win_id, tab, modeman, parent=None): + def __init__(self, win_id, tab, mode_manager, parent=None): super().__init__(parent) self._tab = tab self._win_id = win_id self._widget = None self.selection_enabled = False - modeman.entered.connect(self._on_mode_entered) - modeman.left.connect(self._on_mode_left) + mode_manager.entered.connect(self._on_mode_entered) + mode_manager.left.connect(self._on_mode_left) def _on_mode_entered(self, mode): raise NotImplementedError @@ -434,7 +434,7 @@ class AbstractTab(QWidget): super().__init__(parent) # self.history = AbstractHistory(self) # self.scroll = AbstractScroller(parent=self) - # self.caret = AbstractCaret(win_id=win_id, tab=self, modeman=..., + # self.caret = AbstractCaret(win_id=win_id, tab=self, mode_manager=..., # parent=self) # self.zoom = AbstractZoom(win_id=win_id) # self.search = AbstractSearch(parent=self) diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 940c04a15..9e68606e4 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -171,13 +171,13 @@ class WebEngineViewTab(tab.AbstractTab): """A QtWebEngine tab in the browser.""" - def __init__(self, win_id, modeman, parent=None): + def __init__(self, win_id, mode_manager, parent=None): super().__init__(win_id) widget = webview.WebEngineView() self.history = WebEngineHistory(self) self.scroll = WebEngineScroller() - self.caret = WebEngineCaret(win_id=win_id, modeman=modeman, tab=self, - parent=self) + self.caret = WebEngineCaret(win_id=win_id, mode_manager=mode_manager, + tab=self, parent=self) self.zoom = WebEngineZoom(win_id=win_id, parent=self) self.search = WebEngineSearch(parent=self) self._set_widget(widget) diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py index 55e75e069..0e35d34f1 100644 --- a/qutebrowser/browser/webkit/webkittab.py +++ b/qutebrowser/browser/webkit/webkittab.py @@ -450,13 +450,13 @@ class WebViewTab(tabmod.AbstractTab): """A QtWebKit tab in the browser.""" - def __init__(self, win_id, modeman, parent=None): + def __init__(self, win_id, mode_manager, parent=None): super().__init__(win_id) widget = webview.WebView(win_id, self.tab_id, tab=self) self.history = WebViewHistory(self) self.scroll = WebViewScroller(parent=self) - self.caret = WebViewCaret(win_id=win_id, modeman=modeman, tab=self, - parent=self) + self.caret = WebViewCaret(win_id=win_id, mode_manager=mode_manager, + tab=self, parent=self) self.zoom = WebViewZoom(win_id=win_id, parent=self) self.search = WebViewSearch(parent=self) self._set_widget(widget) diff --git a/tests/unit/browser/test_tab.py b/tests/unit/browser/test_tab.py index f79c0b4e8..4718bd373 100644 --- a/tests/unit/browser/test_tab.py +++ b/tests/unit/browser/test_tab.py @@ -66,12 +66,13 @@ def test_tab(qtbot, view, config_stub): assert tab_w.win_id == 0 assert tab_w._widget is None - mode_man = modeman.ModeManager(0) + mode_manager = modeman.ModeManager(0) tab_w.history = tab.AbstractHistory(tab_w) tab_w.scroll = tab.AbstractScroller(parent=tab_w) - tab_w.caret = tab.AbstractCaret(win_id=tab_w.win_id, modeman=mode_man, - tab=tab_w, parent=tab_w) + tab_w.caret = tab.AbstractCaret(win_id=tab_w.win_id, + mode_manager=mode_manager, tab=tab_w, + parent=tab_w) tab_w.zoom = tab.AbstractZoom(win_id=tab_w.win_id) tab_w.search = tab.AbstractSearch(parent=tab_w)