Mercurial Repositories > eric / changeset

--- a/E5XML/TemplatesReader.py	Tue Jul 10 19:41:30 2018 +0200
+++ b/E5XML/TemplatesReader.py	Wed Jul 11 19:06:33 2018 +0200
@@ -9,8 +9,6 @@
 
 from __future__ import unicode_literals
 
-from E5Gui.E5Application import e5App
-
 from .Config import templatesFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase
 
@@ -21,7 +19,7 @@
     """
     supportedVersions = ["4.0"]
     
-    def __init__(self, device, viewer=None):
+    def __init__(self, device, viewer):
         """
         Constructor
         
@@ -30,10 +28,7 @@
         """
         XMLStreamReaderBase.__init__(self, device)
         
-        if viewer:
-            self.viewer = viewer
-        else:
-            self.viewer = e5App().getObject("TemplateViewer")
+        self.__viewer = viewer
         
         self.version = ""
         self.groupName = "DEFAULT"
@@ -63,7 +58,7 @@
         """
         self.groupName = self.attribute('name', "DEFAULT")
         language = self.attribute('language', "All")
-        self.viewer.addGroup(self.groupName, language)
+        self.__viewer.addGroup(self.groupName, language)
         
         while not self.atEnd():
             self.readNext()
@@ -89,9 +84,9 @@
             if self.isEndElement() and \
                     self.name() == "Template" and \
                     templateName:
-                self.viewer.addEntry(self.groupName, templateName,
-                                     templateDescription, templateText,
-                                     quiet=True)
+                self.__viewer.addEntry(self.groupName, templateName,
+                                       templateDescription, templateText,
+                                       quiet=True)
                 break
             
             if self.isStartElement():