Mercurial Repositories > eric / file diff

--- a/eric7/Plugins/PluginCodeStyleChecker.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/PluginCodeStyleChecker.py	Sat May 22 18:51:46 2021 +0200
@@ -13,8 +13,8 @@
 
 from PyQt6.QtCore import QObject, pyqtSignal, QCoreApplication
 
-from E5Gui.E5Application import e5App
-from E5Gui.E5Action import E5Action
+from E5Gui.EricApplication import ericApp
+from E5Gui.EricAction import EricAction
 from Project.ProjectBrowserModel import ProjectBrowserFileItem
 from Utilities import determinePythonVersion
 
@@ -68,7 +68,7 @@
         self.__ui = ui
         self.__initialize()
         
-        self.backgroundService = e5App().getObject("BackgroundService")
+        self.backgroundService = ericApp().getObject("BackgroundService")
         
         path = os.path.join(
             os.path.dirname(__file__), 'CheckerPlugins', 'CodeStyleChecker')
@@ -234,9 +234,9 @@
         
         @return tuple of None and activation status (boolean)
         """
-        menu = e5App().getObject("Project").getMenu("Checks")
+        menu = ericApp().getObject("Project").getMenu("Checks")
         if menu:
-            self.__projectAct = E5Action(
+            self.__projectAct = EricAction(
                 self.tr('Check Code Style'),
                 self.tr('&Code Style...'), 0, 0,
                 self, 'project_check_pep8')
@@ -249,10 +249,10 @@
             ))
             self.__projectAct.triggered.connect(
                 self.__projectCodeStyleCheck)
-            e5App().getObject("Project").addE5Actions([self.__projectAct])
+            ericApp().getObject("Project").addEricActions([self.__projectAct])
             menu.addAction(self.__projectAct)
         
-        self.__editorAct = E5Action(
+        self.__editorAct = EricAction(
             self.tr('Check Code Style'),
             self.tr('&Code Style...'), 0, 0,
             self, "")
@@ -263,15 +263,15 @@
         ))
         self.__editorAct.triggered.connect(self.__editorCodeStyleCheck)
         
-        e5App().getObject("Project").showMenu.connect(self.__projectShowMenu)
-        e5App().getObject("ProjectBrowser").getProjectBrowser(
+        ericApp().getObject("Project").showMenu.connect(self.__projectShowMenu)
+        ericApp().getObject("ProjectBrowser").getProjectBrowser(
             "sources").showMenu.connect(self.__projectBrowserShowMenu)
-        e5App().getObject("ViewManager").editorOpenedEd.connect(
+        ericApp().getObject("ViewManager").editorOpenedEd.connect(
             self.__editorOpened)
-        e5App().getObject("ViewManager").editorClosedEd.connect(
+        ericApp().getObject("ViewManager").editorClosedEd.connect(
             self.__editorClosed)
         
-        for editor in e5App().getObject("ViewManager").getOpenEditors():
+        for editor in ericApp().getObject("ViewManager").getOpenEditors():
             self.__editorOpened(editor)
         
         return None, True
@@ -280,16 +280,16 @@
         """
         Public method to deactivate this plugin.
         """
-        e5App().getObject("Project").showMenu.disconnect(
+        ericApp().getObject("Project").showMenu.disconnect(
             self.__projectShowMenu)
-        e5App().getObject("ProjectBrowser").getProjectBrowser(
+        ericApp().getObject("ProjectBrowser").getProjectBrowser(
             "sources").showMenu.disconnect(self.__projectBrowserShowMenu)
-        e5App().getObject("ViewManager").editorOpenedEd.disconnect(
+        ericApp().getObject("ViewManager").editorOpenedEd.disconnect(
             self.__editorOpened)
-        e5App().getObject("ViewManager").editorClosedEd.disconnect(
+        ericApp().getObject("ViewManager").editorClosedEd.disconnect(
             self.__editorClosed)
         
-        menu = e5App().getObject("Project").getMenu("Checks")
+        menu = ericApp().getObject("Project").getMenu("Checks")
         if menu:
             menu.removeAction(self.__projectAct)
         
@@ -315,7 +315,7 @@
         """
         if menuName == "Checks" and self.__projectAct is not None:
             self.__projectAct.setEnabled(
-                e5App().getObject("Project").getProjectLanguage() in
+                ericApp().getObject("Project").getProjectLanguage() in
                 ["Python3", "MicroPython"])
     
     def __projectBrowserShowMenu(self, menuName, menu):
@@ -328,12 +328,12 @@
         """
         if (
             menuName == "Checks" and
-            e5App().getObject("Project").getProjectLanguage() in
+            ericApp().getObject("Project").getProjectLanguage() in
                 ["Python3", "MicroPython"]
         ):
             self.__projectBrowserMenu = menu
             if self.__projectBrowserAct is None:
-                self.__projectBrowserAct = E5Action(
+                self.__projectBrowserAct = EricAction(
                     self.tr('Check Code Style'),
                     self.tr('&Code Style...'), 0, 0,
                     self, "")
@@ -351,7 +351,7 @@
         """
         Private slot used to check the project files for code style.
         """
-        project = e5App().getObject("Project")
+        project = ericApp().getObject("Project")
         project.saveAllScripts()
         ppath = project.getProjectPath()
         files = [os.path.join(ppath, file)
@@ -372,7 +372,7 @@
         the project sources browser.
         """
         browser = (
-            e5App().getObject("ProjectBrowser").getProjectBrowser("sources")
+            ericApp().getObject("ProjectBrowser").getProjectBrowser("sources")
         )
         if browser.getSelectedItemsCount([ProjectBrowserFileItem]) > 1:
             fn = []
@@ -440,7 +440,7 @@
         Private slot to handle the code style check context menu action
         of the editors.
         """
-        editor = e5App().getObject("ViewManager").activeWindow()
+        editor = ericApp().getObject("ViewManager").activeWindow()
         if (
             editor is not None and
             editor.checkDirty() and