diff -r 27f636beebad -r 2c730d5fd177 eric6/Project/ProjectBrowserModel.py
--- a/eric6/Project/ProjectBrowserModel.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Project/ProjectBrowserModel.py Tue Mar 02 17:17:09 2021 +0100
@@ -171,7 +171,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)
@@ -294,13 +294,13 @@
if not index.isValid():
return None
- if role == Qt.TextColorRole:
+ if role == Qt.ItemDataRole.TextColorRole:
if index.column() == 0:
try:
return index.internalPointer().getTextColor()
except AttributeError:
return None
- elif role == Qt.BackgroundColorRole:
+ elif role == Qt.ItemDataRole.BackgroundColorRole:
try:
col = self.itemBackgroundColors[
index.internalPointer().vcsState]
@@ -344,10 +344,13 @@
if Preferences.getProject("BrowsersListHiddenFiles"):
fileFilter = QDir.Filters(
- QDir.AllEntries | QDir.Hidden | QDir.NoDotAndDotDot)
+ QDir.Filter.AllEntries |
+ QDir.Filter.Hidden |
+ QDir.Filter.NoDotAndDotDot
+ )
else:
fileFilter = QDir.Filters(
- QDir.AllEntries | QDir.NoDotAndDotDot)
+ QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
entryInfoList = qdir.entryInfoList(fileFilter)
if len(entryInfoList) > 0:
@@ -695,10 +698,13 @@
if Preferences.getProject("BrowsersListHiddenFiles"):
fileFilter = QDir.Filters(
- QDir.AllEntries | QDir.Hidden | QDir.NoDotAndDotDot)
+ QDir.Filter.AllEntries |
+ QDir.Filter.Hidden |
+ QDir.Filter.NoDotAndDotDot
+ )
else:
fileFilter = QDir.Filters(
- QDir.AllEntries | QDir.NoDotAndDotDot)
+ QDir.Filter.AllEntries | QDir.Filter.NoDotAndDotDot)
for itm in self.watchedItems[path]:
oldCnt = itm.childCount()
