From 3c99436950afb962bd374c0f1cc56d85bf274f6c Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Thu, 7 Jul 2016 16:10:35 +0200
Subject: [PATCH] Make on_* methods in tab private

---
 qutebrowser/browser/tab.py                    | 17 +++++++++--------
 qutebrowser/browser/webengine/webenginetab.py |  4 ++--
 qutebrowser/browser/webkit/webkittab.py       |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/qutebrowser/browser/tab.py b/qutebrowser/browser/tab.py
index b7dd0c913..083009f62 100644
--- a/qutebrowser/browser/tab.py
+++ b/qutebrowser/browser/tab.py
@@ -152,7 +152,7 @@ class AbstractZoom(QObject):
         self._win_id = win_id
         self._default_zoom_changed = False
         self._init_neighborlist()
-        objreg.get('config').changed.connect(self.on_config_changed)
+        objreg.get('config').changed.connect(self._on_config_changed)
 
         # # FIXME:refactor is this needed?
         # # For some reason, this signal doesn't get disconnected automatically
@@ -162,7 +162,7 @@ class AbstractZoom(QObject):
         #     cfg.changed.disconnect, self.init_neighborlist))
 
     @pyqtSlot(str, str)
-    def on_config_changed(self, section, option):
+    def _on_config_changed(self, section, option):
         if section == 'ui' and option in ('zoom-levels', 'default-zoom'):
             if not self._default_zoom_changed:
                 factor = float(config.get('ui', 'default-zoom')) / 100
@@ -212,7 +212,7 @@ class AbstractZoom(QObject):
         self._set_factor_internal(float(default_zoom) / 100)
 
     @pyqtSlot(QPoint)
-    def on_mouse_wheel_zoom(self, delta):
+    def _on_mouse_wheel_zoom(self, delta):
         """Handle zooming via mousewheel requested by the web view."""
         divider = config.get('input', 'mouse-zoom-divider')
         factor = self.factor() + delta.y() / divider
@@ -235,13 +235,14 @@ class AbstractCaret(QObject):
         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)
+        # pylint: disable=protected-access
+        modeman.entered.connect(self._on_mode_entered)
+        modeman.left.connect(self._on_mode_left)
 
-    def on_mode_entered(self, mode):
+    def _on_mode_entered(self, mode):
         raise NotImplementedError
 
-    def on_mode_left(self):
+    def _on_mode_left(self):
         raise NotImplementedError
 
     def move_to_next_line(self, count=1):
@@ -461,7 +462,7 @@ class AbstractTab(QWidget):
         self.caret._widget = widget
         self.zoom._widget = widget
         self.search._widget = widget
-        widget.mouse_wheel_zoom.connect(self.zoom.on_mouse_wheel_zoom)
+        widget.mouse_wheel_zoom.connect(self.zoom._on_mouse_wheel_zoom)
         widget.setParent(self)
         self.setFocusProxy(widget)
 
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index a94b9b808..831bfe4ff 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -51,12 +51,12 @@ class WebEngineCaret(tab.AbstractCaret):
     ## TODO
 
     @pyqtSlot(usertypes.KeyMode)
-    def on_mode_entered(self, mode):
+    def _on_mode_entered(self, mode):
         ## TODO
         pass
 
     @pyqtSlot(usertypes.KeyMode)
-    def on_mode_left(self):
+    def _on_mode_left(self):
         ## TODO
         pass
 
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index a91aaba48..794d1951b 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -80,7 +80,7 @@ class WebViewCaret(tabmod.AbstractCaret):
     """QtWebKit implementations related to moving the cursor/selection."""
 
     @pyqtSlot(usertypes.KeyMode)
-    def on_mode_entered(self, mode):
+    def _on_mode_entered(self, mode):
         if mode != usertypes.KeyMode.caret:
             return
 
@@ -104,7 +104,7 @@ class WebViewCaret(tabmod.AbstractCaret):
                     utils.read_file('javascript/position_caret.js'))
 
     @pyqtSlot()
-    def on_mode_left(self):
+    def _on_mode_left(self):
         settings = self._widget.settings()
         if settings.testAttribute(QWebSettings.CaretBrowsingEnabled):
             if self.selection_enabled and self._widget.hasSelection():