Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -16,9 +16,9 @@
 from PyQt6.QtGui import QTextCursor
 from PyQt6.QtWidgets import QWidget, QDialogButtonBox
 
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox, E5FileDialog
-from E5Gui.E5OverrideCursor import E5OverrideCursor
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox, EricFileDialog
+from E5Gui.EricOverrideCursor import EricOverrideCursor
 
 from EricUtilities.EricMutexLocker import EricMutexLocker
 
@@ -168,7 +168,7 @@
         elif os.path.exists('/tmp'):        # secok
             tmpdir = '/tmp'                 # secok
         else:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self,
                 self.tr("Subversion Diff"),
                 self.tr("""There is no temporary directory available."""))
@@ -203,11 +203,11 @@
             dname, fname = self.vcs.splitPath(fn)
             fnames = [fname]
         
-        with E5OverrideCursor():
+        with EricOverrideCursor():
             cwd = os.getcwd()
             os.chdir(dname)
             try:
-                dname = e5App().getObject('Project').getRelativePath(dname)
+                dname = ericApp().getObject('Project').getRelativePath(dname)
                 if dname:
                     dname += "/"
                 with EricMutexLocker(self.vcs.vcsExecutionMutex):
@@ -420,13 +420,13 @@
         else:
             fname = self.vcs.splitPath(self.filename)[0]
         
-        fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+        fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
             self,
             self.tr("Save Diff"),
             fname,
             self.tr("Patch Files (*.diff)"),
             None,
-            E5FileDialog.DontConfirmOverwrite)
+            EricFileDialog.DontConfirmOverwrite)
         
         if not fname:
             return  # user aborted
@@ -437,22 +437,22 @@
             if ex:
                 fname += ex
         if QFileInfo(fname).exists():
-            res = E5MessageBox.yesNo(
+            res = EricMessageBox.yesNo(
                 self,
                 self.tr("Save Diff"),
                 self.tr("<p>The patch file <b>{0}</b> already exists."
                         " Overwrite it?</p>").format(fname),
-                icon=E5MessageBox.Warning)
+                icon=EricMessageBox.Warning)
             if not res:
                 return
         fname = Utilities.toNativeSeparators(fname)
         
-        eol = e5App().getObject("Project").getEolString()
+        eol = ericApp().getObject("Project").getEolString()
         try:
             with open(fname, "w", encoding="utf-8", newline="") as f:
                 f.write(eol.join(self.contents.toPlainText().splitlines()))
         except OSError as why:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self, self.tr('Save Diff'),
                 self.tr(
                     '<p>The patch file <b>{0}</b> could not be saved.'