Warning cleanup

(bzr r4052)

4 files changed, 34 insertions, 35 deletions

diff --git a/src/display/gnome-canvas-acetate.cpp b/src/display/gnome-canvas-acetate.cpp
index 1a58c4b19..b4fa5523a 100644
--- a/src/display/gnome-canvas-acetate.cpp
+++ b/src/display/gnome-canvas-acetate.cpp
@@ -62,9 +62,9 @@ sp_canvas_acetate_class_init (SPCanvasAcetateClass *klass)
 }
 
 static void
-sp_canvas_acetate_init (SPCanvasAcetate *acetate)
+sp_canvas_acetate_init (SPCanvasAcetate */*acetate*/)
 {
-	/* Nothing here */
+    /* Nothing here */
 }
 
 static void
@@ -82,19 +82,19 @@ sp_canvas_acetate_destroy (GtkObject *object)
 }
 
 static void
-sp_canvas_acetate_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags)
+sp_canvas_acetate_update( SPCanvasItem *item, NR::Matrix const &/*affine*/, unsigned int /*flags*/ )
 {
-	item->x1 = -G_MAXINT;
-	item->y1 = -G_MAXINT;
-	item->x2 = G_MAXINT;
-	item->y2 = G_MAXINT;
+    item->x1 = -G_MAXINT;
+    item->y1 = -G_MAXINT;
+    item->x2 = G_MAXINT;
+    item->y2 = G_MAXINT;
 }
 
 static double
-sp_canvas_acetate_point (SPCanvasItem *item, NR::Point p, SPCanvasItem **actual_item)
+sp_canvas_acetate_point( SPCanvasItem *item, NR::Point /*p*/, SPCanvasItem **actual_item )
 {
-	*actual_item = item;
+    *actual_item = item;
 
-	return 0.0;
+    return 0.0;
 }
 
diff --git a/src/display/nr-3dutils.cpp b/src/display/nr-3dutils.cpp
index c8171ccd2..fa1f21d9a 100644
--- a/src/display/nr-3dutils.cpp
+++ b/src/display/nr-3dutils.cpp
@@ -1,6 +1,6 @@
 /*
  * 3D utils.
- * 
+ *
  * Authors:
  *   Jean-Rene Reinhard <jr@komite.net>
  *
@@ -24,7 +24,7 @@ namespace NR {
 
 #define START(v) ((v)==BEGIN? 1 : 0)
 #define FINISH(v) ((v)==END? 1 : 2)
-    
+
 signed char K_X[3][3][3][3] = {
     //K_X[TOP]
     {
@@ -34,12 +34,12 @@ signed char K_X[3][3][3][3] = {
             { 0, -2,  2},
             { 0, -1,  1}
         },
-        { 
+        {
             { 0,  0,  0},
             {-2,  0,  2},
             {-1,  0,  1}
-        },   
-        { 
+        },
+        {
             { 0,  0,  0},
             {-2,  2,  0},
             {-1,  1,  0}
@@ -53,12 +53,12 @@ signed char K_X[3][3][3][3] = {
             { 0, -2,  2},
             { 0, -1,  1}
         },
-        { 
+        {
             {-1,  0,  1},
             {-2,  0,  2},
             {-1,  0,  1}
-        },   
-        { 
+        },
+        {
             {-1,  1,  0},
             {-2,  2,  0},
             {-1,  1,  0}
@@ -72,12 +72,12 @@ signed char K_X[3][3][3][3] = {
             { 0, -2,  2},
             { 0,  0,  0}
         },
-        { 
+        {
             {-1,  0,  1},
             {-2,  0,  2},
             { 0,  0,  0}
-        },   
-        { 
+        },
+        {
             {-1,  1,  0},
             {-2,  2,  0},
             { 0,  0,  0}
@@ -104,7 +104,7 @@ int get_carac(int i, int len, int delta) {
     else
         return MIDDLE;
 }
-    
+
 //assumes in is RGBA
 //should be made more resistant
 void compute_surface_normal(Fvector &N, gdouble ss, NRPixBlock *in, int i, int j, int dx, int dy) {
@@ -132,7 +132,7 @@ void compute_surface_normal(Fvector &N, gdouble ss, NRPixBlock *in, int i, int j
     }
     N[X_3D] = -1 * ss * FACTOR_X[y_carac][x_carac] * accu_x / dx;
     N[Y_3D] = -1 * ss * FACTOR_X[x_carac][y_carac] * accu_y / dy;
-    N[Z_3D] = 1; 
+    N[Z_3D] = 1;
     normalize_vector(N);
     //std::cout << "(" << N[X_3D] << ", " << N[Y_3D] << ", " << N[Z_3D] << ")" << std::endl;
 }
@@ -146,17 +146,16 @@ void convert_coord(gdouble &x, gdouble &y, gdouble &z, Matrix const &trans) {
 }
 
 gdouble norm(const Fvector &v) {
-    return sqrt(v[X_3D]*v[X_3D] + v[Y_3D]*v[Y_3D] + v[Z_3D]*v[Z_3D]); 
+    return sqrt(v[X_3D]*v[X_3D] + v[Y_3D]*v[Y_3D] + v[Z_3D]*v[Z_3D]);
 }
 
 void normalize_vector(Fvector &v) {
-    int i, j;
     gdouble nv = norm(v);
     //TODO test nv == 0
-    for (j = 0; j < 3; j++) {
+    for (int j = 0; j < 3; j++) {
         v[j] /= nv;
     }
-} 
+}
 
 gdouble scalar_product(const Fvector &a, const Fvector &b) {
     return  a[X_3D] * b[X_3D] +
diff --git a/src/display/nr-arena-glyphs.cpp b/src/display/nr-arena-glyphs.cpp
index bba6f00c8..f734c0a59 100644
--- a/src/display/nr-arena-glyphs.cpp
+++ b/src/display/nr-arena-glyphs.cpp
@@ -122,7 +122,7 @@ nr_arena_glyphs_finalize(NRObject *object)
 }
 
 static guint
-nr_arena_glyphs_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state, guint reset)
+nr_arena_glyphs_update(NRArenaItem *item, NRRectL */*area*/, NRGC *gc, guint /*state*/, guint /*reset*/)
 {
     NRArenaGlyphs *glyphs;
     raster_font *rfont;
@@ -217,7 +217,7 @@ nr_arena_glyphs_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint state,
 }
 
 static guint
