From 47be670aaf587e0837e9fd6a8edb764d8f7fede0 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 26 Jul 2018 15:26:53 +0530
Subject: [PATCH] More lambda slots

---
 src/calibre/gui2/metadata/diff.py | 10 +++++-----
 src/calibre/gui2/widgets.py       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/metadata/diff.py b/src/calibre/gui2/metadata/diff.py
index 5e51731266..cc5fe9ef9c 100644
--- a/src/calibre/gui2/metadata/diff.py
+++ b/src/calibre/gui2/metadata/diff.py
@@ -431,7 +431,7 @@ class CompareSingle(QWidget):
             else:
                 continue
             neww = cls(field, True, self, m, extra)
-            neww.changed.connect(partial(self.changed, field))
+            connect_lambda(neww.changed, self, lambda self: self.changed(field))
             if isinstance(neww, EditWithComplete):
                 try:
                     neww.update_items_cache(db.new_api.all_field_names(field))
@@ -444,7 +444,7 @@ class CompareSingle(QWidget):
             newl.setBuddy(neww)
             button = RightClickButton(self)
             button.setIcon(QIcon(I('back.png')))
-            button.clicked.connect(partial(self.revert, field))
+            connect_lambda(button.clicked, self, lambda self: self.revert(field))
             button.setToolTip(revert_tooltip % m['name'])
             if field == 'identifiers':
                 button.m = m = QMenu(button)
@@ -580,7 +580,7 @@ class CompareMany(QDialog):
                 b.setToolTip(reject_all_tooltip)
             b.clicked.connect(self.reject_all_remaining)
             self.sb = b = bb.addButton(_('R&eject'), bb.ActionRole)
-            b.clicked.connect(partial(self.next_item, False))
+            connect_lambda(b.clicked, self, lambda self: self.next_item(False))
             b.setIcon(QIcon(I('minus.png'))), b.setAutoDefault(False)
             if reject_button_tooltip:
                 b.setToolTip(reject_button_tooltip)
@@ -597,14 +597,14 @@ class CompareMany(QDialog):
             b.setToolTip(_('Move to next [%s]') % self.next_action.shortcut().toString(QKeySequence.NativeText))
             self.next_action.triggered.connect(b.click)
         b.setIcon(QIcon(I('forward.png' if self.total > 1 else 'ok.png')))
-        b.clicked.connect(partial(self.next_item, True))
+        connect_lambda(b.clicked, self, lambda self: self.next_item(True))
         b.setDefault(True), b.setAutoDefault(True)
         self.bbh = h = QHBoxLayout()
         h.setContentsMargins(0, 0, 0, 0)
         l.addLayout(h)
         self.markq = m = QCheckBox(_('&Mark rejected books'))
         m.setChecked(gprefs['metadata_diff_mark_rejected'])
-        m.stateChanged[int].connect(lambda : gprefs.set('metadata_diff_mark_rejected', m.isChecked()))
+        connect_lambda(m.stateChanged[int], self, lambda self: gprefs.set('metadata_diff_mark_rejected', self.markq.isChecked()))
         m.setToolTip(_('Mark rejected books in the book list after this dialog is closed'))
         h.addWidget(m), h.addWidget(bb)
 
diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index 1e0b337c3f..f1fbe48207 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -76,7 +76,7 @@ class FilenamePattern(QWidget, Ui_Form):  # {{{
         self.test_button.clicked.connect(self.do_test)
         self.re.lineEdit().returnPressed[()].connect(self.do_test)
         self.filename.returnPressed[()].connect(self.do_test)
-        self.re.lineEdit().textChanged.connect(lambda x: self.changed_signal.emit())
+        connect_lambda(self.re.lineEdit().textChanged, self, lambda self, x: self.changed_signal.emit())
 
     def initialize(self, defaults=False):
         # Get all items in the combobox. If we are reseting