Mercurial Repositories > eric / file diff

--- a/eric7/Project/ProjectInterfacesBrowser.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Project/ProjectInterfacesBrowser.py	Sat May 22 18:51:46 2021 +0200
@@ -15,9 +15,9 @@
 from PyQt6.QtCore import QThread, pyqtSignal, QProcess
 from PyQt6.QtWidgets import QDialog, QApplication, QMenu
 
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox
-from E5Gui.E5ProgressDialog import E5ProgressDialog
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox
+from E5Gui.EricProgressDialog import EricProgressDialog
 
 from .ProjectBrowserModel import (
     ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem,
@@ -514,7 +514,7 @@
         @param exitStatus exit status of the process (QProcess.ExitStatus)
         """
         self.compileRunning = False
-        ui = e5App().getObject("UserInterface")
+        ui = ericApp().getObject("UserInterface")
         if exitStatus == QProcess.ExitStatus.NormalExit and exitCode == 0:
             path = os.path.dirname(self.idlFile)
             poaList = glob.glob(os.path.join(path, "*__POA"))
@@ -546,7 +546,7 @@
 
         @param fn filename of the .idl file to be compiled (string)
         @param noDialog flag indicating silent operations (boolean)
-        @param progress reference to the progress dialog (E5ProgressDialog)
+        @param progress reference to the progress dialog (EricProgressDialog)
         @return reference to the compile process (QProcess)
         """
         params = self.project.pdata["IDLPARAMS"]
@@ -583,7 +583,7 @@
             self.compileRunning = False
             if progress is not None:
                 progress.cancel()
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self,
                 self.tr('Process Generation Error'),
                 self.tr(
@@ -608,7 +608,7 @@
         """
         if self.omniidl is not None:
             numIDLs = len(self.project.pdata["INTERFACES"])
-            progress = E5ProgressDialog(
+            progress = EricProgressDialog(
                 self.tr("Compiling interfaces..."),
                 self.tr("Abort"), 0, numIDLs,
                 self.tr("%v/%m Interfaces"), self)
@@ -640,7 +640,7 @@
             files = [self.project.getRelativePath(itm.fileName())
                      for itm in items]
             numIDLs = len(files)
-            progress = E5ProgressDialog(
+            progress = EricProgressDialog(
                 self.tr("Compiling interfaces..."),
                 self.tr("Abort"), 0, numIDLs,
                 self.tr("%v/%m Interfaces"), self)
@@ -689,4 +689,4 @@
         """
         Private method to open the configuration dialog.
         """
-        e5App().getObject("UserInterface").showPreferences("corbaPage")
+        ericApp().getObject("UserInterface").showPreferences("corbaPage")