[cluttermm] conversion macros now in alphabetic order by class



commit ea8c4499ab1e73e4f96446096e59f71ad7e0f67e
Author: Ian Martin <martin_id vodafone co nz>
Date:   Mon Mar 17 10:29:24 2014 +1300

    conversion macros now in alphabetic order by class

 codegen/m4/convert_clutter.m4 |  107 +++++++++++++++++++++--------------------
 1 files changed, 54 insertions(+), 53 deletions(-)
---
diff --git a/codegen/m4/convert_clutter.m4 b/codegen/m4/convert_clutter.m4
index 6c67f43..a1b84a8 100644
--- a/codegen/m4/convert_clutter.m4
+++ b/codegen/m4/convert_clutter.m4
@@ -1,28 +1,16 @@
-_CONVERSION(`const Glib::RefPtr<Actor>&',`ClutterActor*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`const Glib::RefPtr<const Actor>&',`ClutterActor*',__CONVERT_CONST_REFPTR_TO_P)
-
-_CONVERSION(`ClutterActor*',`Glib::RefPtr<Actor>',`Glib::wrap($3)')
-_CONVERSION(`ClutterActor*',`Glib::RefPtr<const Actor>',`Glib::wrap($3)')
-
-dnl ValueBase
-_CONVERSION(`Glib::ValueBase&',`GValue*',`($3).gobj()')
-_CONVERSION(`const Glib::ValueBase&',`const GValue*',`($3).gobj()')
-
 _CONVERSION(`const Glib::RefPtr<Action>&',`ClutterAction*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<const Action>&',`ClutterAction*',__CONVERT_CONST_REFPTR_TO_P)
 
 _CONVERSION(`ClutterAction*',`Glib::RefPtr<Action>',`Glib::wrap($3)')
 _CONVERSION(`ClutterAction*',`Glib::RefPtr<const Action>',`Glib::wrap($3)')
 
-_CONVERSION(`const ActorBox&', `const ClutterActorBox*',`($3).gobj()')
+_CONVERSION(`const Glib::RefPtr<Actor>&',`ClutterActor*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`const Glib::RefPtr<const Actor>&',`ClutterActor*',__CONVERT_CONST_REFPTR_TO_P)
 
-_CONVERSION(`const Glib::RefPtr<Shader>&',`ClutterShader*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`ClutterShader*',`Glib::RefPtr<Shader>', `Glib::wrap($3)')
-_CONVERSION(`ClutterShader*',`Glib::RefPtr<const Shader>', `Glib::wrap($3)')
+_CONVERSION(`ClutterActor*',`Glib::RefPtr<Actor>',`Glib::wrap($3)')
+_CONVERSION(`ClutterActor*',`Glib::RefPtr<const Actor>',`Glib::wrap($3)')
 
-_CONVERSION(`const Glib::RefPtr<Timeline>&',`ClutterTimeline*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`ClutterTimeline*',`Glib::RefPtr<Timeline>',`Glib::wrap($3)')
-_CONVERSION(`ClutterTimeline*',`Glib::RefPtr<const Timeline>',`Glib::wrap($3)')
+_CONVERSION(`const ActorBox&', `const ClutterActorBox*',`($3).gobj()')
 
 _CONVERSION(`const Glib::RefPtr<Alpha>&',`ClutterAlpha*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`ClutterAlpha*',`Glib::RefPtr<Alpha>',`Glib::wrap($3)')
@@ -39,10 +27,17 @@ _CONVERSION(`ClutterAnimator*',`Glib::RefPtr<const Animator>',`Glib::wrap($3)')
 _CONVERSION(`const Glib::RefPtr<Backend>&',`ClutterBackend*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`ClutterBackend*',`Glib::RefPtr<Backend>',`Glib::wrap($3)')
 
-_CONVERSION(`const Glib::RefPtr<InputDevice>&',`ClutterInputDevice*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`ClutterInputDevice*',`Glib::RefPtr<InputDevice>',`Glib::wrap($3)')
-_CONVERSION(`ClutterInputDevice*',`Glib::RefPtr<const InputDevice>',`Glib::wrap($3)')
-_CONVERSION(`ClutterInputDevice*',`const Glib::RefPtr<InputDevice>&', `Glib::wrap(($3),true)')
+_CONVERSION(`const Glib::RefPtr<ChildMeta>&',`ClutterChildMeta*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`Glib::RefPtr<ChildMeta>',`ClutterChildMeta*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`ClutterChildMeta*',`Glib::RefPtr<ChildMeta>',`Glib::wrap($3)')
+_CONVERSION(`ClutterChildMeta*',`Glib::RefPtr<const ChildMeta>',`Glib::wrap($3)')
+
+_CONVERSION(`Color&',`ClutterColor*',`($3).gobj()')
+_CONVERSION(`const Color&',`const ClutterColor*',`($3).gobj()')
+
+_CONVERSION(`const Glib::RefPtr<Container>&',`ClutterContainer*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`ClutterContainer*',`Glib::RefPtr<Container>',`Glib::wrap($3)')
+_CONVERSION(`ClutterContainer*',`Glib::RefPtr<const Container>',`Glib::wrap($3)')
 
 _CONVERSION(`ClutterDeviceManager*',`Glib::RefPtr<DeviceManager>',`Glib::wrap($3)')
 
@@ -52,11 +47,28 @@ _CONVERSION(`const Glib::RefPtr<const Effect>&',`ClutterEffect*',__CONVERT_CONST
 _CONVERSION(`ClutterEffect*',`Glib::RefPtr<Effect>',`Glib::wrap($3)')
 _CONVERSION(`ClutterEffect*',`Glib::RefPtr<const Effect>',`Glib::wrap($3)')
 
+_CONVERSION(`Geometry&',`Clutter::Geometry*',`($3).gobj()')
+_CONVERSION(`const Geometry&',`ClutterGeometry*',`const_cast<ClutterGeometry*>(($3).gobj())')
+_CONVERSION(`const Geometry&',`const ClutterGeometry*',`($3).gobj()')
+_CONVERSION(`ClutterGeometry*',`const Geometry&',`Geometry($3)')
+_CONVERSION(`const ClutterGeometry*',`const Geometry&',`Geometry($3)')
+
+_CONVERSION(`const Glib::RefPtr<InputDevice>&',`ClutterInputDevice*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`ClutterInputDevice*',`Glib::RefPtr<InputDevice>',`Glib::wrap($3)')
+_CONVERSION(`ClutterInputDevice*',`Glib::RefPtr<const InputDevice>',`Glib::wrap($3)')
+_CONVERSION(`ClutterInputDevice*',`const Glib::RefPtr<InputDevice>&', `Glib::wrap(($3),true)')
+
 _CONVERSION(`const Glib::RefPtr<Interval>&',`ClutterInterval*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`const Glib::RefPtr<const Interval>&',`ClutterInterval*',__CONVERT_CONST_REFPTR_TO_P)
 _CONVERSION(`ClutterInterval*',`Glib::RefPtr<Interval>',`Glib::wrap($3)')
 _CONVERSION(`ClutterInterval*',`Glib::RefPtr<const Interval>',`Glib::wrap($3)')
 
+_CONVERSION(`Knot&',`ClutterKnot*',`($3).gobj()')
+_CONVERSION(`const Knot&',`ClutterKnot*',`const_cast<ClutterKnot*>(($3).gobj())')
+_CONVERSION(`const Knot&',`const ClutterKnot*',`($3).gobj()')
+_CONVERSION(`ClutterKnot*',`const Knot&',`Knot($3)')
+_CONVERSION(`const ClutterKnot*',`const Knot&',`Knot($3)')
+
 _CONVERSION(`const Glib::RefPtr<LayoutManager>&',`ClutterLayoutManager*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`ClutterLayoutManager*',`Glib::RefPtr<LayoutManager>',`Glib::wrap($3)')
 _CONVERSION(`ClutterLayoutManager*',`Glib::RefPtr<const LayoutManager>',`Glib::wrap($3)')
@@ -66,52 +78,40 @@ _CONVERSION(`Glib::RefPtr<LayoutMeta>',`ClutterLayoutMeta*',__CONVERT_REFPTR_TO_
 _CONVERSION(`ClutterLayoutMeta*',`Glib::RefPtr<LayoutMeta>',`Glib::wrap($3)')
 _CONVERSION(`ClutterLayoutMeta*',`Glib::RefPtr<const LayoutMeta>',`Glib::wrap($3)')
 
-_CONVERSION(`const Glib::RefPtr<Texture>&',`ClutterTexture*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`ClutterTexture*',`Glib::RefPtr<Texture>',`Glib::wrap($3)')
+_CONVERSION(`const Margin&',`const ClutterMargin*',`($3).gobj()')
+
+_CONVERSION(`Padding&',`ClutterPadding*',`&($3)')
+_CONVERSION(`const Padding&',`const ClutterPadding*',`&($3)')
+_CONVERSION(`ClutterPadding*',`Padding&',`*($3)')
 
 _CONVERSION(`const Glib::RefPtr<Path>&',`ClutterPath*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`ClutterPath*',`Glib::RefPtr<Path>',`Glib::wrap($3)')
 _CONVERSION(`ClutterPath*',`Glib::RefPtr<const Path>',`Glib::wrap($3)')
 
-_CONVERSION(`const Glib::RefPtr<Container>&',`ClutterContainer*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`ClutterContainer*',`Glib::RefPtr<Container>',`Glib::wrap($3)')
-_CONVERSION(`ClutterContainer*',`Glib::RefPtr<const Container>',`Glib::wrap($3)')
-
-_CONVERSION(`const Glib::RefPtr<ChildMeta>&',`ClutterChildMeta*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`Glib::RefPtr<ChildMeta>',`ClutterChildMeta*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`ClutterChildMeta*',`Glib::RefPtr<ChildMeta>',`Glib::wrap($3)')
-_CONVERSION(`ClutterChildMeta*',`Glib::RefPtr<const ChildMeta>',`Glib::wrap($3)')
+_CONVERSION(`const Point&',`const ClutterPoint*',`($3).gobj()')
 
-_CONVERSION(`Color&',`ClutterColor*',`($3).gobj()')
-_CONVERSION(`const Color&',`const ClutterColor*',`($3).gobj()')
-_CONVERSION(`const Margin&',`const ClutterMargin*',`($3).gobj()')
+_CONVERSION(`const Glib::RefPtr<Shader>&',`ClutterShader*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`ClutterShader*',`Glib::RefPtr<Shader>', `Glib::wrap($3)')
+_CONVERSION(`ClutterShader*',`Glib::RefPtr<const Shader>', `Glib::wrap($3)')
 
 _CONVERSION(`ClutterStage*',`Glib::RefPtr<Stage>',`Glib::wrap($3)')
 
+_CONVERSION(`const Glib::RefPtr<Texture>&',`ClutterTexture*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`ClutterTexture*',`Glib::RefPtr<Texture>',`Glib::wrap($3)')
+
+_CONVERSION(`const Glib::RefPtr<Timeline>&',`ClutterTimeline*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`ClutterTimeline*',`Glib::RefPtr<Timeline>',`Glib::wrap($3)')
+_CONVERSION(`ClutterTimeline*',`Glib::RefPtr<const Timeline>',`Glib::wrap($3)')
+
+_EQUAL(ClutterUnit,Unit)
+_CONVERSION(`Unit&',`ClutterUnit*',`&($3)')
 _CONVERSION(`ClutterUnit&',`ClutterUnit*',`&($3)')
 _CONVERSION(`ClutterUnit*',`ClutterUnit&',`*($3)')
-_CONVERSION(`Knot&',`ClutterKnot*',`($3).gobj()')
-_CONVERSION(`const Knot&',`ClutterKnot*',`const_cast<ClutterKnot*>(($3).gobj())')
-_CONVERSION(`const Knot&',`const ClutterKnot*',`($3).gobj()')
-_CONVERSION(`ClutterKnot*',`const Knot&',`Knot($3)')
-_CONVERSION(`const ClutterKnot*',`const Knot&',`Knot($3)')
 
 _CONVERSION(`Vertex&',`ClutterVertex*',`($3).gobj()')
 _CONVERSION(`const Vertex&',`const ClutterVertex*',`($3).gobj()')
 _CONVERSION(`const ClutterVertex*',`const Vertex&',`Vertex($3)')
 
-_CONVERSION(`Padding&',`ClutterPadding*',`&($3)')
-_CONVERSION(`const Padding&',`const ClutterPadding*',`&($3)')
-_CONVERSION(`ClutterPadding*',`Padding&',`*($3)')
-
-_CONVERSION(`Geometry&',`Clutter::Geometry*',`($3).gobj()')
-_CONVERSION(`const Geometry&',`ClutterGeometry*',`const_cast<ClutterGeometry*>(($3).gobj())')
-_CONVERSION(`const Geometry&',`const ClutterGeometry*',`($3).gobj()')
-_CONVERSION(`ClutterGeometry*',`const Geometry&',`Geometry($3)')
-_CONVERSION(`const ClutterGeometry*',`const Geometry&',`Geometry($3)')
-
-_CONVERSION(`const Point&',`const ClutterPoint*',`($3).gobj()')
-
 _EQUAL(`guint8',`guchar')
 _EQUAL(`guint8*',`guchar*')
 _EQUAL(`const guint8*',`const guchar*')
@@ -124,8 +124,9 @@ _EQUAL(`float&',`gfloat')
 _CONVERSION(`float&', `gfloat*', `&($3)')
 _CONVERSION(`float&', `float*', `&($3)')
 
-_EQUAL(ClutterUnit,Unit)
-_CONVERSION(`Unit&',`ClutterUnit*',`&($3)')
+dnl ValueBase
+_CONVERSION(`Glib::ValueBase&',`GValue*',`($3).gobj()')
+_CONVERSION(`const Glib::ValueBase&',`const GValue*',`($3).gobj()')
 
 _EQUAL(ClutterAngle,Angle)
 _CONVERSION(`Angle&',`ClutterAngle*',`&($3)')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]