GNOME.org
 

[cluttermm/cluttermm-1.2] Replaced use of unsigned int with guint.

commit 048521d7659b3323ab8c12f606865c1bd867dbb1
Author: Chris Kühl <chrisk openismus com>
Date:   Thu Jan 20 00:20:13 2011 +0100

    Replaced use of unsigned int with guint.
    
    *clutter/src/actor.[cc|h]g:
    *clutter/src/box-layout.hg:
    *clutter/src/path.hg:
    *clutter/src/rectangle.hg:
    *clutter/src/text.hg:
    *clutter/src/types.[cc|h]g:

 ChangeLog                 |   11 +++++++++++
 clutter/src/actor.ccg     |    2 +-
 clutter/src/actor.hg      |    2 +-
 clutter/src/box-layout.hg |    4 ++--
 clutter/src/path.hg       |   20 ++++++++++----------
 clutter/src/rectangle.hg  |    2 +-
 clutter/src/text.hg       |    8 ++++----
 clutter/src/types.ccg     |    8 ++++----
 clutter/src/types.hg      |   12 ++++++------
 9 files changed, 40 insertions(+), 29 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ec26610..c69b29b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-20  Chris Kühl  <chrisk openismus com>
+
+	Replaced use of unsigned int with guint.
+
+	*clutter/src/actor.[cc|h]g:
+	*clutter/src/box-layout.hg:
+	*clutter/src/path.hg:
+	*clutter/src/rectangle.hg:
+	*clutter/src/text.hg:
+	*clutter/src/types.[cc|h]g:
+
 2011-01-19  Chris Kühl  <chrisk openismus com>
 
 	Cleaned up include files in LayoutManager.
diff --git a/clutter/src/actor.ccg b/clutter/src/actor.ccg
index ec0c766..8ff6ac6 100644
--- a/clutter/src/actor.ccg
+++ b/clutter/src/actor.ccg
@@ -100,7 +100,7 @@ Geometry Actor::get_allocation_geometry() const
 }
 
 Glib::RefPtr<Animation>
-Actor::animate(gulong mode, unsigned int duration, const std::map<std::string, Glib::ValueBase>& properties)
+Actor::animate(gulong mode, guint duration, const std::map<std::string, Glib::ValueBase>& properties)
 {
   gchar* c_properties[properties.size()];
   GValue values[properties.size()];
diff --git a/clutter/src/actor.hg b/clutter/src/actor.hg
index e79ec34..5150c6d 100644
--- a/clutter/src/actor.hg
+++ b/clutter/src/actor.hg
@@ -250,7 +250,7 @@ public:
   _IGNORE(clutter_actor_animatev, clutter_actor_animate_with_timelinev, clutter_actor_animate_with_alphav)
 
   //TODO: Documentation.
-  Glib::RefPtr<Animation> animate(gulong mode, unsigned int duration, const std::map<std::string, Glib::ValueBase>& properties);
+  Glib::RefPtr<Animation> animate(gulong mode, guint duration, const std::map<std::string, Glib::ValueBase>& properties);
   Glib::RefPtr<Animation> animate(gulong mode, const Glib::RefPtr<Timeline>& timeline, const std::map<std::string, Glib::ValueBase>& properties);
   Glib::RefPtr<Animation> animate(const Glib::RefPtr<Alpha>& alpha, const std::map<std::string, Glib::ValueBase>& properties);
 
diff --git a/clutter/src/box-layout.hg b/clutter/src/box-layout.hg
index 487cb9a..31f9b14 100644
--- a/clutter/src/box-layout.hg
+++ b/clutter/src/box-layout.hg
@@ -63,11 +63,11 @@ public:
   _WRAP_METHOD(void set_easing_mode(gulong mode), clutter_box_layout_set_easing_mode)
   _WRAP_METHOD(gulong get_easing_mode() const, clutter_box_layout_get_easing_mode)
 
-  _WRAP_PROPERTY("easing-duration", unsigned int)
+  _WRAP_PROPERTY("easing-duration", guint)
   _WRAP_PROPERTY("easing-mode", unsigned long)
   // 1.4 _WRAP_PROPERTY("homogeneous", bool)
   _WRAP_PROPERTY("pack-start", bool)
-  _WRAP_PROPERTY("spacing", unsigned int)
+  _WRAP_PROPERTY("spacing", guint)
   _WRAP_PROPERTY("use-animations", bool)
   _WRAP_PROPERTY("vertical", bool)
 };
diff --git a/clutter/src/path.hg b/clutter/src/path.hg
index 8dda3ba..3418a6c 100644
--- a/clutter/src/path.hg
+++ b/clutter/src/path.hg
@@ -42,7 +42,7 @@ class PathNode
 {
   _CLASS_BOXEDTYPE_STATIC(PathNode, ClutterPathNode)
 public:
-  typedef unsigned int  size_type;
+  typedef guint  size_type;
   typedef int           difference_type;
 
   typedef Knot          value_type;
@@ -128,16 +128,16 @@ public:
 
   typedef void (* ClutterPathCallback) (const ClutterPathNode *node,
                                       gpointer               data);
-                     
+
   /** For instance,
    * void on_path_foreach(const Clutter::PathNode& node);
-   */                 
+   */
   typedef sigc::slot<void, PathNode> ForEachSlot;
-  
+
   //TODO: Documentation.
   void foreach(const ForEachSlot& slot);
   _IGNORE(clutter_path_foreach)
-                                                
+
   _WRAP_METHOD(Glib::ustring get_description() const, clutter_path_get_description)
   _WRAP_METHOD(void set_description(const Glib::ustring& str), clutter_path_set_description)
 
@@ -164,7 +164,7 @@ private:
   Nodes& operator=(const Path::Nodes&);
 
 public:
-  typedef unsigned int      size_type;
+  typedef guint      size_type;
   typedef int               difference_type;
   typedef PathNode          value_type;
   typedef const value_type  const_reference;
@@ -180,9 +180,9 @@ public:
     friend class Path::Nodes::const_iterator;
 
     ClutterPath* path_;
-    unsigned int index_;
+    guint index_;
 
-    inline reference(ClutterPath* path, unsigned int index)
+    inline reference(ClutterPath* path, guint index)
       : path_ (path), index_ (index) {}
 
     // disallow the address-of operator
@@ -209,7 +209,7 @@ public:
 
     inline const_iterator() : ref_ (0, 0) {}
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-    inline const_iterator(ClutterPath* path, unsigned int index)
+    inline const_iterator(ClutterPath* path, guint index)
       : ref_ (path, index) {}
 
     inline bool equal(const const_iterator& b) const
@@ -231,7 +231,7 @@ public:
 
     inline iterator() {}
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
-    inline iterator(ClutterPath* path, unsigned int index)
+    inline iterator(ClutterPath* path, guint index)
       : const_iterator(path, index) {}
 #endif
     inline reference operator*() const { return ref_; }
diff --git a/clutter/src/rectangle.hg b/clutter/src/rectangle.hg
index c7c3499..7f16311 100644
--- a/clutter/src/rectangle.hg
+++ b/clutter/src/rectangle.hg
@@ -52,7 +52,7 @@ public:
   _WRAP_METHOD(void set_border_width(guint width), clutter_rectangle_set_border_width)
 
   _WRAP_PROPERTY("border-color", Color)
-  _WRAP_PROPERTY("border-width", unsigned int)
+  _WRAP_PROPERTY("border-width", guint)
   _WRAP_PROPERTY("color", Color)
   _WRAP_PROPERTY("has-border", bool)
 };
diff --git a/clutter/src/text.hg b/clutter/src/text.hg
index 2ea5afd..28e936d 100644
--- a/clutter/src/text.hg
+++ b/clutter/src/text.hg
@@ -18,7 +18,7 @@
 #include <cluttermm/actor.h>
 #include <cluttermm/color.h>
 #include <pangomm.h>
- 
+
 _DEFS(cluttermm,clutter)
 _PINCLUDE(cluttermm/private/actor_p.h)
 
@@ -65,7 +65,7 @@ public:
   _WRAP_METHOD(void set_font_description(const Pango::FontDescription& font_desc), clutter_text_set_font_description)
 #m4 _CONVERSION(`PangoFontDescription*',`Pango::FontDescription',`Pango::FontDescription(($3))')
   _WRAP_METHOD(Pango::FontDescription get_font_description() const, clutter_text_get_font_description)
-  
+
   _WRAP_METHOD(void set_password_char(gunichar wc), clutter_text_set_password_char)
   _WRAP_METHOD(gunichar get_password_char() const, clutter_text_get_password_char)
 
@@ -129,7 +129,7 @@ public:
   _WRAP_METHOD(bool get_cursor_visible() const, clutter_text_get_cursor_visible)
 
   _WRAP_METHOD(void set_cursor_size(int size), clutter_text_set_cursor_size)
-  _WRAP_METHOD(unsigned int get_cursor_size() const, clutter_text_get_cursor_size)
+  _WRAP_METHOD(guint get_cursor_size() const, clutter_text_get_cursor_size)
 
   _WRAP_METHOD(bool activate(), clutter_text_activate)
 
@@ -144,7 +144,7 @@ public:
   //These are action signals, so probably shouldn't be wrapped:
   //_WRAP_SIGNAL(void insert_text(const char* new_text, int new_text_length, int position), "insert-text", no_default_handler)
   //_WRAP_SIGNAL(void delete_text(int start_pos, int end_pos), "insert-text", no_default_handler)
-  
+
   _WRAP_PROPERTY("activatable", bool)
   _WRAP_PROPERTY("attributes", Pango::AttrList)
   _WRAP_PROPERTY("color", Color)
diff --git a/clutter/src/types.ccg b/clutter/src/types.ccg
index ac869b1..a3cca94 100644
--- a/clutter/src/types.ccg
+++ b/clutter/src/types.ccg
@@ -55,7 +55,7 @@ Vertex::Vertex(float x, float y, float z)
   gobject_.z = z;
 }
 
-Geometry::Geometry(int x, int y, unsigned int width, unsigned int height)
+Geometry::Geometry(int x, int y, guint width, guint height)
 {
   gobject_.x = x;
   gobject_.y = y;
@@ -79,17 +79,17 @@ void Geometry::set_xy(int x, int y)
   gobject_.y = y;
 }
 
-void Geometry::set_width(unsigned int width)
+void Geometry::set_width(guint width)
 {
   gobject_.width = width;
 }
 
-void Geometry::set_height(unsigned int height)
+void Geometry::set_height(guint height)
 {
   gobject_.height = height;
 }
 
-void Geometry::set_size(unsigned int width, unsigned int height)
+void Geometry::set_size(guint width, guint height)
 {
   gobject_.width  = width;
   gobject_.height = height;
diff --git a/clutter/src/types.hg b/clutter/src/types.hg
index b498d7c..63b4a48 100644
--- a/clutter/src/types.hg
+++ b/clutter/src/types.hg
@@ -65,7 +65,7 @@ class Geometry
 {
   _CLASS_BOXEDTYPE_STATIC(Geometry, ClutterGeometry)
 public:
-  Geometry(int x, int y, unsigned int width = 0, unsigned int height = 0);
+  Geometry(int x, int y, guint width = 0, guint height = 0);
 
   _MEMBER_GET(x, x, int, gint)
   void set_x(int x);
@@ -73,11 +73,11 @@ public:
   void set_y(int y);
   void set_xy(int x, int y);
 
-  _MEMBER_GET(width, width, unsigned int, guint)
-  void set_width(unsigned int width);
-  _MEMBER_GET(height, height, unsigned int, guint)
-  void set_height(unsigned int height);
-  void set_size(unsigned int width, unsigned int height);
+  _MEMBER_GET(width, width, guint, guint)
+  void set_width(guint width);
+  _MEMBER_GET(height, height, guint, guint)
+  void set_height(guint height);
+  void set_size(guint width, guint height);
 };
 
 class Knot
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]