JSDOC/Introspect/Callback.js

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

diff --git a/JSDOC/Introspect/Callback.js b/JSDOC/Introspect/Callback.js
index 4146a09..d9a7318 100644 (file)
--- a/JSDOC/Introspect/Callback.js
+++ b/JSDOC/Introspect/Callback.js
@@ -5,41 +5,44 @@ GLib    = imports.gi.GLib;
 xml     = imports.libxml;
 //GObject = imports.gi.GObject;
 
-console = imports['console.js'].console;
-JSDOC   = imports['JSDOC.js'].JSDOC;
-Roo     = imports['Roo.js'].Roo;
+XObject = imports.XObject.XObject;
+console = imports.console.console;
 
-Introspect = imports['JSDOC/Introspect.js'].Introspect;
-Basic = imports['JSDOC/Introspect/Basic.js'].Basic;
 
+NameSpace = imports.NameSpace.NameSpace;
+Basic = imports.Basic.Basic;
 
 
-Callback = function(sig, memberOf, saveto, keylist) {
 
-    
-    var params = this.argsToArrays(sig);
-    // add a reference to self...
-    /*params.unshift({
-        name : 'self',
-        type : memberOf.alias,
-        direction : 'in',
-        be_null :  false
+Callback = XObject.define(
+    function(sig, memberOf, saveto, keylist) {
+
+        
+        var params = this.argsToArrays(sig);
+        // add a reference to self...
+        /*params.unshift({
+            name : 'self',
+            type : memberOf.alias,
+            direction : 'in',
+            be_null :  false
+                
+        });
+        */
+        
+        XObject.extend(this,{
+            name : GI.base_info_get_name(sig),
+            params : params,
+            //memberOf : memberOf.alias,
+            exceptions : [],
+            returns :   [ { type :  this.typeToName(GI.callable_info_get_return_type(sig)) } ]            
             
-    });
-    */
-    
-    Roo.apply(this,{
-        name : GI.base_info_get_name(sig),
-        params : params,
-        //memberOf : memberOf.alias,
-        exceptions : [],
-        returns :   [ { type :  this.typeToName(GI.callable_info_get_return_type(sig)) } ]            
+        });
+        this.desc =  NameSpace.doc(memberOf.alias + '.' + this.name);
+        //memberOf[saveto].push(this);
+        //keylist.push(this.name);
         
-    });
-    this.desc =  Introspect.doc(memberOf.alias + '.' + this.name);
-    //memberOf[saveto].push(this);
-    //keylist.push(this.name);
-    
-}
-Roo.extend(Callback,Basic);
+    },
+    Basic,
+    {}
+);