eric6/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py

branch
without_py2_and_pyqt4
changeset 7198
684261ef2165
parent 6942
2602857055c5
child 7229
53054eb5b15a
--- a/eric6/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py	Sun Sep 01 17:44:33 2019 +0200
+++ b/eric6/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py	Sun Sep 01 19:40:53 2019 +0200
@@ -25,7 +25,6 @@
 
 import Utilities
 import Preferences
-from Globals import qVersionTuple
 
 
 class QRegExpWizardWidget(QWidget, Ui_QRegExpWizardWidget):
@@ -82,8 +81,7 @@
         self.syntaxCombo.addItem("Unix Wildcard", QRegExp.WildcardUnix)
         self.syntaxCombo.addItem("Fixed String", QRegExp.FixedString)
         self.syntaxCombo.addItem("W3C XML Schema 1.1", QRegExp.W3CXmlSchema11)
-        if qVersionTuple() >= (5, 0, 0):
-            self.syntaxCombo.setCurrentIndex(1)
+        self.syntaxCombo.setCurrentIndex(1)
         
         self.saveButton = self.buttonBox.addButton(
             self.tr("Save"), QDialogButtonBox.ActionRole)
@@ -647,8 +645,7 @@
                 istring, reVar, os.linesep)
         syntax = self.syntaxCombo.itemData(self.syntaxCombo.currentIndex())
         needPatternSyntax = True
-        if qVersionTuple() < (5, 0, 0) and syntax == QRegExp.RegExp or \
-           qVersionTuple() >= (5, 0, 0) and syntax == QRegExp.RegExp2:
+        if syntax == QRegExp.RegExp2:
             # default value selected
             needPatternSyntax = False
         if needPatternSyntax:

eric ide

mercurial