[cluttermm] Actor: Remove extra whitespace in templated types using Constraint.



commit 13a7c068c4e846552d02b8c1110f5ac21c2bfbff
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Apr 4 08:52:37 2014 +0200

    Actor: Remove extra whitespace in templated types using Constraint.

 clutter/src/actor.hg          |   12 +++++++-----
 codegen/m4/convert_clutter.m4 |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/clutter/src/actor.hg b/clutter/src/actor.hg
index c7148e2..b86e68b 100644
--- a/clutter/src/actor.hg
+++ b/clutter/src/actor.hg
@@ -447,12 +447,12 @@ _DEPRECATE_IFDEF_END
 
   // Clutter docs: Use g_list_free() when done.
   #m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<Clutter::Constraint> >',`Glib::ListHandler< 
Glib::RefPtr<Clutter::Constraint> >::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
-  _WRAP_METHOD( std::vector< Glib::RefPtr<Clutter::Constraint> > get_constraints(), 
clutter_actor_get_constraints )
-  #m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr< const Clutter::Constraint > >',`Glib::ListHandler< 
Glib::RefPtr< const Clutter::Constraint > >::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
-  _WRAP_METHOD( std::vector< Glib::RefPtr< const Clutter::Constraint > > get_constraints() const, 
clutter_actor_get_constraints)
+  _WRAP_METHOD(std::vector< Glib::RefPtr<Clutter::Constraint> > get_constraints(), 
clutter_actor_get_constraints )
+  #m4 _CONVERSION(`GList*',`std::vector< Glib::RefPtr<const Clutter::Constraint> >',`Glib::ListHandler< 
Glib::RefPtr<const Clutter::Constraint> >::list_to_vector($3, Glib::OWNERSHIP_SHALLOW)')
+  _WRAP_METHOD(std::vector< Glib::RefPtr<const Clutter::Constraint> > get_constraints() const, 
clutter_actor_get_constraints)
 
   _WRAP_METHOD(Glib::RefPtr<const Constraint> get_constraint(const Glib::ustring& name) const, 
clutter_actor_get_constraint, refreturn, constversion)
-  _WRAP_METHOD(Glib::RefPtr< Constraint > get_constraint(const Glib::ustring& name), 
clutter_actor_get_constraint, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<Constraint> get_constraint(const Glib::ustring& name), 
clutter_actor_get_constraint, refreturn)
   _WRAP_METHOD(void clear_constraints(), clutter_actor_clear_constraints)
 
 // signals
@@ -491,8 +491,10 @@ _DEPRECATE_IFDEF_END
   _WRAP_PROPERTY("anchor-gravity", Gravity)
   _WRAP_PROPERTY("clip", Geometry)
   _WRAP_PROPERTY("clip-to-allocation", bool)
-  // This property is not wrapped: documented in Clutter as adding a Constraint when set.
+
+  // This property is not wrapped because it is documented in Clutter as adding, instead of just setting, a 
Constraint.
   //_WRAP_PROPERTY("constraints", Glib::RefPtr<Constraint>)
+
   _WRAP_PROPERTY("depth", float)
   _WRAP_PROPERTY("fixed-position-set", bool)
   _WRAP_PROPERTY("fixed-x", float)
diff --git a/codegen/m4/convert_clutter.m4 b/codegen/m4/convert_clutter.m4
index 71997e1..3025e6f 100644
--- a/codegen/m4/convert_clutter.m4
+++ b/codegen/m4/convert_clutter.m4
@@ -45,7 +45,7 @@ _CONVERSION(`const Color&',`ClutterColor*',`($3).gobj()')
 _CONVERSION(`const Color&',`const ClutterColor*',`($3).gobj()')
 
 _CONVERSION(`ClutterConstraint*',`Glib::RefPtr<const Constraint>',`Glib::wrap($3)')
-_CONVERSION(`ClutterConstraint*',`Glib::RefPtr< Constraint >',`Glib::wrap($3)')
+_CONVERSION(`ClutterConstraint*',`Glib::RefPtr<Constraint>',`Glib::wrap($3)')
 _CONVERSION(`const Glib::RefPtr<Constraint>&',`ClutterConstraint*',__CONVERT_REFPTR_TO_P)
 
 _CONVERSION(`const Glib::RefPtr<Container>&',`ClutterContainer*',__CONVERT_REFPTR_TO_P)


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