[cluttermm] Move vfunc-only _CONVERSION()s to the .hg files that use them.



commit f98ff4ba7243990e4f6ff6f822d8e3f8d1f5b4dc
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Mar 27 10:11:30 2014 +0100

    Move vfunc-only _CONVERSION()s to the .hg files that use them.
    
    This avoids us using these by mistake where we should not.

 clutter/src/container.hg      |    2 ++
 clutter/src/layout-manager.hg |    1 +
 codegen/m4/convert_clutter.m4 |    2 --
 3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/clutter/src/container.hg b/clutter/src/container.hg
index 8e5a239..b2a97c8 100644
--- a/clutter/src/container.hg
+++ b/clutter/src/container.hg
@@ -139,6 +139,8 @@ protected:
 
   _WRAP_VFUNC(void create_child_meta(const Glib::RefPtr<Actor>& actor), create_child_meta)
   _WRAP_VFUNC(void destroy_child_meta(const Glib::RefPtr<Actor>& actor), destroy_child_meta)
+
+#m4 _CONVERSION(`Glib::RefPtr<ChildMeta>',`ClutterChildMeta*',__CONVERT_REFPTR_TO_P)
   _WRAP_VFUNC(Glib::RefPtr<ChildMeta> get_child_meta(const Glib::RefPtr<Actor>& actor), get_child_meta)
 };
 
diff --git a/clutter/src/layout-manager.hg b/clutter/src/layout-manager.hg
index 43c3c64..980c145 100644
--- a/clutter/src/layout-manager.hg
+++ b/clutter/src/layout-manager.hg
@@ -89,6 +89,7 @@ public:
   _WRAP_VFUNC(void set_container(const Glib::RefPtr<Container>& container), "set_container")
   _WRAP_VFUNC(GType get_child_meta_type() const, "get_child_meta_type")
 
+#m4 _CONVERSION(`Glib::RefPtr<LayoutMeta>',`ClutterLayoutMeta*',__CONVERT_REFPTR_TO_P)
   _WRAP_VFUNC(Glib::RefPtr<LayoutMeta> create_child_meta(const Glib::RefPtr<Container>& container, const 
Glib::RefPtr<Actor>& actor), "create_child_meta")
 
   _WRAP_VFUNC(Glib::RefPtr<Alpha> begin_animation(guint duration, gulong mode), "begin_animation")
diff --git a/codegen/m4/convert_clutter.m4 b/codegen/m4/convert_clutter.m4
index 3aee15a..402735d 100644
--- a/codegen/m4/convert_clutter.m4
+++ b/codegen/m4/convert_clutter.m4
@@ -38,7 +38,6 @@ _CONVERSION(`const Glib::RefPtr<Backend>&',`ClutterBackend*',__CONVERT_REFPTR_TO
 _CONVERSION(`ClutterBackend*',`Glib::RefPtr<Backend>',`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)')
 
@@ -88,7 +87,6 @@ _CONVERSION(`ClutterLayoutManager*',`Glib::RefPtr<LayoutManager>',`Glib::wrap($3
 _CONVERSION(`ClutterLayoutManager*',`Glib::RefPtr<const LayoutManager>',`Glib::wrap($3)')
 
 _CONVERSION(`const Glib::RefPtr<LayoutMeta>&',`ClutterLayoutMeta*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`Glib::RefPtr<LayoutMeta>',`ClutterLayoutMeta*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`ClutterLayoutMeta*',`Glib::RefPtr<LayoutMeta>',`Glib::wrap($3)')
 _CONVERSION(`ClutterLayoutMeta*',`Glib::RefPtr<const LayoutMeta>',`Glib::wrap($3)')
 


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