diff -r e01ae92db699 -r 31965986ecd1 eric6/Debugger/VariablesViewer.py
--- a/eric6/Debugger/VariablesViewer.py Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/Debugger/VariablesViewer.py Sun Mar 28 15:00:11 2021 +0200
@@ -25,7 +25,7 @@
import Preferences
import Utilities
-SORT_ROLE = Qt.UserRole
+SORT_ROLE = Qt.ItemDataRole.UserRole
class VariableItem(object):
@@ -554,9 +554,9 @@
@rtype QtCore.Qt.ItemFlag
"""
if not index.isValid():
- return Qt.NoItemFlags
+ return Qt.ItemFlag.NoItemFlags
- return Qt.ItemIsEnabled | Qt.ItemIsSelectable
+ return Qt.ItemFlag.ItemIsEnabled | Qt.ItemFlag.ItemIsSelectable
def hasChildren(self, parent=QModelIndex()):
"""
@@ -619,7 +619,7 @@
row = parentNode.parent.children.index(parentNode)
return self.createIndex(row, 0, parentNode)
- def data(self, index, role=Qt.DisplayRole):
+ def data(self, index, role=Qt.ItemDataRole.DisplayRole):
"""
Public method get the role data of item.
@@ -636,7 +636,9 @@
node = index.internalPointer()
column = index.column()
- if role in (Qt.DisplayRole, SORT_ROLE, Qt.EditRole):
+ if role in (
+ Qt.ItemDataRole.DisplayRole, SORT_ROLE, Qt.ItemDataRole.EditRole
+ ):
try:
if column == 0:
# Sort first column with values from third column
@@ -654,13 +656,13 @@
except AttributeError:
return ['None', '', '', ''][column]
- elif role == Qt.BackgroundRole:
+ elif role == Qt.ItemDataRole.BackgroundRole:
if node in node.parent.changedItems:
return self.__bgColorChanged
elif node in node.parent.newItems:
return self.__bgColorNew
- elif role == Qt.ToolTipRole:
+ elif role == Qt.ItemDataRole.ToolTipRole:
if column == 0:
tooltip = node.name + node.indicator
elif column == 1:
@@ -701,7 +703,8 @@
return None
- def headerData(self, section, orientation, role=Qt.DisplayRole):
+ def headerData(self, section, orientation,
+ role=Qt.ItemDataRole.DisplayRole):
"""
Public method get the header names.
@@ -714,7 +717,10 @@
@return header name
@rtype str or None
"""
- if role != Qt.DisplayRole or orientation != Qt.Horizontal:
+ if (
+ role != Qt.ItemDataRole.DisplayRole or
+ orientation != Qt.Orientation.Horizontal
+ ):
return None
if section == 0:
@@ -952,7 +958,8 @@
self.setSortingEnabled(True)
self.setAlternatingRowColors(True)
- self.setSelectionBehavior(QAbstractItemView.SelectRows)
+ self.setSelectionBehavior(
+ QAbstractItemView.SelectionBehavior.SelectRows)
if self.__globalScope:
self.setWindowTitle(self.tr("Global Variables"))
@@ -970,7 +977,7 @@
))
header = self.header()
- header.setSortIndicator(0, Qt.AscendingOrder)
+ header.setSortIndicator(0, Qt.SortOrder.AscendingOrder)
header.setSortIndicatorShown(True)
try:
@@ -985,7 +992,7 @@
header.sortIndicatorChanged.connect(lambda *x: self.varModel.getMore())
self.__createPopupMenus()
- self.setContextMenuPolicy(Qt.CustomContextMenu)
+ self.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
self.customContextMenuRequested.connect(self.__showContextMenu)
self.resortEnabled = True
