From db0a18106fe739e247f6a22afe5f2fd1f6b4008f Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Wed, 12 Aug 2020 13:53:21 +0200
Subject: [PATCH] Reorder + make all parameters optional

---
 qt/aqt/addcards.py    |  2 +-
 qt/aqt/browser.py     | 16 ++++++++--------
 qt/aqt/editcurrent.py |  2 +-
 qt/aqt/editor.py      |  2 +-
 qt/aqt/main.py        |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/qt/aqt/addcards.py b/qt/aqt/addcards.py
index 23523e9d8..5a226fa3e 100644
--- a/qt/aqt/addcards.py
+++ b/qt/aqt/addcards.py
@@ -178,7 +178,7 @@ class AddCards(QDialog):
         self.mw.col.clearUndo()
         self.addHistory(note)
         self.previousNote = note
-        self.mw.requireReset("addCardsAddNote", self)
+        self.mw.requireReset(reason="addCardsAddNote", context=self)
         gui_hooks.add_cards_did_add_note(note)
         return note
 
diff --git a/qt/aqt/browser.py b/qt/aqt/browser.py
index d58767759..a97a487a4 100644
--- a/qt/aqt/browser.py
+++ b/qt/aqt/browser.py
@@ -1564,7 +1564,7 @@ where id in %s"""
             newRow = max(newRow, 0)
             self.model.focusedCard = self.model.cards[newRow]
         self.model.endReset()
-        self.mw.requireReset("browserDeleteNote", self)
+        self.mw.requireReset(reason="browserDeleteNote", context=self)
         tooltip(
             ngettext("%d note deleted.", "%d notes deleted.", len(nids)) % len(nids)
         )
@@ -1616,7 +1616,7 @@ update cards set usn=?, mod=?, did=? where id in """
             did,
         )
         self.model.endReset()
-        self.mw.requireReset("browserSetDeck", self)
+        self.mw.requireReset(reason="browserSetDeck", context=self)
 
     # Tags
     ######################################################################
@@ -1642,7 +1642,7 @@ update cards set usn=?, mod=?, did=? where id in """
         self.model.beginReset()
         func(self.selectedNotes(), tags)
         self.model.endReset()
-        self.mw.requireReset("browserAddTags", self)
+        self.mw.requireReset(reason="browserAddTags", context=self)
 
     def deleteTags(self, tags=None, label=None):
         if label is None:
@@ -1675,7 +1675,7 @@ update cards set usn=?, mod=?, did=? where id in """
         else:
             self.col.sched.unsuspendCards(c)
         self.model.reset()
-        self.mw.requireReset("browserSuspend", self)
+        self.mw.requireReset(reason="browserSuspend", context=self)
 
     # Exporting
     ######################################################################
@@ -1763,7 +1763,7 @@ update cards set usn=?, mod=?, did=? where id in """
             shift=frm.shift.isChecked(),
         )
         self.search()
-        self.mw.requireReset("browserReposition", self)
+        self.mw.requireReset(reason="browserReposition", context=self)
         self.model.endReset()
 
     # Rescheduling
@@ -1789,7 +1789,7 @@ update cards set usn=?, mod=?, did=? where id in """
             fmax = max(fmin, fmax)
             self.col.sched.reschedCards(self.selectedCards(), fmin, fmax)
         self.search()
-        self.mw.requireReset("browserReschedule", self)
+        self.mw.requireReset(reason="browserReschedule", context=self)
         self.model.endReset()
 
     # Edit: selection
@@ -1923,7 +1923,7 @@ update cards set usn=?, mod=?, did=? where id in """
 
         def on_done(fut):
             self.search()
-            self.mw.requireReset("browserFindReplace", self)
+            self.mw.requireReset(reason="browserFindReplace", context=self)
             self.model.endReset()
 
             total = len(nids)
@@ -2025,7 +2025,7 @@ update cards set usn=?, mod=?, did=? where id in """
         self.col.tags.bulkAdd(list(nids), _("duplicate"))
         self.mw.progress.finish()
         self.model.endReset()
-        self.mw.requireReset("browserTagDupes", self)
+        self.mw.requireReset(reason="browserTagDupes", context=self)
         tooltip(_("Notes tagged."))
 
     def dupeLinkClicked(self, link):
diff --git a/qt/aqt/editcurrent.py b/qt/aqt/editcurrent.py
index 3b96a846e..7b5a290b0 100644
--- a/qt/aqt/editcurrent.py
+++ b/qt/aqt/editcurrent.py
@@ -27,7 +27,7 @@ class EditCurrent(QDialog):
         self.editor.setNote(self.mw.reviewer.card.note(), focusTo=0)
         restoreGeom(self, "editcurrent")
         gui_hooks.state_did_reset.append(self.onReset)
-        self.mw.requireReset("editCurrentInit", self)
+        self.mw.requireReset(reason="editCurrentInit", context=self)
         self.show()
         # reset focus after open, taking care not to retain webview
         # pylint: disable=unnecessary-lambda
diff --git a/qt/aqt/editor.py b/qt/aqt/editor.py
index a26301d67..86e53c4c5 100644
--- a/qt/aqt/editor.py
+++ b/qt/aqt/editor.py
@@ -393,7 +393,7 @@ class Editor:
 
             if not self.addMode:
                 self.note.flush()
-                self.mw.requireReset("editorBridgeCmd", self)
+                self.mw.requireReset(reason="editorBridgeCmd", context=self)
             if type == "blur":
                 self.currentField = None
                 # run any filters
diff --git a/qt/aqt/main.py b/qt/aqt/main.py
index a8c650dcd..33660684e 100644
--- a/qt/aqt/main.py
+++ b/qt/aqt/main.py
@@ -684,7 +684,7 @@ from the profile screen."
             self.maybeEnableUndo()
             self.moveToState(self.state)
 
-    def requireReset(self, reason, context=None, modal=False):
+    def requireReset(self, modal=False, reason="unknown", context=None):
         "Signal queue needs to be rebuilt when edits are finished or by user."
         self.autosave()
         self.resetModal = modal