--- a/eric6/Debugger/WatchPointViewer.py Mon Mar 01 17:48:43 2021 +0100 +++ b/eric6/Debugger/WatchPointViewer.py Tue Mar 02 17:17:09 2021 +0100 @@ -41,12 +41,14 @@ self.setItemsExpandable(False) self.setRootIsDecorated(False) self.setAlternatingRowColors(True) - self.setSelectionMode(QAbstractItemView.ExtendedSelection) - self.setSelectionBehavior(QAbstractItemView.SelectRows) + self.setSelectionMode( + QAbstractItemView.SelectionMode.ExtendedSelection) + self.setSelectionBehavior( + QAbstractItemView.SelectionBehavior.SelectRows) self.setWindowTitle(self.tr("Watchpoints")) - self.setContextMenuPolicy(Qt.CustomContextMenu) + self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu) self.customContextMenuRequested.connect(self.__showContextMenu) self.doubleClicked.connect(self.__doubleClicked) @@ -66,7 +68,7 @@ super(WatchPointViewer, self).setModel(self.sortingModel) header = self.header() - header.setSortIndicator(0, Qt.AscendingOrder) + header.setSortIndicator(0, Qt.SortOrder.AscendingOrder) header.setSortIndicatorShown(True) header.setSectionsClickable(True) @@ -86,7 +88,7 @@ Private slot to resize the view when items get added, edited or deleted. """ - self.header().resizeSections(QHeaderView.ResizeToContents) + self.header().resizeSections(QHeaderView.ResizeMode.ResizeToContents) self.header().setStretchLastSection(True) def __resort(self): @@ -126,10 +128,12 @@ if selected: flags = QItemSelectionModel.SelectionFlags( - QItemSelectionModel.ClearAndSelect | QItemSelectionModel.Rows) + QItemSelectionModel.SelectionFlag.ClearAndSelect | + QItemSelectionModel.SelectionFlag.Rows) else: flags = QItemSelectionModel.SelectionFlags( - QItemSelectionModel.Deselect | QItemSelectionModel.Rows) + QItemSelectionModel.SelectionFlag.Deselect | + QItemSelectionModel.SelectionFlag.Rows) self.selectionModel().select(index, flags) def __createPopupMenus(self): @@ -259,7 +263,7 @@ """ from .EditWatchpointDialog import EditWatchpointDialog dlg = EditWatchpointDialog(("", False, True, 0, ""), self) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: cond, temp, enabled, ignorecount, special = dlg.getData() if not self.__findDuplicates(cond, special, True): self.__model.addWatchPoint(cond, special, @@ -301,7 +305,7 @@ from .EditWatchpointDialog import EditWatchpointDialog dlg = EditWatchpointDialog( (cond, temp, enabled, count, special), self) - if dlg.exec() == QDialog.Accepted: + if dlg.exec() == QDialog.DialogCode.Accepted: cond, temp, enabled, count, special = dlg.getData() if not self.__findDuplicates(cond, special, True, sindex): self.__model.setWatchPointByIndex(