--- a/eric6/Templates/TemplateViewer.py Mon Mar 01 17:48:43 2021 +0100 +++ b/eric6/Templates/TemplateViewer.py Tue Mar 02 17:17:09 2021 +0100 @@ -393,7 +393,7 @@ self.setHeaderLabels(["Template"]) self.header().hide() - self.header().setSortIndicator(0, Qt.AscendingOrder) + self.header().setSortIndicator(0, Qt.SortOrder.AscendingOrder) self.setRootIsDecorated(True) self.setAlternatingRowColors(True) @@ -436,7 +436,7 @@ self.__templatesFile = TemplatesFile(self) - self.setContextMenuPolicy(Qt.CustomContextMenu) + self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu) self.customContextMenuRequested.connect(self.__showContextMenu) self.itemActivated.connect(self.__templateItemActivated) @@ -494,7 +494,7 @@ from .TemplatePropertiesDialog import TemplatePropertiesDialog dlg = TemplatePropertiesDialog(self) dlg.setSelectedGroup(groupName) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: name, description, groupName, template = dlg.getData() self.addEntry(groupName, name, description, template) self.__dirty = True @@ -505,7 +505,7 @@ """ from .TemplatePropertiesDialog import TemplatePropertiesDialog dlg = TemplatePropertiesDialog(self, True) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: name, language = dlg.getData() self.addGroup(name, language) self.__dirty = True @@ -522,7 +522,7 @@ from .TemplatePropertiesDialog import TemplatePropertiesDialog dlg = TemplatePropertiesDialog(self, editGroup, itm) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: if editGroup: name, language = dlg.getData() self.changeGroup(itm.getName(), name, language) @@ -731,7 +731,7 @@ TemplateMultipleVariablesDialog ) dlg = TemplateMultipleVariablesDialog(variables, self) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: varValues.update(dlg.getVariables()) ok = True else: @@ -740,7 +740,7 @@ ) for var in variables: dlg = TemplateSingleVariableDialog(var, self) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: varValues[var] = dlg.getVariable() else: return @@ -985,7 +985,7 @@ else: # old XML based file f = QFile(filename) - ok = f.open(QIODevice.WriteOnly) + ok = f.open(QIODevice.OpenModeFlag.WriteOnly) if not ok: E5MessageBox.critical( self, @@ -1025,7 +1025,7 @@ self.__templatesFile.readFile(filename) else: f = QFile(filename) - if f.open(QIODevice.ReadOnly): + if f.open(QIODevice.OpenModeFlag.ReadOnly): from E5XML.TemplatesReader import TemplatesReader reader = TemplatesReader(f, viewer=self) reader.readXML()