--- a/src/eric7/Project/ProjectBrowserModel.py Sun Dec 18 14:19:10 2022 +0100 +++ b/src/eric7/Project/ProjectBrowserModel.py Sun Dec 18 19:33:46 2022 +0100 @@ -14,8 +14,9 @@ from PyQt6.QtCore import QDir, QFileSystemWatcher, QModelIndex, Qt, pyqtSignal from PyQt6.QtGui import QColor -from eric7 import Preferences, Utilities +from eric7 import Preferences from eric7.EricGui import EricPixmapCache +from eric7.SystemUtilities import FileSystemUtilities from eric7.UI.BrowserModel import ( BrowserDirectoryItem, BrowserFileItem, @@ -365,14 +366,14 @@ node = ( ProjectBrowserDirectoryItem( parentItem, - Utilities.toNativeSeparators(f.absoluteFilePath()), + FileSystemUtilities.toNativeSeparators(f.absoluteFilePath()), parentItem.getProjectTypes()[0], False, ) if f.isDir() else ProjectBrowserFileItem( parentItem, - Utilities.toNativeSeparators(f.absoluteFilePath()), + FileSystemUtilities.toNativeSeparators(f.absoluteFilePath()), parentItem.getProjectTypes()[0], ) ) @@ -711,7 +712,7 @@ # step 1: check for new entries children = itm.children() for f in entryInfoList: - fpath = Utilities.toNativeSeparators(f.absoluteFilePath()) + fpath = FileSystemUtilities.toNativeSeparators(f.absoluteFilePath()) childFound = False for child in children: if child.name() == fpath: @@ -726,14 +727,14 @@ node = ( ProjectBrowserDirectoryItem( itm, - Utilities.toNativeSeparators(f.absoluteFilePath()), + FileSystemUtilities.toNativeSeparators(f.absoluteFilePath()), itm.getProjectTypes()[0], False, ) if f.isDir() else ProjectBrowserFileItem( itm, - Utilities.toNativeSeparators(f.absoluteFilePath()), + FileSystemUtilities.toNativeSeparators(f.absoluteFilePath()), itm.getProjectTypes()[0], ) ) @@ -751,7 +752,7 @@ if len(entryInfoList) != itm.childCount(): for row in range(oldCnt - 1, -1, -1): child = itm.child(row) - childname = Utilities.fromNativeSeparators(child.name()) + childname = FileSystemUtilities.fromNativeSeparators(child.name()) entryFound = False for f in entryInfoList: if f.absoluteFilePath() == childname: