Mercurial Repositories > eric / file diff

diff -r ffeb85cdc72d -r 441956d8fce5 Project/ProjectBrowserModel.py
--- a/Project/ProjectBrowserModel.py	Sun Jun 29 14:00:30 2014 +0200
+++ b/Project/ProjectBrowserModel.py	Sun Jun 29 20:13:56 2014 +0200
@@ -12,8 +12,8 @@
 import os
 import re
 
-from PyQt4.QtCore import QDir, QModelIndex, pyqtSignal, QFileSystemWatcher, Qt
-from PyQt4.QtGui import QColor
+from PyQt5.QtCore import QDir, QModelIndex, pyqtSignal, QFileSystemWatcher, Qt
+from PyQt5.QtGui import QColor
 
 from UI.BrowserModel import BrowserModel, BrowserItem, BrowserDirectoryItem, \
     BrowserFileItem
@@ -345,7 +345,7 @@
                                   QDir.Hidden |
                                   QDir.NoDotAndDotDot)
         else:
-            filter = QDir.Filters(QDir.AllEntries | QDir.NoDotAndDotDot)
+            filter = QDir.Filters(QDir.AllEntries | QDir.NoDot | QDir.NoDotDot)
         entryInfoList = qdir.entryInfoList(filter)
         
         if len(entryInfoList) > 0:
@@ -398,7 +398,8 @@
             self.watcher.removePaths(watchedDirs)
         
         self.rootItem.removeChildren()
-        self.reset()
+        self.beginResetModel()
+        self.endResetModel()
         
         # reset the module parser cache
         Utilities.ModuleParser.resetParsedModules()
@@ -458,7 +459,8 @@
                 else:
                     itm.addVcsStatus("")
         self.inRefresh = False
-        self.reset()
+        self.beginResetModel()
+        self.endResetModel()
 
     def findParentItemByName(self, type_, name, dontSplit=False):
         """
@@ -671,7 +673,7 @@
                                   QDir.Hidden |
                                   QDir.NoDotAndDotDot)
         else:
-            filter = QDir.Filters(QDir.AllEntries | QDir.NoDotAndDotDot)
+            filter = QDir.Filters(QDir.AllEntries | QDir.NoDot | QDir.NoDotDot)
         
         for itm in self.watchedItems[path]:
             oldCnt = itm.childCount()