JSDOC/Introspect/Method.js

[gnome.introspection-doc-generator] / JSDOC / Introspect / Method.js

diff --git a/JSDOC/Introspect/Method.js b/JSDOC/Introspect/Method.js
index b26a4fb..942ef12 100644 (file)
--- a/JSDOC/Introspect/Method.js
+++ b/JSDOC/Introspect/Method.js
@@ -3,11 +3,14 @@
 GI      = imports.gi.GIRepository;
 
 
-imports['Object.js'].load(Object);
-
-console = imports['console.js'].console;
+XObject     = imports.XObject.XObject;
+console     = imports.console.console;
+NameSpace   = imports.NameSpace.NameSpace;
 
+Base        = imports.Base.Base;
 
+ 
+ 
 Introspect = imports['JSDOC/Introspect.js'].Introspect;
 Basic = imports['JSDOC/Introspect/Basic.js'].Basic;
 /**
@@ -17,7 +20,7 @@ Basic = imports['JSDOC/Introspect/Basic.js'].Basic;
 
 
 
-Method = Object.define(
+Method = XObject.define(
     function(m, memberOf, saveto, keylist) {
         this.propertyType  = 'Method';
         
@@ -37,7 +40,7 @@ Method = Object.define(
         var retval = [ { 
                 name : 0, 
                 type :  this.typeToName(GI.callable_info_get_return_type(m)),
-                desc : Introspect.doc(memberOf.alias + '.' + n_original + '.return-value')
+                desc : NameSpace.doc(memberOf.alias + '.' + n_original + '.return-value')
         } ];
         
         
@@ -47,7 +50,7 @@ Method = Object.define(
         
         if ((n == 'c_new') && !args.length && memberOf.constructors.length) {
             
-            memberOf.constructors[0].doc = Introspect.doc(memberOf.alias + '.' + n_original);
+            memberOf.constructors[0].doc = NameSpace.doc(memberOf.alias + '.' + n_original);
             
             return false; // skip.
         }
@@ -62,7 +65,7 @@ Method = Object.define(
          // this is a bit messy, as we probably loose the doc's on new..
        
         
-        Object.extend(this, {
+        XObject.extend(this, {
             name : n,
             params: args,
             returns :  retval,
@@ -70,13 +73,13 @@ Method = Object.define(
             isStatic : !(flags & GI.IFunctionInfoFlags.IS_METHOD),
             memberOf : memberOf.alias,
             exceptions : [],
-            desc : Introspect.doc(memberOf.alias + '.' + n_original)
+            desc : NameSpace.doc(memberOf.alias + '.' + n_original)
         });
         // add descriptions to the arguments..
         this.params.map(function(p) {
             
             
-            p.desc = Introspect.doc(memberOf.alias + '.' + n_original + '.' + p.name);
+            p.desc = NameSpace.doc(memberOf.alias + '.' + n_original + '.' + p.name);
             //Seed.print(memberOf.alias + '.' + n_original + '.' + p.name + ':' +  p.desc);
             
         });
@@ -96,8 +99,8 @@ Method = Object.define(
             
             
             
-            Introspect.references[ty] = Introspect.references[ty] || [];
-            Introspect.references[ty].push(this);
+            NameSpace.references[ty] = NameSpace.references[ty] || [];
+            NameSpace.references[ty].push(this);
             addedto.push(ty);
         }
         
@@ -126,8 +129,8 @@ Method = Object.define(
             
             
             
-            Introspect.references[ty] = Introspect.references[ty] || [];
-            Introspect.references[ty].push(this);
+            NameSpace.references[ty] = NameSpace.references[ty] || [];
+            NameSpace.references[ty].push(this);
             addedto.push(ty);
         }