From d48e3c00503d20174e5e31cb67e1356759108433 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 26 Jul 2018 13:39:31 +0530
Subject: [PATCH] More lambda slots

---
 src/calibre/gui2/actions/choose_library.py  | 7 +++----
 src/calibre/gui2/actions/copy_to_library.py | 2 +-
 src/calibre/gui2/actions/toc_edit.py        | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index 69743f4fa5..95828f2c5f 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -249,9 +249,11 @@ class ChooseLibraryAction(InterfaceAction):
         for i in range(5):
             ac = self.create_action(spec=('', None, None, None),
                     attr='switch_action%d'%i)
+            ac.setObjectName(str(i))
             self.switch_actions.append(ac)
             ac.setVisible(False)
-            ac.triggered.connect(partial(self.qs_requested, i),
+            connect_lambda(ac.triggered, self, lambda self:
+                    self.switch_requested(self.qs_locations[int(self.gui.sender().objectName())]),
                     type=Qt.QueuedConnection)
             self.choose_menu.addAction(ac)
 
@@ -597,9 +599,6 @@ class ChooseLibraryAction(InterfaceAction):
         print
         self.dbref = self.before_mem = None
 
-    def qs_requested(self, idx, *args):
-        self.switch_requested(self.qs_locations[idx])
-
     def count_changed(self, new_count):
         self.update_tooltip(new_count)
 
diff --git a/src/calibre/gui2/actions/copy_to_library.py b/src/calibre/gui2/actions/copy_to_library.py
index a6801b2198..23b6e9e36c 100644
--- a/src/calibre/gui2/actions/copy_to_library.py
+++ b/src/calibre/gui2/actions/copy_to_library.py
@@ -321,7 +321,7 @@ class ChooseLibrary(Dialog):  # {{{
         b.setIcon(QIcon(I('edit-copy.png')))
         b.setToolTip(_('Copy to the specified library'))
         b2 = bb.addButton(_('&Move'), bb.AcceptRole)
-        b2.clicked.connect(lambda: setattr(self, 'delete_after_copy', True))
+        connect_lambda(b2.clicked, self, lambda self: setattr(self, 'delete_after_copy', True))
         b2.setIcon(QIcon(I('edit-cut.png')))
         b2.setToolTip(_('Copy to the specified library and delete from the current library'))
         b.setDefault(True)
diff --git a/src/calibre/gui2/actions/toc_edit.py b/src/calibre/gui2/actions/toc_edit.py
index d9870c1724..4134068d0c 100644
--- a/src/calibre/gui2/actions/toc_edit.py
+++ b/src/calibre/gui2/actions/toc_edit.py
@@ -43,7 +43,7 @@ class ChooseFormat(QDialog):  # {{{
         bb.rejected.connect(self.reject)
         l.addWidget(bb, l.rowCount(), 0, 1, -1)
         self.resize(self.sizeHint())
-        self.finished.connect(lambda code:gprefs.set('edit_toc_last_selected_formats', list(self.formats)))
+        connect_lambda(self.finished, self, lambda self, code:gprefs.set('edit_toc_last_selected_formats', list(self.formats)))
 
     def do_all(self):
         for b in self.buttons: