From 1ef13096f6644defa9463a0a3fe7dbbcbc7271f7 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Sun, 28 Oct 2012 10:25:29 +0000
Subject: cppcheck: More C-style pointer casting

(bzr r11844)
---
 src/display/nr-filter-image.cpp    |  2 ++
 src/display/nr-filter-skeleton.cpp |  3 ++-
 src/display/sodipodi-ctrl.cpp      |  8 ++++----
 src/display/sodipodi-ctrlrect.cpp  | 11 +++++------
 4 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index e03a56964..bc18cbcc6 100644
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -99,8 +99,10 @@ void FilterImage::render_cairo(FilterSlot &slot)
         Geom::Rect area = *optarea;
         Geom::Affine user2pb = slot.get_units().get_matrix_user2pb();
 
+        /* FIXME: These variables are currently unused.  Why were they calculated?
         double scaleX = feImageWidth / area.width();
         double scaleY = feImageHeight / area.height();
+        */
 
         Geom::Rect sa = slot.get_slot_area();
         cairo_surface_t *out = cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
diff --git a/src/display/nr-filter-skeleton.cpp b/src/display/nr-filter-skeleton.cpp
index 0c455a818..86ab8141e 100644
--- a/src/display/nr-filter-skeleton.cpp
+++ b/src/display/nr-filter-skeleton.cpp
@@ -42,7 +42,8 @@ FilterSkeleton::~FilterSkeleton()
 void FilterSkeleton::render_cairo(FilterSlot &slot) {
     cairo_surface_t *in = slot.getcairo(_input);
     cairo_surface_t *out = ink_cairo_surface_create_identical(in);
-    cairo_t *ct = cairo_create(out);
+
+//    cairo_t *ct = cairo_create(out);
 
 //    cairo_set_source_surface(ct, in, offset[X], offset[Y]);
 //    cairo_paint(ct);
diff --git a/src/display/sodipodi-ctrl.cpp b/src/display/sodipodi-ctrl.cpp
index e21bdff15..45dc38a37 100644
--- a/src/display/sodipodi-ctrl.cpp
+++ b/src/display/sodipodi-ctrl.cpp
@@ -63,10 +63,10 @@ sp_ctrl_get_type (void)
 static void
 sp_ctrl_class_init (SPCtrlClass *klass)
 {
-    SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass;
+    SPCanvasItemClass *item_class = SP_CANVAS_ITEM_CLASS(klass);
     GObjectClass *g_object_class = (GObjectClass *) klass;
 
-    parent_class = (SPCanvasItemClass *)g_type_class_peek_parent (klass);
+    parent_class = SP_CANVAS_ITEM_CLASS(g_type_class_peek_parent (klass));
 
     g_object_class->set_property = sp_ctrl_set_property;
     g_object_class->get_property = sp_ctrl_get_property;
@@ -287,8 +287,8 @@ sp_ctrl_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int fla
 
     ctrl = SP_CTRL (item);
 
-    if (((SPCanvasItemClass *) parent_class)->update)
-        (* ((SPCanvasItemClass *) parent_class)->update) (item, affine, flags);
+    if ((SP_CANVAS_ITEM_CLASS(parent_class))->update)
+        (* (SP_CANVAS_ITEM_CLASS(parent_class))->update) (item, affine, flags);
 
     sp_canvas_item_reset_bounds (item);
 
diff --git a/src/display/sodipodi-ctrlrect.cpp b/src/display/sodipodi-ctrlrect.cpp
index b0c997a92..c350e4614 100644
--- a/src/display/sodipodi-ctrlrect.cpp
+++ b/src/display/sodipodi-ctrlrect.cpp
@@ -61,9 +61,9 @@ GType sp_ctrlrect_get_type()
 
 static void sp_ctrlrect_class_init(SPCtrlRectClass *c)
 {
-    SPCanvasItemClass *item_class = (SPCanvasItemClass *) c;
+    SPCanvasItemClass *item_class = SP_CANVAS_ITEM_CLASS(c);
 
-    parent_class = (SPCanvasItemClass*) g_type_class_peek_parent(c);
+    parent_class = SP_CANVAS_ITEM_CLASS(g_type_class_peek_parent(c));
 
     item_class->destroy = sp_ctrlrect_destroy;
     item_class->update = sp_ctrlrect_update;
@@ -119,8 +119,6 @@ void CtrlRect::render(SPCanvasBuf *buf)
     using Geom::X;
     using Geom::Y;
 
-    static double const dashes[2] = {4.0, 4.0};
-
     if (!_area) {
         return;
     }
@@ -129,6 +127,7 @@ void CtrlRect::render(SPCanvasBuf *buf)
                                  area[X].max() + _shadow_size, area[Y].max() + _shadow_size);
     if ( area_w_shadow.intersects(buf->rect) )
     {
+        static double const dashes[2] = {4.0, 4.0};
         cairo_save(buf->ct);
         cairo_translate(buf->ct, -buf->rect.left(), -buf->rect.top());
         cairo_set_line_width(buf->ct, 1);
@@ -161,8 +160,8 @@ void CtrlRect::update(Geom::Affine const &affine, unsigned int flags)
     using Geom::X;
     using Geom::Y;
 
-    if (((SPCanvasItemClass *) parent_class)->update) {
-        ((SPCanvasItemClass *) parent_class)->update(this, affine, flags);
+    if ((SP_CANVAS_ITEM_CLASS(parent_class))->update) {
+        (SP_CANVAS_ITEM_CLASS(parent_class))->update(this, affine, flags);
     }
 
     sp_canvas_item_reset_bounds(this);
-- 
cgit v1.2.3