[cluttermm] Removed use of NULL and changed use of uint to guint.



commit 48e830612a41fb457fcd3b2895aea0867ada284e
Author: Chris Kühl <chrisk openismus com>
Date:   Mon Sep 13 12:14:47 2010 +0200

    Removed use of NULL and changed use of uint to guint.
    
    	* clutter/src/behaviour.ccg: Removed use of NULL and
    	changed uint to guint.
    	* clutter/src/container.ccg: Removed use of NULL and
    	changed uint to guint.
    	* clutter/src/score.ccg: Removed use of NULL and
    	changed uint to guint.
    	* clutter/src/script.ccg: Removed use of NULL and
    	changed uint to guint.

 clutter/src/behaviour.ccg |    8 ++++----
 clutter/src/container.ccg |    8 ++++----
 clutter/src/score.ccg     |    8 ++++----
 clutter/src/script.ccg    |    8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/clutter/src/behaviour.ccg b/clutter/src/behaviour.ccg
index 14c7540..81f2417 100644
--- a/clutter/src/behaviour.ccg
+++ b/clutter/src/behaviour.ccg
@@ -50,11 +50,11 @@ std::vector<Glib::RefPtr<Actor> > Behaviour::get_actors()
 {
   GSList* actorList = clutter_behaviour_get_actors(gobj());
 
-  const uint actorCount = g_slist_length(actorList);
+  const guint actorCount = g_slist_length(actorList);
   std::vector<Glib::RefPtr<Actor> > actorVec;
   actorVec.reserve(actorCount);
 
-  for(GSList* actorNode = actorList; actorNode->next != NULL; actorNode = actorList->next)
+  for(GSList* actorNode = actorList; actorNode->next; actorNode = actorList->next)
   {
     actorVec.push_back(Glib::wrap(static_cast<ClutterActor*>(actorNode->data), true));
   }
@@ -66,11 +66,11 @@ std::vector<Glib::RefPtr<const Actor> > Behaviour::get_actors() const
 {
   GSList* actorList = clutter_behaviour_get_actors(const_cast<ClutterBehaviour*>(gobj()));
 
-  const uint actorCount = g_slist_length(actorList);
+  const guint actorCount = g_slist_length(actorList);
   std::vector<Glib::RefPtr<const Actor> > actorVec;
   actorVec.reserve(actorCount);
 
-  for(GSList* actorNode = actorList; actorNode->next != NULL; actorNode = actorList->next)
+  for(GSList* actorNode = actorList; actorNode->next; actorNode = actorList->next)
   {
     actorVec.push_back(Glib::wrap(static_cast<ClutterActor*>(actorNode->data), true));
   }
diff --git a/clutter/src/container.ccg b/clutter/src/container.ccg
index c33b02c..485017d 100644
--- a/clutter/src/container.ccg
+++ b/clutter/src/container.ccg
@@ -82,11 +82,11 @@ void Container::actor_removed(const Glib::RefPtr<Actor>& actor)
 std::vector<Glib::RefPtr<Actor> > Container::get_children()
 {
   GList* actorList = clutter_container_get_children(gobj());
-  const uint actorCount = g_list_length(actorList);
+  const guint actorCount = g_list_length(actorList);
   std::vector<Glib::RefPtr<Actor> > actorVec;
   actorVec.reserve(actorCount);
 
-  for(GList* actorNode = actorList; actorNode->next != NULL; actorNode = actorList->next)
+  for(GList* actorNode = actorList; actorNode->next; actorNode = actorList->next)
   {
     actorVec.push_back(Glib::wrap(static_cast<ClutterActor*>(actorNode->data), true));
   }
@@ -97,11 +97,11 @@ std::vector<Glib::RefPtr<Actor> > Container::get_children()
 std::vector<Glib::RefPtr<const Actor> > Container::get_children() const
 {
   GList* actorList = clutter_container_get_children(const_cast<ClutterContainer*>(gobj()));
-  const uint actorCount = g_list_length(actorList);
+  const guint actorCount = g_list_length(actorList);
   std::vector<Glib::RefPtr<const Actor> > actorVec;
   actorVec.reserve(actorCount);
 
-  for(GList* actorNode = actorList; actorNode->next != NULL; actorNode = actorList->next)
+  for(GList* actorNode = actorList; actorNode->next; actorNode = actorList->next)
   {
     actorVec.push_back(Glib::wrap(static_cast<ClutterActor*>(actorNode->data), true));
   }
diff --git a/clutter/src/score.ccg b/clutter/src/score.ccg
index f05a5b1..dd8cd94 100644
--- a/clutter/src/score.ccg
+++ b/clutter/src/score.ccg
@@ -28,11 +28,11 @@ gulong Score::append(const Glib::RefPtr<Timeline>& timeline)
 std::vector<Glib::RefPtr<Timeline> > Score::list_timelines()
 {
   GSList* timelineList = clutter_score_list_timelines(gobj());
-  const uint timelineCount = g_slist_length(timelineList);
+  const guint timelineCount = g_slist_length(timelineList);
   std::vector<Glib::RefPtr<Timeline> > timelineVec;
   timelineVec.reserve(timelineCount);
 
-  for(GSList* timelineNode = timelineList; timelineNode->next != NULL; timelineNode = timelineList->next)
+  for(GSList* timelineNode = timelineList; timelineNode->next; timelineNode = timelineList->next)
   {
     timelineVec.push_back(Glib::wrap(static_cast<ClutterTimeline*>(timelineNode->data), true));
   }
@@ -43,11 +43,11 @@ std::vector<Glib::RefPtr<Timeline> > Score::list_timelines()
     std::vector<Glib::RefPtr<const Timeline> > Score::list_timelines() const
 {
   GSList* timelineList = clutter_score_list_timelines(const_cast<ClutterScore*>(gobj()));
-  const uint timelineCount = g_slist_length(timelineList);
+  const guint timelineCount = g_slist_length(timelineList);
   std::vector<Glib::RefPtr<const Timeline> > timelineVec;
   timelineVec.reserve(timelineCount);
 
-  for(GSList* timelineNode = timelineList; timelineNode->next != NULL; timelineNode = timelineList->next)
+  for(GSList* timelineNode = timelineList; timelineNode->next; timelineNode = timelineList->next)
   {
     timelineVec.push_back(Glib::wrap(static_cast<ClutterTimeline*>(timelineNode->data), true));
   }
diff --git a/clutter/src/script.ccg b/clutter/src/script.ccg
index 85482b9..08e0a6b 100644
--- a/clutter/src/script.ccg
+++ b/clutter/src/script.ccg
@@ -56,11 +56,11 @@ std::vector<Glib::RefPtr<Glib::Object> > Script::list_objects()
 {
   GList* objectList = clutter_script_list_objects(gobj());
 
-  const uint objectCount = g_list_length(objectList);
+  const guint objectCount = g_list_length(objectList);
   std::vector<Glib::RefPtr<Glib::Object> > objectVec;
   objectVec.reserve(objectCount);
 
-  for(GList* objectNode = objectList; objectNode->next != NULL; objectNode = objectList->next)
+  for(GList* objectNode = objectList; objectNode->next; objectNode = objectList->next)
   {
     objectVec.push_back(Glib::wrap(static_cast<GObject*>(objectNode->data), true));
   }
@@ -72,11 +72,11 @@ std::vector<Glib::RefPtr<const Glib::Object> > Script::list_objects() const
 {
   GList* objectList = clutter_script_list_objects(const_cast<ClutterScript*>(gobj()));
 
-  const uint objectCount = g_list_length(objectList);
+  const guint objectCount = g_list_length(objectList);
   std::vector<Glib::RefPtr<const Glib::Object> > objectVec;
   objectVec.reserve(objectCount);
 
-  for(GList* objectNode = objectList; objectNode->next != NULL; objectNode = objectList->next)
+  for(GList* objectNode = objectList; objectNode->next; objectNode = objectList->next)
   {
     objectVec.push_back(Glib::wrap(static_cast<GObject*>(objectNode->data), true));
   }



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