Mercurial Repositories > eric / file diff

--- a/eric6/Project/ProjectBrowserModel.py	Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/Project/ProjectBrowserModel.py	Sun Mar 28 15:00:11 2021 +0200
@@ -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()