X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=Introspect%2FCallback.js;fp=JSDOC%2FIntrospect%2FCallback.js;h=d9a73189ab8b06fefd83e114bbec8c1b3fce7105;hp=f92f46606f3bac3d43e22bcb400edfc945819e68;hb=134619d3049edce9b27810483e8011e5dfb783e0;hpb=649a91296eb2d7e5cbd4d1407deb9c1fa714229f

diff --git a/JSDOC/Introspect/Callback.js b/Introspect/Callback.js
similarity index 74%
rename from JSDOC/Introspect/Callback.js
rename to Introspect/Callback.js
index f92f466..d9a7318 100644
--- a/JSDOC/Introspect/Callback.js
+++ b/Introspect/Callback.js
@@ -4,16 +4,17 @@ GI      = imports.gi.GIRepository;
 GLib    = imports.gi.GLib;
 xml     = imports.libxml;
 //GObject = imports.gi.GObject;
-imports['Object.js'].load(Object);
 
-console = imports['console.js'].console;
+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 = Object.define(
+
+Callback = XObject.define(
     function(sig, memberOf, saveto, keylist) {
 
         
@@ -28,7 +29,7 @@ Callback = Object.define(
         });
         */
         
-        Object.extend(this,{
+        XObject.extend(this,{
             name : GI.base_info_get_name(sig),
             params : params,
             //memberOf : memberOf.alias,
@@ -36,7 +37,7 @@ Callback = Object.define(
             returns :   [ { type :  this.typeToName(GI.callable_info_get_return_type(sig)) } ]            
             
         });
-        this.desc =  Introspect.doc(memberOf.alias + '.' + this.name);
+        this.desc =  NameSpace.doc(memberOf.alias + '.' + this.name);
         //memberOf[saveto].push(this);
         //keylist.push(this.name);