GNOME.org
 

[cluttermm/cluttermm-1.2] Removed unnecessary C headers in .hg files.

commit 26eee072c573ca9909a1c469e778c2577f59db20
Author: Chris Kühl <chrisk openismus com>
Date:   Thu Jan 20 01:10:24 2011 +0100

    Removed unnecessary C headers in .hg files.
    
    *clutter/src/actor-meta.hg:
    *clutter/src/actor.hg:
    *clutter/src/alpha.hg:
    *clutter/src/animation.hg:
    *clutter/src/container.hg:
    *clutter/src/interval.hg:
    *clutter/src/media.ccg:
    *clutter/src/path.[h|cc]g:
    *clutter/src/score.hg:
    *clutter/src/script.hg:
    *clutter/src/scriptable.[h|cc]g:
    *clutter/src/shader.[h|cc]g:
    *clutter/src/stage.hg:
    *clutter/src/texture.hg:

 ChangeLog                  |   19 ++++++++++++++++
 clutter/src/actor-meta.hg  |   52 ++++++++++++++++++++++++++++++++++++++++++++
 clutter/src/actor.hg       |    1 -
 clutter/src/alpha.hg       |    1 -
 clutter/src/animation.hg   |   15 ++++++------
 clutter/src/container.hg   |    7 ++---
 clutter/src/interval.hg    |    3 +-
 clutter/src/media.ccg      |    2 +
 clutter/src/path.ccg       |    4 ++-
 clutter/src/path.hg        |    2 +-
 clutter/src/score.hg       |    1 -
 clutter/src/script.hg      |    1 -
 clutter/src/scriptable.ccg |    1 -
 clutter/src/scriptable.hg  |    3 +-
 clutter/src/shader.ccg     |    6 +++-
 clutter/src/shader.hg      |    4 +-
 clutter/src/stage.hg       |    1 -
 clutter/src/texture.hg     |    4 ++-
 18 files changed, 98 insertions(+), 29 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c69b29b..87d9a61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,24 @@
 2011-01-20  Chris Kühl  <chrisk openismus com>
 
+	Removed unnecessary C headers in .hg files.
+
+	*clutter/src/actor-meta.hg:
+	*clutter/src/actor.hg:
+	*clutter/src/alpha.hg:
+	*clutter/src/animation.hg:
+	*clutter/src/container.hg:
+	*clutter/src/interval.hg:
+	*clutter/src/media.ccg:
+	*clutter/src/path.[h|cc]g:
+	*clutter/src/score.hg:
+	*clutter/src/script.hg:
+	*clutter/src/scriptable.[h|cc]g:
+	*clutter/src/shader.[h|cc]g:
+	*clutter/src/stage.hg:
+	*clutter/src/texture.hg:
+
+2011-01-20  Chris Kühl  <chrisk openismus com>
+
 	Replaced use of unsigned int with guint.
 
 	*clutter/src/actor.[cc|h]g:
diff --git a/clutter/src/actor-meta.hg b/clutter/src/actor-meta.hg
new file mode 100644
index 0000000..97a3796
--- /dev/null
+++ b/clutter/src/actor-meta.hg
@@ -0,0 +1,52 @@
+/* Copyright (C) 2010 The cluttermm Development Team
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free
+ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <glibmm/object.h>
+
+_DEFS(cluttermm,clutter)
+_PINCLUDE(glibmm/private/object_p.h)
+
+namespace Clutter
+{
+
+class Actor;
+
+//TODO: Write a version of the large description from here: http://clutter-project.org/docs/clutter/stable/ClutterActorMeta.html#ClutterActorMetaMeta.description
+class ActorMeta : public Glib::Object
+{
+  _CLASS_GOBJECT(ActorMeta, ClutterActorMeta, CLUTTER_ACTOR_META, Glib::Object, GObject)
+  _DERIVES_INITIALLY_UNOWNED()
+
+protected:
+  _CTOR_DEFAULT()
+
+public:
+  //There is no create() because this is an abstract base class.
+  //_WRAP_CREATE()
+
+  _WRAP_METHOD(void set_name(const Glib::ustring& name), clutter_actor_meta_set_name)
+  _WRAP_METHOD(Glib::ustring get_name() const, clutter_actor_meta_get_name)
+  _WRAP_METHOD(void set_enabled(bool is_enabled = true), clutter_actor_meta_set_enabled)
+  _WRAP_METHOD(bool get_enabled() const, clutter_actor_meta_get_enabled)
+
+  _WRAP_METHOD(Glib::RefPtr<Actor> get_actor(), clutter_actor_meta_get_actor, refreturn)
+  _WRAP_METHOD(Glib::RefPtr<const Actor> get_actor() const, clutter_actor_meta_get_actor, refreturn, constversion)
+
+  //TODO: Signals, properties, vfuncs
+};
+
+} // namespace Clutter
diff --git a/clutter/src/actor.hg b/clutter/src/actor.hg
index 5150c6d..21fe3f3 100644
--- a/clutter/src/actor.hg
+++ b/clutter/src/actor.hg
@@ -23,7 +23,6 @@
 #include <cluttermm/scriptable.h>
 #include <cluttermm/shader.h>
 #include <cluttermm/types.h> // For Event*
-#include <clutter/clutter.h> // For ClutterActorBox
 
 _DEFS(cluttermm,clutter)
 _PINCLUDE(glibmm/private/object_p.h)
diff --git a/clutter/src/alpha.hg b/clutter/src/alpha.hg
index bb3eba1..d1b291e 100644
--- a/clutter/src/alpha.hg
+++ b/clutter/src/alpha.hg
@@ -17,7 +17,6 @@
 
 #include <glibmm/object.h>
 #include <cluttermm/timeline.h>
-#include <clutter/clutter.h>
 
 _DEFS(cluttermm,clutter)
 _PINCLUDE(glibmm/private/object_p.h)
diff --git a/clutter/src/animation.hg b/clutter/src/animation.hg
index 7e38924..1ea8aaf 100644
--- a/clutter/src/animation.hg
+++ b/clutter/src/animation.hg
@@ -20,8 +20,7 @@
 #include <cluttermm/actor.h>
 #include <cluttermm/interval.h>
 #include <cluttermm/timeline.h>
-#include <clutter/clutter.h>
- 
+
 _DEFS(cluttermm,clutter)
 _PINCLUDE(glibmm/private/object_p.h)
 
@@ -47,7 +46,7 @@ public:
 
   _WRAP_METHOD(void set_duration(guint msecs), clutter_animation_set_duration)
   _WRAP_METHOD(guint get_duration() const, clutter_animation_get_duration)
-  
+
   _WRAP_METHOD(void set_loop(bool loop=true), clutter_animation_set_loop)
   _WRAP_METHOD(bool get_loop() const, clutter_animation_get_loop)
   _WRAP_METHOD(void set_timeline(const Glib::RefPtr<Timeline>& timeline), clutter_animation_set_timeline)
@@ -57,27 +56,27 @@ public:
   _WRAP_METHOD(void completed(), clutter_animation_completed)
   _WRAP_METHOD(Glib::RefPtr<Animation> bind(const std::string& property_name, const Glib::ValueBase& final), clutter_animation_bind)
    //TODO: Add templated bind().
-   
+
   _WRAP_METHOD(void bind_interval(const std::string& property_name, const Glib::RefPtr<Interval>& interval), clutter_animation_bind_interval)
   _WRAP_METHOD(void update_interval(const std::string& property_name, const Glib::RefPtr<Interval>& interval), clutter_animation_update_interval)
   _WRAP_METHOD(bool has_property(const std::string& property_name) const, clutter_animation_has_property)
-  
+
   _WRAP_METHOD(Glib::RefPtr<Animation> update(const std::string& property_name, const Glib::ValueBase& final), clutter_animation_update)
   //TODO: Add templated update().
-  
+
   _WRAP_METHOD(void unbind_property(const std::string& property_name), clutter_animation_unbind_property)
   _WRAP_METHOD(Glib::RefPtr<Interval> get_interval(const std::string& property_name) const, clutter_animation_get_interval)
 
   _WRAP_SIGNAL(void started(), "started")
   _WRAP_SIGNAL(void completed(), "completed")
-  
+
   _WRAP_PROPERTY("object", Glib::RefPtr<Glib::Object>)
   _WRAP_PROPERTY("mode", gulong)
   _WRAP_PROPERTY("duration", guint)
   _WRAP_PROPERTY("loop", bool)
   _WRAP_PROPERTY("timeline", Glib::RefPtr<Timeline>)
   _WRAP_PROPERTY("alpha", Glib::RefPtr<Alpha>)
-                               
+
 };
 
 } // namespace Clutter
diff --git a/clutter/src/container.hg b/clutter/src/container.hg
index 5a095f8..8c94317 100644
--- a/clutter/src/container.hg
+++ b/clutter/src/container.hg
@@ -19,8 +19,7 @@
 #include <cluttermm/childmeta.h>
 #include <glibmm/interface.h>
 #include <glibmm/ustring.h>
-#include <clutter/clutter.h>
- 
+
 _DEFS(cluttermm,clutter)
 _PINCLUDE(glibmm/private/interface_p.h)
 
@@ -46,7 +45,7 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Actor> find_child(const Glib::ustring& child_name), clutter_container_find_child_by_name, refreturn)
   _WRAP_METHOD(Glib::RefPtr<const Actor> find_child(const Glib::ustring& child_name) const, clutter_container_find_child_by_name, constversion)
 
-  /** For instance, 
+  /** For instance,
    * void on_foreach(const Glib::RefPtr<Actor>& actor)
    */
   typedef sigc::slot<void, const Glib::RefPtr<Actor>&> SlotForEach;
@@ -59,7 +58,7 @@ public:
           clutter_container_remove, clutter_container_child_get, clutter_container_child_set,
           clutter_container_class_find_child_property, clutter_container_class_list_child_properties)
 
- 
+
   template <class PropertyType> inline
   void set_child_property(const Glib::RefPtr<Actor>& child, const Glib::ustring& property_name, const PropertyType& value);
 
diff --git a/clutter/src/interval.hg b/clutter/src/interval.hg
index 2f811fd..ba552aa 100644
--- a/clutter/src/interval.hg
+++ b/clutter/src/interval.hg
@@ -16,8 +16,7 @@
  */
 
 #include <glibmm/object.h>
-#include <clutter/clutter.h>
- 
+
 _DEFS(cluttermm,clutter)
 _PINCLUDE(glibmm/private/object_p.h)
 
diff --git a/clutter/src/media.ccg b/clutter/src/media.ccg
index f771aa2..d53eef8 100644
--- a/clutter/src/media.ccg
+++ b/clutter/src/media.ccg
@@ -15,6 +15,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <clutter/clutter.h>
+
 namespace Clutter
 {
 
diff --git a/clutter/src/path.ccg b/clutter/src/path.ccg
index b6a075d..5ba36c7 100644
--- a/clutter/src/path.ccg
+++ b/clutter/src/path.ccg
@@ -18,6 +18,8 @@
 
 #include <cstring>
 
+#include <clutter/clutter.h>
+
 namespace
 {
 
@@ -128,5 +130,5 @@ void Path::foreach(const ForEachSlot& slot)
   const void* data = &slot;
   clutter_path_foreach(gobj(), &c_foreach_callback, const_cast<void*>(data));
 }
-  
+
 } // namespace Clutter
diff --git a/clutter/src/path.hg b/clutter/src/path.hg
index 3418a6c..595035f 100644
--- a/clutter/src/path.hg
+++ b/clutter/src/path.hg
@@ -21,7 +21,7 @@ _DEFS(cluttermm,clutter)
 #include <cluttermm/types.h>
 #include <glibmm/object.h>
 #include <cairomm/context.h>
-#include <clutter/clutter.h>
+
 _PINCLUDE(glibmm/private/object_p.h)
 
 namespace Clutter
diff --git a/clutter/src/score.hg b/clutter/src/score.hg
index e32f11b..2eca738 100644
--- a/clutter/src/score.hg
+++ b/clutter/src/score.hg
@@ -17,7 +17,6 @@
 
 #include <glibmm/object.h>
 #include <cluttermm/timeline.h>
-#include <clutter/clutter.h>
 
 _DEFS(cluttermm,clutter)
 _PINCLUDE(glibmm/private/object_p.h)
diff --git a/clutter/src/script.hg b/clutter/src/script.hg
index 0ecbe96..57e7780 100644
--- a/clutter/src/script.hg
+++ b/clutter/src/script.hg
@@ -17,7 +17,6 @@
 
 #include <glibmm/object.h>
 #include <cluttermm/timeline.h>
