Mercurial Repositories > eric / file diff

--- a/eric7/Tasks/TasksFile.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Tasks/TasksFile.py	Sat May 22 18:51:46 2021 +0200
@@ -12,9 +12,9 @@
 
 from PyQt6.QtCore import 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
 
@@ -63,12 +63,12 @@
             # step 2: tasks
             tasksDict["Tasks"] = [
                 task.toDict()
-                for task in e5App().getObject("TaskViewer").getGlobalTasks()
+                for task in ericApp().getObject("TaskViewer").getGlobalTasks()
             ]
         else:
             tasksDict["header"] = {
                 "comment": "eric tasks file for project {0}".format(
-                    e5App().getObject("Project").getProjectName()),
+                    ericApp().getObject("Project").getProjectName()),
                 "warning": (
                     "This file was generated automatically, do not edit."
                 ),
@@ -79,13 +79,13 @@
                 )
             # step 1: project scan filter
             tasksDict["ProjectScanFilter"] = (
-                e5App().getObject("TaskViewer").getTasksScanFilter()
+                ericApp().getObject("TaskViewer").getTasksScanFilter()
             )
             
             # step 2: tasks
             tasksDict["Tasks"] = [
                 task.toDict()
-                for task in e5App().getObject("TaskViewer").getProjectTasks()
+                for task in ericApp().getObject("TaskViewer").getProjectTasks()
             ]
         
         try:
@@ -93,8 +93,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 Tasks"),
                     self.tr(
@@ -120,7 +120,7 @@
                 jsonString = f.read()
             tasksDict = json.loads(jsonString)
         except (OSError, json.JSONDecodeError) as err:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Read Tasks"),
                 self.tr(
@@ -130,7 +130,7 @@
             )
             return False
         
-        viewer = e5App().getObject("TaskViewer")
+        viewer = ericApp().getObject("TaskViewer")
         if tasksDict["ProjectScanFilter"]:
             viewer.setTasksScanFilter(tasksDict["ProjectScanFilter"])