Mercurial Repositories > eric / file diff

--- a/eric6/UI/UserInterface.py	Mon Oct 05 19:51:55 2020 +0200
+++ b/eric6/UI/UserInterface.py	Tue Oct 06 17:52:44 2020 +0200
@@ -3722,7 +3722,7 @@
             if os.path.exists(logFile):
                 from .ErrorLogDialog import ErrorLogDialog
                 dlg = ErrorLogDialog(logFile, False, self)
-                dlg.exec_()
+                dlg.exec()
         
     def __hasErrorLog(self):
         """
@@ -4757,7 +4757,7 @@
         from Preferences.ToolConfigurationDialog import ToolConfigurationDialog
         dlg = ToolConfigurationDialog(
             self.toolGroups[self.currentToolGroup][1], self)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             self.toolGroups[self.currentToolGroup][1] = dlg.getToollist()
             self.__updateExternalToolsActions()
         
@@ -4770,7 +4770,7 @@
         )
         dlg = ToolGroupConfigurationDialog(
             self.toolGroups, self.currentToolGroup, self)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             self.toolGroups, self.currentToolGroup = dlg.getToolGroups()
         
     def __createUnitTestDialog(self):
@@ -5948,7 +5948,7 @@
                     self.__lastConfigurationPageName)
             else:
                 self.__configurationDialog.showConfigurationPageByName("empty")
-            self.__configurationDialog.exec_()
+            self.__configurationDialog.exec()
             QApplication.processEvents()
             if self.__configurationDialog.result() == QDialog.Accepted:
                 self.__configurationDialog.setPreferences()
@@ -6089,7 +6089,7 @@
         from Preferences.ViewProfileDialog import ViewProfileDialog
         dlg = ViewProfileDialog(self.__layoutType, self.profiles['edit'][1],
                                 self.profiles['debug'][1])
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             edit, debug = dlg.getVisibilities()
             self.profiles['edit'][1] = edit
             self.profiles['debug'][1] = debug
@@ -6105,7 +6105,7 @@
         """
         from E5Gui.E5ToolBarDialog import E5ToolBarDialog
         dlg = E5ToolBarDialog(self.toolbarManager)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             Preferences.setUI(
                 "ToolbarManagerState", self.toolbarManager.saveState())
         
@@ -6164,7 +6164,7 @@
         from E5Network.E5SslCertificatesDialog import E5SslCertificatesDialog
         
         dlg = E5SslCertificatesDialog(self)
-        dlg.exec_()
+        dlg.exec()
         
     def __clearPrivateData(self):
         """
@@ -6172,7 +6172,7 @@
         """
         from .ClearPrivateDataDialog import ClearPrivateDataDialog
         dlg = ClearPrivateDataDialog(self)
-        if dlg.exec_() == QDialog.Accepted:
+        if dlg.exec() == QDialog.Accepted:
             # recent files, recent projects, recent multi  projects,
             # debug histories, shell histories
             (files, projects, multiProjects, debug, shell, vcs, plugins) = (
@@ -6629,7 +6629,7 @@
             self.pluginManager,
             [] if pluginFileNames is None else pluginFileNames[:],
             self)
-        dlg.exec_()
+        dlg.exec()
         if dlg.restartNeeded():
             self.__restart(ask=True)
         
@@ -6639,7 +6639,7 @@
         """
         from PluginManager.PluginUninstallDialog import PluginUninstallDialog
         dlg = PluginUninstallDialog(self.pluginManager, self)
-        dlg.exec_()
+        dlg.exec()
         
     def showPluginsAvailable(self):
         """
@@ -6647,7 +6647,7 @@
         """
         from PluginManager.PluginRepositoryDialog import PluginRepositoryDialog
         dlg = PluginRepositoryDialog(self.pluginManager, self)
-        res = dlg.exec_()
+        res = dlg.exec()
         if res == (QDialog.Accepted + 1):
             self.__installPlugins(dlg.getDownloadedPlugins())