Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -14,7 +14,7 @@
     QApplication, QWidget
 )
 
-from E5Gui.E5Application import e5App
+from E5Gui.EricApplication import ericApp
 
 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog
 
@@ -58,7 +58,7 @@
         self.refreshButton.setEnabled(False)
         
         self.vcs = vcs
-        self.project = e5App().getObject("Project")
+        self.project = ericApp().getObject("Project")
         
         self.__hgClient = vcs.getClient()
     
@@ -304,4 +304,4 @@
         itm = self.conflictsList.selectedItems()[0]
         filename = itm.data(0, self.FilenameRole)
         if Utilities.MimeTypes.isTextFile(filename):
-            e5App().getObject("ViewManager").getEditor(filename)
+            ericApp().getObject("ViewManager").getEditor(filename)