-nr_arena_glyphs_clip(NRArenaItem *item, NRRectL *area, NRPixBlock *pb)
+nr_arena_glyphs_clip(NRArenaItem *item, NRRectL */*area*/, NRPixBlock */*pb*/)
 {
     NRArenaGlyphs *glyphs;
 
@@ -231,7 +231,7 @@ nr_arena_glyphs_clip(NRArenaItem *item, NRRectL *area, NRPixBlock *pb)
 }
 
 static NRArenaItem *
-nr_arena_glyphs_pick(NRArenaItem *item, NR::Point p, gdouble delta, unsigned int sticky)
+nr_arena_glyphs_pick(NRArenaItem *item, NR::Point p, gdouble /*delta*/, unsigned int /*sticky*/)
 {
     NRArenaGlyphs *glyphs;
 
@@ -249,7 +249,7 @@ nr_arena_glyphs_pick(NRArenaItem *item, NR::Point p, gdouble delta, unsigned int
 }
 
 void
-nr_arena_glyphs_set_path(NRArenaGlyphs *glyphs, SPCurve *curve, unsigned int lieutenant, font_instance *font, gint glyph, NRMatrix const *transform)
+nr_arena_glyphs_set_path(NRArenaGlyphs *glyphs, SPCurve */*curve*/, unsigned int /*lieutenant*/, font_instance *font, gint glyph, NRMatrix const *transform)
 {
     nr_return_if_fail(glyphs != NULL);
     nr_return_if_fail(NR_IS_ARENA_GLYPHS(glyphs));
@@ -432,7 +432,7 @@ nr_arena_glyphs_group_update(NRArenaItem *item, NRRectL *area, NRGC *gc, guint s
 
 
 static unsigned int
-nr_arena_glyphs_group_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned int flags)
+nr_arena_glyphs_group_render(cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned int /*flags*/)
 {
     NRArenaItem *child;
 
diff --git a/src/display/nr-arena-image.cpp b/src/display/nr-arena-image.cpp
index debd9bd0e..c0c53f0ee 100644
--- a/src/display/nr-arena-image.cpp
+++ b/src/display/nr-arena-image.cpp
@@ -109,7 +109,7 @@ nr_arena_image_finalize (NRObject *object)
 }
 
 static unsigned int
-nr_arena_image_update (NRArenaItem *item, NRRectL *area, NRGC *gc, unsigned int state, unsigned int reset)
+nr_arena_image_update( NRArenaItem *item, NRRectL */*area*/, NRGC *gc, unsigned int /*state*/, unsigned int /*reset*/ )
 {
     NRMatrix grid2px;
 
@@ -175,7 +175,7 @@ nr_arena_image_update (NRArenaItem *item, NRRectL *area, NRGC *gc, unsigned int
 #define b2i (image->grid2px)
 
 static unsigned int
-nr_arena_image_render (cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned int flags)
+nr_arena_image_render( cairo_t *ct, NRArenaItem *item, NRRectL */*area*/, NRPixBlock *pb, unsigned int /*flags*/ )
 {
     nr_arena_image_x_sample = prefs_get_int_attribute ("options.bitmapoversample", "value", 1);
     nr_arena_image_y_sample = nr_arena_image_x_sample;
@@ -288,7 +288,7 @@ distance_to_segment (NR::Point p, NR::Point a1, NR::Point a2)
 }
 
 static NRArenaItem *
-nr_arena_image_pick (NRArenaItem *item, NR::Point p, double delta, unsigned int sticky)
+nr_arena_image_pick( NRArenaItem *item, NR::Point p, double delta, unsigned int /*sticky*/ )
 {
     NRArenaImage *image = NR_ARENA_IMAGE (item);