Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/PluginVcsGit.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/PluginVcsGit.py	Sat May 22 18:51:46 2021 +0200
@@ -12,7 +12,7 @@
 
 from PyQt6.QtCore import QObject, QCoreApplication, QByteArray
 
-from E5Gui.E5Application import e5App
+from E5Gui.EricApplication import ericApp
 
 import Preferences
 from Preferences.Shortcuts import readShortcuts
@@ -141,7 +141,7 @@
     """
     Module function to prepare for an uninstallation.
     """
-    if not e5App().getObject("PluginManager").isPluginLoaded(
+    if not ericApp().getObject("PluginManager").isPluginLoaded(
             "PluginVcsGit"):
         Preferences.Prefs.settings.remove("Git")
 
@@ -195,7 +195,7 @@
         from VcsPlugins.vcsGit.ProjectHelper import GitProjectHelper
         self.__projectHelperObject = GitProjectHelper(None, None)
         with contextlib.suppress(KeyError):
-            e5App().registerPluginObject(
+            ericApp().registerPluginObject(
                 pluginTypename, self.__projectHelperObject, pluginType)
         
         readShortcuts(pluginName=pluginTypename)
@@ -214,7 +214,7 @@
         
         @param ui reference to the main window (UserInterface)
         @param toolbarManager reference to a toolbar manager object
-            (E5ToolBarManager)
+            (EricToolBarManager)
         """
         if self.__projectHelperObject:
             self.__projectHelperObject.initToolbar(ui, toolbarManager)
@@ -312,7 +312,7 @@
         """
         Public method to prepare for an uninstallation.
         """
-        e5App().unregisterPluginObject(pluginTypename)
+        ericApp().unregisterPluginObject(pluginTypename)
     
     def prepareUnload(self):
         """
@@ -320,8 +320,8 @@
         """
         if self.__projectHelperObject:
             self.__projectHelperObject.removeToolbar(
-                self.__ui, e5App().getObject("ToolbarManager"))
-        e5App().unregisterPluginObject(pluginTypename)
+                self.__ui, ericApp().getObject("ToolbarManager"))
+        ericApp().unregisterPluginObject(pluginTypename)
 
 #
 # eflag: noqa = M801