diff -r 27f636beebad -r 2c730d5fd177 eric6/UI/NumbersWidget.py
--- a/eric6/UI/NumbersWidget.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/UI/NumbersWidget.py Tue Mar 02 17:17:09 2021 +0100
@@ -50,7 +50,7 @@
"""
return self.__bits
- def data(self, index, role=Qt.DisplayRole):
+ def data(self, index, role=Qt.ItemDataRole.DisplayRole):
"""
Public method to get data from the model.
@@ -58,10 +58,10 @@
@param role role of the data to retrieve (integer)
@return requested data
"""
- if role == Qt.CheckStateRole:
+ if role == Qt.ItemDataRole.CheckStateRole:
return (self.__value >> (self.__bits - index.column() - 1)) & 1
- elif role == Qt.DisplayRole:
+ elif role == Qt.ItemDataRole.DisplayRole:
return ""
return None
@@ -73,18 +73,26 @@
@param index index to get flags for (QModelIndex)
@return flags (Qt.ItemFlags)
"""
- return Qt.ItemIsUserCheckable | Qt.ItemIsEnabled | Qt.ItemIsSelectable
+ return (
+ Qt.ItemFlag.ItemIsUserCheckable |
+ 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 from the model.
@param section section number (integer)
@param orientation orientation (Qt.Orientation)
- @param role role of the data to retrieve (integer)
+ @param role role of the data to retrieve (Qt.ItemDataRole)
@return requested data
"""
- if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+ if (
+ orientation == Qt.Orientation.Horizontal and
+ role == Qt.ItemDataRole.DisplayRole
+ ):
return str(self.__bits - section - 1)
return QAbstractTableModel.headerData(self, section, orientation, role)
@@ -129,7 +137,7 @@
"""
return self.__value
- def setData(self, index, value, role=Qt.EditRole):
+ def setData(self, index, value, role=Qt.ItemDataRole.EditRole):
"""
Public method to set the data of a node cell.
@@ -138,9 +146,11 @@
@param role role of the data (integer)
@return flag indicating success (boolean)
"""
- if role == Qt.CheckStateRole:
- if value == Qt.Checked and not self.data(index, Qt.CheckStateRole):
- # that seems like a hack; Qt 4.6 always sends Qt.Checked
+ if role == Qt.ItemDataRole.CheckStateRole:
+ if (
+ value == Qt.CheckState.Checked and
+ not self.data(index, Qt.ItemDataRole.CheckStateRole)
+ ):
self.__value |= (1 << self.__bits - index.column() - 1)
else:
self.__value &= ~(1 << self.__bits - index.column() - 1)
@@ -199,7 +209,7 @@
self.__model = BinaryModel(self)
self.binTable.setModel(self.__model)
self.binTable.horizontalHeader().setSectionResizeMode(
- QHeaderView.ResizeToContents)
+ QHeaderView.ResizeMode.ResizeToContents)
self.__model.setBitsAndValue(self.__bytes * 8, self.__input)
self.__model.dataChanged.connect(self.__binModelDataChanged)
