Mercurial Repositories > eric / file diff

--- a/E5Gui/E5Application.py	Tue Mar 07 18:46:09 2017 +0100
+++ b/E5Gui/E5Application.py	Tue Mar 07 18:53:18 2017 +0100
@@ -28,18 +28,18 @@
         self.__objectRegistry = {}
         self.__pluginObjectRegistry = {}
         
-    def registerObject(self, name, object):
+    def registerObject(self, name, objectRef):
         """
         Public method to register an object in the object registry.
         
         @param name name of the object (string)
-        @param object reference to the object
+        @param objectRef reference to the object
         @exception KeyError raised when the given name is already in use
         """
         if name in self.__objectRegistry:
             raise KeyError('Object "{0}" already registered.'.format(name))
         else:
-            self.__objectRegistry[name] = object
+            self.__objectRegistry[name] = objectRef
         
     def getObject(self, name):
         """
@@ -54,12 +54,12 @@
         else:
             raise KeyError('Object "{0}" is not registered.'.format(name))
         
-    def registerPluginObject(self, name, object, pluginType=None):
+    def registerPluginObject(self, name, objectRef, pluginType=None):
         """
         Public method to register a plugin object in the object registry.
         
         @param name name of the plugin object (string)
-        @param object reference to the plugin object
+        @param objectRef reference to the plugin object
         @keyparam pluginType type of the plugin object (string)
         @exception KeyError raised when the given name is already in use
         """
@@ -67,7 +67,7 @@
             raise KeyError(
                 'Pluginobject "{0}" already registered.'.format(name))
         else:
-            self.__pluginObjectRegistry[name] = (object, pluginType)
+            self.__pluginObjectRegistry[name] = (objectRef, pluginType)
         
     def unregisterPluginObject(self, name):
         """