--- a/eric6/Debugger/WatchPointModel.py Mon Mar 01 17:48:43 2021 +0100 +++ b/eric6/Debugger/WatchPointModel.py Tue Mar 02 17:17:09 2021 +0100 @@ -37,11 +37,11 @@ self.tr('Enabled'), self.tr('Ignore Count'), ] - self.alignments = [Qt.Alignment(Qt.AlignLeft), - Qt.Alignment(Qt.AlignLeft), - Qt.Alignment(Qt.AlignHCenter), - Qt.Alignment(Qt.AlignHCenter), - Qt.Alignment(Qt.AlignRight), + self.alignments = [Qt.Alignment(Qt.AlignmentFlag.AlignLeft), + Qt.Alignment(Qt.AlignmentFlag.AlignLeft), + Qt.Alignment(Qt.AlignmentFlag.AlignHCenter), + Qt.Alignment(Qt.AlignmentFlag.AlignHCenter), + Qt.Alignment(Qt.AlignmentFlag.AlignRight), ] def columnCount(self, parent=None): @@ -77,19 +77,19 @@ if not index.isValid(): return None - if role == Qt.DisplayRole: + if role == Qt.ItemDataRole.DisplayRole: if index.column() in [0, 1, 4]: return self.watchpoints[index.row()][index.column()] - if role == Qt.CheckStateRole: + if role == Qt.ItemDataRole.CheckStateRole: if index.column() in [2, 3]: return self.watchpoints[index.row()][index.column()] - if role == Qt.ToolTipRole: + if role == Qt.ItemDataRole.ToolTipRole: if index.column() in [0, 1]: return self.watchpoints[index.row()][index.column()] - if role == Qt.TextAlignmentRole: + if role == Qt.ItemDataRole.TextAlignmentRole: if index.column() < len(self.alignments): return self.alignments[index.column()] @@ -103,11 +103,12 @@ @return item flags for the given index (Qt.ItemFlags) """ if not index.isValid(): - return Qt.ItemIsEnabled + return Qt.ItemFlag.ItemIsEnabled - return Qt.ItemIsEnabled | Qt.ItemIsSelectable + return Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable - def headerData(self, section, orientation, role=Qt.DisplayRole): + def headerData(self, section, orientation, + role=Qt.ItemDataRole.DisplayRole): """ Public method to get header data. @@ -116,7 +117,10 @@ @param role role of the requested data (Qt.ItemDataRole) @return header data """ - if orientation == Qt.Horizontal and role == Qt.DisplayRole: + if ( + orientation == Qt.Orientation.Horizontal and + role == Qt.ItemDataRole.DisplayRole + ): if section >= len(self.header): return "" else: