[libchamplainmm] tools: Move Clutter conversions to specific file



commit 27c3382aedf2548222f43e14194bdd00c33de73f
Author: Juan R. GarcĂ­a Blanco <juanrgar gmail com>
Date:   Tue Jun 10 20:04:01 2014 +0200

    tools: Move Clutter conversions to specific file

 tools/m4/convert_clutter.m4      |   13 +++++++++++++
 tools/m4/convert_libchamplain.m4 |    8 --------
 2 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/tools/m4/convert_clutter.m4 b/tools/m4/convert_clutter.m4
index 8a2d70a..260352f 100644
--- a/tools/m4/convert_clutter.m4
+++ b/tools/m4/convert_clutter.m4
@@ -1,3 +1,16 @@
+# Actor
+_CONVERSION(`ClutterActor*',`Glib::RefPtr<const Clutter::Actor>',`Glib::wrap($3)')
+_CONVERSION(`ClutterActor*',`Glib::RefPtr<Clutter::Actor>',`Glib::wrap($3)')
+_CONVERSION(`const Glib::RefPtr<Clutter::Actor>&',`ClutterActor*',__CONVERT_REFPTR_TO_P)
+
+# Color
+_CONVERSION(`ClutterColor*', `Clutter::Color', `Clutter::Color($3, true)')
+_CONVERSION(`const Clutter::Color&',`const ClutterColor*',__FR2P)
+
+# Content
 _CONVERSION(`const Glib::RefPtr<Clutter::Content>&',`ClutterContent*',__CONVERT_REFPTR_TO_P)
 _CONVERSION(`ClutterContent*',`Glib::RefPtr<Clutter::Content>',`Glib::wrap($3)')
 _CONVERSION(`ClutterContent*',`Glib::RefPtr<const Clutter::Content>',`Glib::wrap($3)')
+
+# Event
+_CONVERSION(`Clutter::Event&',`ClutterEvent*',`&$3')
diff --git a/tools/m4/convert_libchamplain.m4 b/tools/m4/convert_libchamplain.m4
index 8e67fe6..adab7b1 100644
--- a/tools/m4/convert_libchamplain.m4
+++ b/tools/m4/convert_libchamplain.m4
@@ -8,14 +8,6 @@ _CONV_ENUM(Champlain,SelectionMode)
 _CONV_ENUM(Champlain,State)
 _CONV_ENUM(Pango,EllipsizeMode)
 
-# Clutter
-_CONVERSION(`ClutterActor*',`Glib::RefPtr<const Clutter::Actor>',`Glib::wrap($3)')
-_CONVERSION(`ClutterActor*',`Glib::RefPtr<Clutter::Actor>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Clutter::Actor>&',`ClutterActor*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`ClutterColor*', `Clutter::Color', `Clutter::Color($3, true)')
-_CONVERSION(`const Clutter::Color&',`const ClutterColor*',__FR2P)
-_CONVERSION(`Clutter::Event&',`ClutterEvent*',`&$3')
-
 # Glib
 _CONVERSION(`const GTimeVal*',`Glib::TimeVal',`$2(*$3)')
 _CONVERSION(`const Glib::TimeVal&', `const GTimeVal*', static_cast<$2>(&$3))


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