X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=JSDOC%2FRooFile.js;fp=JSDOC%2FRooFile.js;h=5cca0a5efc8546245045c2deb3b9e0be5c62e033;hp=ce477c9269a6b8b684e49913b4310db4806630d3;hb=b37d3be3f7462321df3eca8f1dc3ffb69e13cabc;hpb=e649453d5fceced7208ef36aab7fb06989c6be0b

diff --git a/JSDOC/RooFile.js b/JSDOC/RooFile.js
index ce477c9..5cca0a5 100644
--- a/JSDOC/RooFile.js
+++ b/JSDOC/RooFile.js
@@ -1,9 +1,8 @@
 //<script type="text/javscript">
 
-imports['Object.js'].load(Object);
-JSDOC       = imports['JSDOC.js'].JSDOC;
-console     = imports['console.js'].console;
-TokenStream = imports['JSDOC/TokenStream.js'].TokenStream;
+XObject = imports.XObject.XObject;
+console     = imports.console.console;
+TokenStream = imports.TokenStream.TokenStream;
 /**
  * 
  * this takes our collased file, and turns it into the config array..
@@ -15,7 +14,7 @@ TokenStream = imports['JSDOC/TokenStream.js'].TokenStream;
  * 
  */
 
-RooFile  =  Object.define(
+RooFile  =  XObject.define(
     function (ar)
     {
         RooFile.superclass.constructor.call(this, ar);
@@ -112,7 +111,7 @@ RooFile  =  Object.define(
                         
                         
                     };
-                    Object.extend(this.cfg, this.parseProps(this.tokens[pos+1].props));
+                    XObject.extend(this.cfg, this.parseProps(this.tokens[pos+1].props));
                     return;
                     
                 }
@@ -135,7 +134,7 @@ RooFile  =  Object.define(
                 
                 
                     
-                Object.extend(this.cfg, this.parseProps(this.tokens[pos+1].items[1][0].props));
+                XObject.extend(this.cfg, this.parseProps(this.tokens[pos+1].items[1][0].props));
                 return;
                 
             }
@@ -156,7 +155,7 @@ RooFile  =  Object.define(
                     '*extends' : this.tokens[pos+1].data
                 };
                     
-                Object.extend(this.cfg, this.parseProps(this.tokens[pos+2].items[0][0].props));
+                XObject.extend(this.cfg, this.parseProps(this.tokens[pos+2].items[0][0].props));
                 
                 return;
                 
@@ -170,7 +169,7 @@ RooFile  =  Object.define(
             if (pos > -1) {
                 
                 this.cfg['*extends'] = this.tokens[pos+1].items[1][0].data;
-                Object.extend(this.cfg, this.parseProps(this.tokens[pos+1].items[2][0].props));
+                XObject.extend(this.cfg, this.parseProps(this.tokens[pos+1].items[2][0].props));
                 
                 // no more..
                 return;
@@ -182,7 +181,7 @@ RooFile  =  Object.define(
             if (pos > -1) {
                 
                 this.cfg['*extends'] = this.tokens[pos+1].items[1][0].data;
-                Object.extend(this.cfg, this.parseProps(this.tokens[pos+1].items[2][0].props));
+                XObject.extend(this.cfg, this.parseProps(this.tokens[pos+1].items[2][0].props));
                 
                 // no more..
                 return;
@@ -321,7 +320,7 @@ RooFile  =  Object.define(
             if (!ret.items && fakeItems.length) {
                 ret.items = [];
             }
-            Object.extend(fakeItems, function(e) {
+            XObject.extend(fakeItems, function(e) {
                 ret.items.push(e);
             })
             // merge fakeItems;