Rename treebuilder to transformer and gobjectreebuilder to

2008-04-25  Johan Dahlin  <jdahlin@async.com.br>

    * giscanner/Makefile.am:
    * giscanner/gidlparser.py:
    * giscanner/gidlwriter.py:
    * giscanner/girwriter.py:
    * giscanner/glibtransformer.py:
    * giscanner/gobjecttreebuilder.py:
    * giscanner/transformer.py:
    * giscanner/treebuilder.py:
    * tools/g-ir-scanner:
    Rename treebuilder to transformer and
    gobjectreebuilder to glibtransformer.


svn path=/trunk/; revision=228

8 files changed, 31 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 599495db..de9fb330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,20 @@
 2008-04-25  Johan Dahlin  <jdahlin@async.com.br>
 
 	* giscanner/Makefile.am:
+	* giscanner/gidlparser.py:
+	* giscanner/gidlwriter.py:
+	* giscanner/girwriter.py:
+	* giscanner/glibtransformer.py:
+	* giscanner/gobjecttreebuilder.py:
+	* giscanner/transformer.py:
+	* giscanner/treebuilder.py:
+	* tools/g-ir-scanner:
+	Rename treebuilder to transformer and
+	gobjectreebuilder to glibtransformer.
+
+2008-04-25  Johan Dahlin  <jdahlin@async.com.br>
+
+	* giscanner/Makefile.am:
 	* giscanner/__init__.py:
 	* giscanner/cgobject.py:
 	* giscanner/gidlparser.py:
diff --git a/giscanner/Makefile.am b/giscanner/Makefile.am
index f2228abe..b8c18bab 100644
--- a/giscanner/Makefile.am
+++ b/giscanner/Makefile.am
@@ -31,10 +31,10 @@ pkgpyexec_PYTHON = 		\
 	gidlparser.py		\
 	gidlwriter.py		\
 	girwriter.py		\
-	gobjecttreebuilder.py 	\
+	glibtransformer.py 	\
 	odict.py		\
 	sourcescanner.py	\
-	treebuilder.py		\
+	transformer.py		\
 	xmlwriter.py
 
 _giscanner_la_CFLAGS = \
diff --git a/giscanner/gidlparser.py b/giscanner/gidlparser.py
index 289f4afe..d680d9d0 100644
--- a/giscanner/gidlparser.py
+++ b/giscanner/gidlparser.py
@@ -19,7 +19,7 @@
 
 from xml.etree.ElementTree import parse
 
-from .gobjecttreebuilder import GLibObject
+from .glibtransformer import GLibObject
 
 
 class GIDLParser(object):
diff --git a/giscanner/gidlwriter.py b/giscanner/gidlwriter.py
index 67fe5bf2..757169af 100644
--- a/giscanner/gidlwriter.py
+++ b/giscanner/gidlwriter.py
@@ -19,9 +19,9 @@
 
 from __future__ import with_statement
 
-from .gobjecttreebuilder import (GLibBoxed, GLibEnum, GLibEnumMember,
-                                 GLibFlags, GLibObject, GLibInterface)
-from .treebuilder import Callback, Class, Enum, Function, Interface
+from .glibtransformer import (GLibBoxed, GLibEnum, GLibEnumMember,
+                              GLibFlags, GLibObject, GLibInterface)
+from .transformer import Callback, Class, Enum, Function, Interface
 from .xmlwriter import XMLWriter
 
 
diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py
index a444b12b..3ea39908 100644
--- a/giscanner/girwriter.py
+++ b/giscanner/girwriter.py
@@ -19,9 +19,9 @@
 
 from __future__ import with_statement
 
-from .gobjecttreebuilder import (GLibBoxed, GLibEnum, GLibEnumMember,
-                                 GLibFlags, GLibObject, GLibInterface)
-from .treebuilder import Callback, Class, Enum, Function, Interface
+from .glibtransformer import (GLibBoxed, GLibEnum, GLibEnumMember,
+                              GLibFlags, GLibObject, GLibInterface)
+from .transformer import Callback, Class, Enum, Function, Interface
 from .xmlwriter import XMLWriter
 
 
diff --git a/giscanner/gobjecttreebuilder.py b/giscanner/glibtransformer.py
index 0d6955a0..f288e219 100644
--- a/giscanner/gobjecttreebuilder.py
+++ b/giscanner/glibtransformer.py
@@ -23,7 +23,7 @@ import os
 
 from . import cgobject
 from .odict import odict
-from .treebuilder import (Callback, Class, Enum, Function, Interface,
+from .transformer import (Callback, Class, Enum, Function, Interface,
                           Member, Node, Parameter, Property, Return, Struct)
 
 # Copied from h2defs.py
@@ -109,7 +109,7 @@ class GLibSignal(Node):
         self.parameters = []
 
 
-class GObjectTreeBuilder(object):
+class GLibTransformer(object):
     def __init__(self, namespace_name):
         self._namespace_name = namespace_name
         self._output_ns = odict()
diff --git a/giscanner/treebuilder.py b/giscanner/transformer.py
index b9d6a4a2..f4aee932 100644
--- a/giscanner/treebuilder.py
+++ b/giscanner/transformer.py
@@ -151,7 +151,7 @@ class Callback(Node):
             self.name, self.retval, self.parameters)
 
 
-class TreeBuilder(object):
+class Transformer(object):
     def __init__(self, generator):
         self.generator = generator
         self.nodes = []
diff --git a/tools/g-ir-scanner b/tools/g-ir-scanner
index b9b17d44..3b1ca02c 100755
--- a/tools/g-ir-scanner
+++ b/tools/g-ir-scanner
@@ -24,9 +24,10 @@ import sys
 
 sys.path.insert(0, '.')
 
-from giscanner.gobjecttreebuilder import GObjectTreeBuilder
+from giscanner.glibtransformer import GLibTransformer
 from giscanner.sourcescanner import SourceScanner
-from giscanner.treebuilder import TreeBuilder
+from giscanner.transformer import Transformer
+
 
 def main(args):
     parser = optparse.OptionParser('%prog [options] sources')
@@ -92,12 +93,12 @@ def main(args):
     ss.parse_files(filenames)
     ss.parse_macros()
 
-    builder = GObjectTreeBuilder(options.namespace)
+    builder = GLibTransformer(options.namespace)
     if options.library:
         builder.load_library(options.library)
     for include in options.includes:
         builder.register_include(include)
-    builder.parse(TreeBuilder(ss).get_nodes())
+    builder.parse(Transformer(ss).get_nodes())
 
     if options.format == 'gir':
         from giscanner.girwriter import GIRWriter