Mercurial Repositories > eric / file diff

diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Sessions/SessionFile.py
--- a/eric7/Sessions/SessionFile.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Sessions/SessionFile.py	Sat May 22 18:51:46 2021 +0200
@@ -12,9 +12,9 @@
 
 from PyQt6.QtCore import Qt, QObject
 
-from E5Gui import E5MessageBox
-from E5Gui.E5OverrideCursor import E5OverridenCursor
-from E5Gui.E5Application import e5App
+from E5Gui import EricMessageBox
+from E5Gui.EricOverrideCursor import EricOverridenCursor
+from E5Gui.EricApplication import ericApp
 
 import Preferences
 
@@ -46,12 +46,12 @@
         @rtype bool
         """
         # get references to objects we need
-        project = e5App().getObject("Project")
-        projectBrowser = e5App().getObject("ProjectBrowser")
-        multiProject = e5App().getObject("MultiProject")
-        vm = e5App().getObject("ViewManager")
-        dbg = e5App().getObject("DebugUI")
-        dbs = e5App().getObject("DebugServer")
+        project = ericApp().getObject("Project")
+        projectBrowser = ericApp().getObject("ProjectBrowser")
+        multiProject = ericApp().getObject("MultiProject")
+        vm = ericApp().getObject("ViewManager")
+        dbg = ericApp().getObject("DebugUI")
+        dbs = ericApp().getObject("DebugServer")
         
         # prepare the session data dictionary
         # step 0: header
@@ -227,8 +227,8 @@
             with open(filename, "w") as f:
                 f.write(jsonString)
         except (TypeError, OSError) as err:
-            with E5OverridenCursor():
-                E5MessageBox.critical(
+            with EricOverridenCursor():
+                EricMessageBox.critical(
                     None,
                     self.tr("Save Session"),
                     self.tr(
@@ -254,7 +254,7 @@
                 jsonString = f.read()
             sessionDict = json.loads(jsonString)
         except (OSError, json.JSONDecodeError) as err:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Read Session"),
                 self.tr(
@@ -265,12 +265,12 @@
             return False
         
         # get references to objects we need
-        project = e5App().getObject("Project")
-        projectBrowser = e5App().getObject("ProjectBrowser")
-        multiProject = e5App().getObject("MultiProject")
-        vm = e5App().getObject("ViewManager")
-        dbg = e5App().getObject("DebugUI")
-        dbs = e5App().getObject("DebugServer")
+        project = ericApp().getObject("Project")
+        projectBrowser = ericApp().getObject("ProjectBrowser")
+        multiProject = ericApp().getObject("MultiProject")
+        vm = ericApp().getObject("ViewManager")
+        dbg = ericApp().getObject("DebugUI")
+        dbs = ericApp().getObject("DebugServer")
         
         # step 1: multi project and project
         # =================================