Mercurial Repositories > eric / file diff

--- a/eric6/VCS/ProjectHelper.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/VCS/ProjectHelper.py	Tue Mar 02 17:17:09 2021 +0100
@@ -222,7 +222,7 @@
         vcs = self.project.initVCS(selectedVcsSystem)
         if vcs is not None:
             vcsdlg = vcs.vcsNewProjectOptionsDialog()
-            if vcsdlg.exec() == QDialog.Accepted:
+            if vcsdlg.exec() == QDialog.DialogCode.Accepted:
                 projectdir, vcsDataDict = vcsdlg.getData()
                 # edit VCS command options
                 if vcs.vcsSupportCommandOptions():
@@ -239,7 +239,7 @@
                 if vcores:
                     from .CommandOptionsDialog import VcsCommandOptionsDialog
                     codlg = VcsCommandOptionsDialog(vcs)
-                    if codlg.exec() == QDialog.Accepted:
+                    if codlg.exec() == QDialog.DialogCode.Accepted:
                         vcs.vcsSetOptions(codlg.getOptions())
                 
                 # create the project directory if it doesn't exist already
@@ -313,7 +313,7 @@
                                 PropertiesDialog
                             )
                             dlg = PropertiesDialog(self.project, False)
-                            if dlg.exec() == QDialog.Accepted:
+                            if dlg.exec() == QDialog.DialogCode.Accepted:
                                 dlg.storeData()
                                 self.project.initFileTypes()
                                 self.project.pdata["VCS"] = selectedVcsSystem
@@ -422,7 +422,7 @@
             if self.project.vcs is not None:
                 vcsdlg = self.project.vcs.vcsOptionsDialog(
                     self.project, self.project.name, 1)
-                if vcsdlg.exec() == QDialog.Accepted:
+                if vcsdlg.exec() == QDialog.DialogCode.Accepted:
                     vcsDataDict = vcsdlg.getData()
                     # edit VCS command options
                     if self.project.vcs.vcsSupportCommandOptions():
@@ -441,7 +441,7 @@
                             VcsCommandOptionsDialog
                         )
                         codlg = VcsCommandOptionsDialog(self.project.vcs)
-                        if codlg.exec() == QDialog.Accepted:
+                        if codlg.exec() == QDialog.DialogCode.Accepted:
                             self.project.vcs.vcsSetOptions(codlg.getOptions())
                     self.project.setDirty(True)
                     self.project.vcs.vcsSetDataFromDict(vcsDataDict)
@@ -534,7 +534,7 @@
         if self.vcs.vcsSupportCommandOptions():
             from .CommandOptionsDialog import VcsCommandOptionsDialog
             codlg = VcsCommandOptionsDialog(self.vcs)
-            if codlg.exec() == QDialog.Accepted:
+            if codlg.exec() == QDialog.DialogCode.Accepted:
                 self.vcs.vcsSetOptions(codlg.getOptions())
                 self.project.setDirty(True)