diff -r 27f636beebad -r 2c730d5fd177 eric6/UI/BrowserModel.py
--- a/eric6/UI/BrowserModel.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/UI/BrowserModel.py Tue Mar 02 17:17:09 2021 +0100
@@ -94,7 +94,7 @@
if not index.isValid():
return None
- if role == Qt.DisplayRole:
+ if role == Qt.ItemDataRole.DisplayRole:
item = index.internalPointer()
if index.column() < item.columnCount():
return item.data(index.column())
@@ -105,10 +105,10 @@
# This is for the case where an item under a multi-column
# parent doesn't have a value for all the columns
return ""
- elif role == Qt.DecorationRole:
+ elif role == Qt.ItemDataRole.DecorationRole:
if index.column() == 0:
return index.internalPointer().getIcon()
- elif role == Qt.FontRole:
+ elif role == Qt.ItemDataRole.FontRole:
item = index.internalPointer()
if item.isSymlink():
font = QFont(QApplication.font("QTreeView"))
@@ -125,11 +125,12 @@
@return requested flags (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 the header data.
@@ -138,7 +139,10 @@
@param role role of data (Qt.ItemDataRole)
@return requested header data
"""
- if orientation == Qt.Horizontal and role == Qt.DisplayRole:
+ if (
+ orientation == Qt.Orientation.Horizontal and
+ role == Qt.ItemDataRole.DisplayRole
+ ):
if section >= self.rootItem.columnCount():
return ""
else:
@@ -317,7 +321,8 @@
# just ignore the situation we don't have a reference to the item
return
- dirFilter = QDir.Filters(QDir.AllEntries | QDir.NoDotAndDotDot)
+ dirFilter = QDir.Filters(QDir.Filter.AllEntries |
+ QDir.Filter.NoDotAndDotDot)
for itm in self.watchedItems[path]:
oldCnt = itm.childCount()
@@ -547,7 +552,9 @@
qdir = QDir(parentItem.dirName())
- dirFilter = QDir.Filters(QDir.AllEntries | QDir.NoDotAndDotDot)
+ dirFilter = QDir.Filters(
+ QDir.Filter.AllEntries |
+ QDir.Filter.NoDotAndDotDot)
entryInfoList = qdir.entryInfoList(dirFilter)
if len(entryInfoList) > 0:
if repopulate:
@@ -1100,7 +1107,7 @@
"""
if issubclass(other.__class__, BrowserFileItem):
if Preferences.getUI("BrowsersListFoldersFirst"):
- return order == Qt.AscendingOrder
+ return order == Qt.SortOrder.AscendingOrder
return BrowserItem.lessThan(self, other, column, order)
@@ -1409,16 +1416,16 @@
"""
if not issubclass(other.__class__, BrowserFileItem):
if Preferences.getUI("BrowsersListFoldersFirst"):
- return order == Qt.DescendingOrder
+ return order == Qt.SortOrder.DescendingOrder
if issubclass(other.__class__, BrowserFileItem):
sinit = os.path.basename(self._filename).startswith('__init__.py')
oinit = os.path.basename(other.fileName()).startswith(
'__init__.py')
if sinit and not oinit:
- return order == Qt.AscendingOrder
+ return order == Qt.SortOrder.AscendingOrder
if not sinit and oinit:
- return order == Qt.DescendingOrder
+ return order == Qt.SortOrder.DescendingOrder
return BrowserItem.lessThan(self, other, column, order)
@@ -1555,13 +1562,13 @@
other.__class__,
(BrowserCodingItem, BrowserClassAttributesItem)
):
- return order == Qt.DescendingOrder
+ return order == Qt.SortOrder.DescendingOrder
if (
Preferences.getUI("BrowsersListContentsByOccurrence") and
column == 0
):
- if order == Qt.AscendingOrder:
+ if order == Qt.SortOrder.AscendingOrder:
return self.lineno() < other.lineno()
else:
return self.lineno() > other.lineno()
@@ -1680,17 +1687,17 @@
"""
if issubclass(other.__class__, BrowserMethodItem):
if self._name.startswith('__init__'):
- return order == Qt.AscendingOrder
+ return order == Qt.SortOrder.AscendingOrder
if other._name.startswith('__init__'):
- return order == Qt.DescendingOrder
+ return order == Qt.SortOrder.DescendingOrder
elif issubclass(other.__class__, BrowserClassAttributesItem):
- return order == Qt.DescendingOrder
+ return order == Qt.SortOrder.DescendingOrder
if (
Preferences.getUI("BrowsersListContentsByOccurrence") and
column == 0
):
- if order == Qt.AscendingOrder:
+ if order == Qt.SortOrder.AscendingOrder:
return self.lineno() < other.lineno()
else:
return self.lineno() > other.lineno()
@@ -1765,12 +1772,12 @@
@return true, if this item is less than other (boolean)
"""
if issubclass(other.__class__, BrowserCodingItem):
- return order == Qt.DescendingOrder
+ return order == Qt.SortOrder.DescendingOrder
elif issubclass(
other.__class__,
(BrowserClassItem, BrowserMethodItem)
):
- return order == Qt.AscendingOrder
+ return order == Qt.SortOrder.AscendingOrder
return BrowserItem.lessThan(self, other, column, order)
@@ -1854,7 +1861,7 @@
Preferences.getUI("BrowsersListContentsByOccurrence") and
column == 0
):
- if order == Qt.AscendingOrder:
+ if order == Qt.SortOrder.AscendingOrder:
return self.lineno() < other.lineno()
else:
return self.lineno() > other.lineno()
@@ -1921,7 +1928,7 @@
other.__class__,
(BrowserClassItem, BrowserClassAttributesItem, BrowserImportItem)
):
- return order == Qt.AscendingOrder
+ return order == Qt.SortOrder.AscendingOrder
return BrowserItem.lessThan(self, other, column, order)
@@ -1955,7 +1962,7 @@
other.__class__,
(BrowserClassItem, BrowserClassAttributesItem)
):
- return order == Qt.AscendingOrder
+ return order == Qt.SortOrder.AscendingOrder
return BrowserItem.lessThan(self, other, column, order)
@@ -2024,7 +2031,7 @@
Preferences.getUI("BrowsersListContentsByOccurrence") and
column == 0
):
- if order == Qt.AscendingOrder:
+ if order == Qt.SortOrder.AscendingOrder:
return self.lineno() < other.lineno()
else:
return self.lineno() > other.lineno()
