Commits

Yuya Nishihara committed 2c2675d

resolve: simplify connection of doubleClicked signal

Comments (0)

Files changed (1)

tortoisehg/hgqt/resolve.py

         self.rmmenuitems = (cmvp1, cmv3way)
         self.rtree.customContextMenuRequested.connect(self.rtreeMenuRequested)
 
-        self.rtree.doubleClicked.connect(self.rtreeDoubleClicked)
+        self.rtree.doubleClicked.connect(self.vp0)
 
         hbox = QHBoxLayout()
         hbox.setContentsMargins(*MARGINS)
     def rtreeMenuRequested(self, point):
         self.rtreecmenu.exec_(self.rtree.viewport().mapToGlobal(point))
 
-    def utreeDoubleClicked(self, index):
+    def utreeDoubleClicked(self):
         if self.repo.ui.configbool('tortoisehg', 'autoresolve'):
             self.merge()
         else:
             self.merge('internal:merge')
 
-    def rtreeDoubleClicked(self, index):
-        self.vp0()
-
 class PathsTree(QTreeView):
     def __init__(self, repo, parent):
         QTreeView.__init__(self, parent)