Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -11,8 +11,8 @@
 from PyQt6.QtGui import QTextCursor
 from PyQt6.QtWidgets import QWidget, QDialogButtonBox
 
-from E5Gui import E5MessageBox, E5FileDialog
-from E5Gui.E5Application import e5App
+from E5Gui import EricMessageBox, EricFileDialog
+from E5Gui.EricApplication import ericApp
 
 from .Ui_HgDiffDialog import Ui_HgDiffDialog
 from .HgDiffHighlighter import HgDiffHighlighter
@@ -98,7 +98,7 @@
         procStarted = self.__diffGenerator.start(
             fn, versions=versions, bundle=bundle, qdiff=qdiff)
         if not procStarted:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self,
                 self.tr('Process Generation Error'),
                 self.tr(
@@ -219,13 +219,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
@@ -236,22 +236,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.'