[goocanvasmm] Fix warnings found by clang++.



commit 57075e1d718f7ace902eb2ac70de065860014653
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Mar 15 12:44:15 2012 +0100

    Fix warnings found by clang++.
    
    * examples/demo/primitives.cc: Use (void*) instead of NULL
    to avoid missing sentinel warnings.
    * goocanvas/src/canvas.ccg:
    * goocanvas/src/itemmodel.ccg:
    * goocanvas/src/points.ccg: Use 0 instead of NULL to avoid
    NULL generally.

 ChangeLog                   |   11 +++++++++++
 examples/demo/primitives.cc |   10 +++++-----
 goocanvas/src/canvas.ccg    |    4 ++--
 goocanvas/src/itemmodel.ccg |    4 ++--
 goocanvas/src/points.ccg    |    2 +-
 5 files changed, 21 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index daf7716..ea3f403 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-03-15  Murray Cumming  <murrayc murrayc com>
+
+	Fix warnings found by clang++.
+
+	* examples/demo/primitives.cc: Use (void*) instead of NULL
+	to avoid missing sentinel warnings.
+	* goocanvas/src/canvas.ccg:
+	* goocanvas/src/itemmodel.ccg:
+	* goocanvas/src/points.ccg: Use 0 instead of NULL to avoid
+	NULL generally.
+
 1.90.8:
 
 2011-10-27  Murray Cumming  <murrayc murrayc com>
diff --git a/examples/demo/primitives.cc b/examples/demo/primitives.cc
index 0dd0e34..d447acd 100644
--- a/examples/demo/primitives.cc
+++ b/examples/demo/primitives.cc
@@ -190,7 +190,7 @@ Primitives::_setup_rectangles()
   root->add_child(rect);
   //rect->property_fill_pattern() = _create_stipple("mediumseagreen");
   Cairo::RefPtr<Cairo::Pattern> p = _create_stipple("mediumseagreen");
-  g_object_set(rect->gobj(), "fill-pattern", p->cobj(), NULL);
+  g_object_set(rect->gobj(), "fill-pattern", p->cobj(), (void*)0);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   rect->property_stroke_color() = "black" ;
   rect->property_line_width() = 4.0 ;
@@ -283,7 +283,7 @@ Primitives::_setup_ellipses()
   root->add_child(ellipse);
   //ellipse->property_fill_pattern() = _create_stipple("cadetblue");
   Cairo::RefPtr<Cairo::Pattern> p = _create_stipple("cadetblue");
-  g_object_set(ellipse->gobj(), "fill-pattern", p->cobj(), NULL);
+  g_object_set(ellipse->gobj(), "fill-pattern", p->cobj(), (void*)0);
 
 #ifdef GLIBMM_PROPERTIES_ENABLED
   ellipse->property_stroke_color() = "black" ;
@@ -306,7 +306,7 @@ Primitives::_setup_texts()
 
   //ellipse->property_fill_pattern() = _create_stipple("blue");
   Cairo::RefPtr<Cairo::Pattern> p = _create_stipple("blue");
-  g_object_set(text->gobj(), "fill-pattern", p->cobj(), NULL);
+  g_object_set(text->gobj(), "fill-pattern", p->cobj(), (void*)0);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   text->property_font() = "Sans Bold 24" ;
   text->property_alignment() = Pango::ALIGN_CENTER ;
@@ -494,7 +494,7 @@ Primitives::_create_anchor(double x, double y)
   _canvas->get_root_item()->add_child(group);
   group->translate(x, y);
   //group->property_transform() = &m ;
-  g_object_set(group->gobj(), "transform", &m, NULL);
+  g_object_set(group->gobj(), "transform", &m, (void*)0);
 
   Glib::RefPtr<Goocanvas::Rect> rect = Goocanvas::Rect::create(-2.5, -2.5, 4, 4);
   group->add_child(rect);
@@ -534,7 +534,7 @@ Primitives::_create_flower(double x, double y, Goocanvas::AnchorType /* anchor *
   Glib::RefPtr<Goocanvas::Image> img = Goocanvas::Image::create(x, y);
    _canvas->get_root_item()->add_child(img);
   //TODO: img->property_pattern() = pattern ;
-  g_object_set(img->gobj(), "pattern", pattern->cobj(), NULL);
+  g_object_set(img->gobj(), "pattern", pattern->cobj(), (void*)0);
 #ifdef GLIBMM_PROPERTIES_ENABLED
   img->property_width() = w ;
   img->property_height() = h ;
diff --git a/goocanvas/src/canvas.ccg b/goocanvas/src/canvas.ccg
index 3d7b652..55c079d 100644
--- a/goocanvas/src/canvas.ccg
+++ b/goocanvas/src/canvas.ccg
@@ -23,12 +23,12 @@ namespace Goocanvas
 
 Gdk::GrabStatus Canvas::pointer_grab(const Glib::RefPtr<Item>& item, Gdk::EventMask mask, guint32 time)
 {
-  return (Gdk::GrabStatus)goo_canvas_pointer_grab(gobj(), Glib::unwrap(item), ((GdkEventMask)(mask)), NULL, time);
+  return (Gdk::GrabStatus)goo_canvas_pointer_grab(gobj(), Glib::unwrap(item), ((GdkEventMask)(mask)), 0, time);
 }
 
 void Canvas::render(const Cairo::RefPtr<Cairo::Context>& context, double scale)
 {
-  goo_canvas_render(gobj(), (context)->cobj(), NULL, scale);
+  goo_canvas_render(gobj(), (context)->cobj(), 0, scale);
 }
 
 void Canvas::get_bounds(Bounds& bounds) const
diff --git a/goocanvas/src/itemmodel.ccg b/goocanvas/src/itemmodel.ccg
index 9878936..8c1874b 100644
--- a/goocanvas/src/itemmodel.ccg
+++ b/goocanvas/src/itemmodel.ccg
@@ -24,12 +24,12 @@ namespace Goocanvas
 
 void ItemModel::raise()
 {
-  goo_canvas_item_model_raise(gobj(), NULL); 
+  goo_canvas_item_model_raise(gobj(), 0); 
 }
 
 void ItemModel::lower()
 {
-  goo_canvas_item_model_lower(gobj(), NULL); 
+  goo_canvas_item_model_lower(gobj(), 0); 
 }
 
 void ItemModel::add_child(const Glib::RefPtr<ItemModel>& child)
diff --git a/goocanvas/src/points.ccg b/goocanvas/src/points.ccg
index e53e557..b384d09 100644
--- a/goocanvas/src/points.ccg
+++ b/goocanvas/src/points.ccg
@@ -34,7 +34,7 @@ Points::Points(int num_points, const double* coords)
   :
    gobject_(goo_canvas_points_new(num_points)) 
 {
-  if( coords != NULL )
+  if( coords )
   {
     //I assume memcpy isn't portable enough.
     for( int i = 0 ; i < num_points*2 ; i++ )



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