--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Mon Mar 01 17:48:43 2021 +0100 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Tue Mar 02 17:17:09 2021 +0100 @@ -169,7 +169,7 @@ """ from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.NEW_MODE) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: (name, message, (userData, currentUser, userName), (dateData, currentDate, dateStr)) = dlg.getData() @@ -212,7 +212,7 @@ from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.REFRESH_MODE, currentMessage) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: (name, message, (userData, currentUser, userName), (dateData, currentDate, dateStr)) = dlg.getData() @@ -359,7 +359,7 @@ HgQueuesRenamePatchDialog ) dlg = HgQueuesRenamePatchDialog(currentPatch, patchnames) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: newName, selectedPatch = dlg.getData() if selectedPatch: args.append(selectedPatch) @@ -406,7 +406,7 @@ if patchnames: from .HgQueuesFoldDialog import HgQueuesFoldDialog dlg = HgQueuesFoldDialog(patchnames) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: message, patchesList = dlg.getData() if message: args.append("--message") @@ -512,7 +512,7 @@ ) dlg = HgQueuesGuardsSelectionDialog( guardsList, activeGuards=activeGuardsList, listOnly=False) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: guards = dlg.getData() if guards: args = self.vcs.initCommand("qselect") @@ -569,7 +569,7 @@ dlg = HgQueuesQueueManagementDialog( HgQueuesQueueManagementDialog.NAME_INPUT, title, False, self.vcs) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: queueName = dlg.getData() if queueName: args = self.vcs.initCommand("qqueue") @@ -624,7 +624,7 @@ dlg = HgQueuesQueueManagementDialog( HgQueuesQueueManagementDialog.QUEUE_INPUT, title, True, self.vcs) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: queueName = dlg.getData() if queueName: args = self.vcs.initCommand("qqueue")