-#include <clutter/clutter.h>
 
 _DEFS(cluttermm,clutter)
 _PINCLUDE(glibmm/private/object_p.h)
diff --git a/clutter/src/scriptable.ccg b/clutter/src/scriptable.ccg
index ab4e6b8..683e026 100644
--- a/clutter/src/scriptable.ccg
+++ b/clutter/src/scriptable.ccg
@@ -17,7 +17,6 @@
 
 #include <clutter/clutter.h>
 
-
 namespace Clutter
 {
 } //namespace Clutter
diff --git a/clutter/src/scriptable.hg b/clutter/src/scriptable.hg
index d199568..b92f9ef 100644
--- a/clutter/src/scriptable.hg
+++ b/clutter/src/scriptable.hg
@@ -18,8 +18,7 @@
 #include <glibmm/interface.h>
 #include <glibmm/ustring.h>
 #include <cluttermm/script.h>
-#include <clutter/clutter.h>
- 
+
 _DEFS(cluttermm,clutter)
 _PINCLUDE(glibmm/private/interface_p.h)
 
diff --git a/clutter/src/shader.ccg b/clutter/src/shader.ccg
index 0963757..0ab70eb 100644
--- a/clutter/src/shader.ccg
+++ b/clutter/src/shader.ccg
@@ -15,17 +15,19 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <clutter/clutter.h>
+
 namespace Clutter
 {
 
 void Shader::set_vertex_source(const std::string& source_code)
 {
-  clutter_shader_set_vertex_source(gobj(), source_code.c_str(), source_code.size()); 
+  clutter_shader_set_vertex_source(gobj(), source_code.c_str(), source_code.size());
 }
 
 void Shader::set_fragment_source(const std::string& source_code)
 {
-  clutter_shader_set_fragment_source(gobj(), source_code.c_str(), source_code.size()); 
+  clutter_shader_set_fragment_source(gobj(), source_code.c_str(), source_code.size());
 }
 
 } //namespace Clutter
diff --git a/clutter/src/shader.hg b/clutter/src/shader.hg
index 72dbcd9..7478c3e 100644
--- a/clutter/src/shader.hg
+++ b/clutter/src/shader.hg
@@ -16,8 +16,8 @@
  */
 
 #include <glibmm/object.h>
-#include <clutter/clutter.h>
- 
+#include <cogl/cogl.h>
+
 _DEFS(cluttermm,clutter)
 _PINCLUDE(glibmm/private/object_p.h)
 
diff --git a/clutter/src/stage.hg b/clutter/src/stage.hg
index 938b959..61cefe3 100644
--- a/clutter/src/stage.hg
+++ b/clutter/src/stage.hg
@@ -17,7 +17,6 @@
 
 #include <cluttermm/group.h>
 #include <cluttermm/color.h>
-#include <clutter/clutter.h> // For ClutterPerspective
 
 _DEFS(cluttermm,clutter)
 _PINCLUDE(cluttermm/private/group_p.h)
diff --git a/clutter/src/texture.hg b/clutter/src/texture.hg
index 6c0050d..0afe74d 100644
--- a/clutter/src/texture.hg
+++ b/clutter/src/texture.hg
@@ -17,7 +17,6 @@
 
 #include <cluttermm/actor.h>
 #include <cluttermm/types.h>
-#include <clutter/clutter.h> // For CoglHandle
 
 _DEFS(cluttermm,clutter)
 _PINCLUDE(cluttermm/private/actor_p.h)
@@ -92,6 +91,9 @@ public:
   _WRAP_METHOD(bool get_load_data_async() const, clutter_texture_get_load_data_async)
   _WRAP_METHOD(void set_load_data_async(bool load_async=true), clutter_texture_set_load_data_async)
 
+  _WRAP_METHOD(void set_pick_with_alpha(bool pick_with_alpha = true), clutter_texture_set_pick_with_alpha)
+  _WRAP_METHOD(bool get_pick_with_alpha() const, clutter_texture_get_pick_with_alpha)
+
   // TODO: figure out what to do with this GError parameter
   //_WRAP_SIGNAL(void load_finished(GError* error), "load_finished")
   _WRAP_SIGNAL(void size_change(int width, int height), "size_change")
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]