diff -r e01ae92db699 -r 31965986ecd1 eric6/Project/CreateDialogCodeDialog.py
--- a/eric6/Project/CreateDialogCodeDialog.py Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/Project/CreateDialogCodeDialog.py Sun Mar 28 15:00:11 2021 +0200
@@ -30,12 +30,12 @@
import Preferences
-pyqtSignatureRole = Qt.UserRole + 1
-pythonSignatureRole = Qt.UserRole + 2
-rubySignatureRole = Qt.UserRole + 3
-returnTypeRole = Qt.UserRole + 4
-parameterTypesListRole = Qt.UserRole + 5
-parameterNamesListRole = Qt.UserRole + 6
+pyqtSignatureRole = Qt.ItemDataRole.UserRole + 1
+pythonSignatureRole = Qt.ItemDataRole.UserRole + 2
+rubySignatureRole = Qt.ItemDataRole.UserRole + 3
+returnTypeRole = Qt.ItemDataRole.UserRole + 4
+parameterTypesListRole = Qt.ItemDataRole.UserRole + 5
+parameterNamesListRole = Qt.ItemDataRole.UserRole + 6
class CreateDialogCodeDialog(QDialog, Ui_CreateDialogCodeDialog):
@@ -60,7 +60,8 @@
super(CreateDialogCodeDialog, self).__init__(parent)
self.setupUi(self)
- self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
+ self.okButton = self.buttonBox.button(
+ QDialogButtonBox.StandardButton.Ok)
self.slotsView.header().hide()
@@ -344,12 +345,12 @@
methodDict["methods"][1] in signatureList
):
itm2.setFlags(
- Qt.ItemFlags(Qt.ItemIsEnabled))
- itm2.setCheckState(Qt.Checked)
+ Qt.ItemFlags(Qt.ItemFlag.ItemIsEnabled))
+ itm2.setCheckState(Qt.CheckState.Checked)
if e5App().usesDarkPalette():
itm2.setForeground(QBrush(QColor("#75bfff")))
else:
- itm2.setForeground(QBrush(Qt.blue))
+ itm2.setForeground(QBrush(Qt.GlobalColor.blue))
continue
itm2.setData(methodDict["pyqt_signature"],
@@ -364,13 +365,13 @@
parameterNamesListRole)
itm2.setFlags(Qt.ItemFlags(
- Qt.ItemIsUserCheckable |
- Qt.ItemIsEnabled |
- Qt.ItemIsSelectable)
+ Qt.ItemFlag.ItemIsUserCheckable |
+ Qt.ItemFlag.ItemIsEnabled |
+ Qt.ItemFlag.ItemIsSelectable)
)
- itm2.setCheckState(Qt.Unchecked)
+ itm2.setCheckState(Qt.CheckState.Unchecked)
- self.slotsView.sortByColumn(0, Qt.AscendingOrder)
+ self.slotsView.sortByColumn(0, Qt.SortOrder.AscendingOrder)
def __generateCode(self):
"""
@@ -520,7 +521,8 @@
child = topItem.child(childRow)
if (
child.checkState() and
- child.flags() & Qt.ItemFlags(Qt.ItemIsUserCheckable)
+ child.flags() & Qt.ItemFlags(
+ Qt.ItemFlag.ItemIsUserCheckable)
):
slotsCode.append('{0}\n'.format(indentStr))
slotsCode.append('{0}{1}\n'.format(
@@ -608,7 +610,9 @@
@param text changed text (string)
"""
- rx = QRegularExpression(text, QRegularExpression.CaseInsensitiveOption)
+ rx = QRegularExpression(
+ text,
+ QRegularExpression.PatternOption.CaseInsensitiveOption)
self.proxyModel.setFilterRegularExpression(rx)
@pyqtSlot()
@@ -620,7 +624,7 @@
objName = self.__objectName()
if objName:
dlg = NewDialogClassDialog(objName, file, path, self)
- if dlg.exec() == QDialog.Accepted:
+ if dlg.exec() == QDialog.DialogCode.Accepted:
className, fileName = dlg.getData()
self.classNameCombo.clear()
