Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py	Sun Dec 18 19:33:46 2022 +0100
@@ -10,10 +10,11 @@
 from PyQt6.QtCore import QUrl, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
 
-from eric7 import Preferences, Utilities
+from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog
 from eric7.EricWidgets.EricCompleters import EricDirCompleter
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
 
 from .Config import ConfigGitSchemes
 from .Ui_GitSubmoduleAddDialog import Ui_GitSubmoduleAddDialog
@@ -56,10 +57,10 @@
         self.submoduleUrlDirCompleter = EricDirCompleter(self.submoduleUrlCombo)
         self.submoduleDirCompleter = EricDirCompleter(self.submoduleDirEdit)
 
-        ipath = Preferences.getMultiProject("Workspace") or Utilities.getHomeDir()
+        ipath = Preferences.getMultiProject("Workspace") or OSUtilities.getHomeDir()
         self.__initPaths = [
-            Utilities.fromNativeSeparators(ipath),
-            Utilities.fromNativeSeparators(ipath) + "/",
+            FileSystemUtilities.fromNativeSeparators(ipath),
+            FileSystemUtilities.fromNativeSeparators(ipath) + "/",
         ]
 
         self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(False)
@@ -106,7 +107,9 @@
         )
 
         if directory:
-            self.submoduleUrlCombo.setEditText(Utilities.toNativeSeparators(directory))
+            self.submoduleUrlCombo.setEditText(
+                FileSystemUtilities.toNativeSeparators(directory)
+            )
 
     @pyqtSlot()
     def on_submoduleUrlClearHistoryButton_clicked(self):
@@ -132,7 +135,9 @@
         )
 
         if directory:
-            self.submoduleDirEdit.setText(Utilities.toNativeSeparators(directory))
+            self.submoduleDirEdit.setText(
+                FileSystemUtilities.toNativeSeparators(directory)
+            )
 
     def getData(self):
         """
@@ -189,8 +194,12 @@
         """
         if path == self.__repodir:
             return ""
-        elif Utilities.normcasepath(Utilities.toNativeSeparators(path)).startswith(
-            Utilities.normcasepath(Utilities.toNativeSeparators(self.__repodir + "/"))
+        elif FileSystemUtilities.normcasepath(
+            FileSystemUtilities.toNativeSeparators(path)
+        ).startswith(
+            FileSystemUtilities.normcasepath(
+                FileSystemUtilities.toNativeSeparators(self.__repodir + "/")
+            )
         ):
             relpath = path[len(self.__repodir) :]
             if relpath.startswith(("/", "\\")):