Warning cleanup.

(bzr r10655)

5 files changed, 12 insertions, 18 deletions

diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp
index 8b75f09a6..a12a3d560 100644
--- a/src/display/cairo-utils.cpp
+++ b/src/display/cairo-utils.cpp
@@ -350,8 +350,7 @@ ink_cairo_surface_create_for_argb32_pixbuf(GdkPixbuf *pb)
  * to gdk_pixbuf_new_from_data when creating a GdkPixbuf backed by
  * a Cairo surface.
  */
-void
-ink_cairo_pixbuf_cleanup(guchar *pixels, void *data)
+void ink_cairo_pixbuf_cleanup(guchar * /*pixels*/, void *data)
 {
     cairo_surface_t *surface = reinterpret_cast<cairo_surface_t*>(data);
     cairo_surface_destroy(surface);
diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp
index fa0402699..20a1eb795 100644
--- a/src/display/drawing-image.cpp
+++ b/src/display/drawing-image.cpp
@@ -112,8 +112,7 @@ DrawingImage::_updateItem(Geom::IntRect const &, UpdateContext const &, unsigned
     return STATE_ALL;
 }
 
-unsigned
-DrawingImage::_renderItem(DrawingContext &ct, Geom::IntRect const &area, unsigned flags, DrawingItem *stop_at)
+unsigned DrawingImage::_renderItem(DrawingContext &ct, Geom::IntRect const &/*area*/, unsigned /*flags*/, DrawingItem * /*stop_at*/)
 {
     bool outline = _drawing.outline();
 
diff --git a/src/display/drawing-item.h b/src/display/drawing-item.h
index 424616427..ca8b21336 100644
--- a/src/display/drawing-item.h
+++ b/src/display/drawing-item.h
@@ -133,12 +133,12 @@ protected:
     void _setStyleCommon(SPStyle *&_style, SPStyle *style);
     double _cacheScore();
     Geom::OptIntRect _cacheRect();
-    virtual unsigned _updateItem(Geom::IntRect const &area, UpdateContext const &ctx,
-                                 unsigned flags, unsigned reset) { return 0; }
-    virtual unsigned _renderItem(DrawingContext &ct, Geom::IntRect const &area, unsigned flags,
-                                 DrawingItem *stop_at) { return RENDER_OK; }
-    virtual void _clipItem(DrawingContext &ct, Geom::IntRect const &area) {}
-    virtual DrawingItem *_pickItem(Geom::Point const &p, double delta, unsigned flags) { return NULL; }
+    virtual unsigned _updateItem(Geom::IntRect const &/*area*/, UpdateContext const &/*ctx*/,
+                                 unsigned /*flags*/, unsigned /*reset*/) { return 0; }
+    virtual unsigned _renderItem(DrawingContext &/*ct*/, Geom::IntRect const &/*area*/, unsigned /*flags*/,
+                                 DrawingItem * /*stop_at*/) { return RENDER_OK; }
+    virtual void _clipItem(DrawingContext &/*ct*/, Geom::IntRect const &/*area*/) {}
+    virtual DrawingItem *_pickItem(Geom::Point const &/*p*/, double /*delta*/, unsigned /*flags*/) { return NULL; }
     virtual bool _canClip() { return false; }
 
     // member variables start here
diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp
index 6e28c0184..93a4846e0 100644
--- a/src/display/drawing-shape.cpp
+++ b/src/display/drawing-shape.cpp
@@ -205,8 +205,7 @@ DrawingShape::_renderItem(DrawingContext &ct, Geom::IntRect const &area, unsigne
     return RENDER_OK;
 }
 
-void
-DrawingShape::_clipItem(DrawingContext &ct, Geom::IntRect const &area)
+void DrawingShape::_clipItem(DrawingContext &ct, Geom::IntRect const & /*area*/)
 {
     if (!_curve) return;
 
diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp
index 23a7cfdfb..6dde9634e 100644
--- a/src/display/drawing-text.cpp
+++ b/src/display/drawing-text.cpp
@@ -50,8 +50,7 @@ DrawingGlyphs::setGlyph(font_instance *font, int glyph, Geom::Affine const &tran
     _markForUpdate(STATE_ALL, false);
 }
 
-unsigned
-DrawingGlyphs::_updateItem(Geom::IntRect const &area, UpdateContext const &ctx, unsigned flags, unsigned reset)
+unsigned DrawingGlyphs::_updateItem(Geom::IntRect const &/*area*/, UpdateContext const &ctx, unsigned /*flags*/, unsigned /*reset*/)
 {
     DrawingText *ggroup = dynamic_cast<DrawingText *>(_parent);
     if (!ggroup) throw InvalidItemException();
@@ -146,8 +145,7 @@ DrawingText::_updateItem(Geom::IntRect const &area, UpdateContext const &ctx, un
     return DrawingGroup::_updateItem(area, ctx, flags, reset);
 }
 
-unsigned
-DrawingText::_renderItem(DrawingContext &ct, Geom::IntRect const &area, unsigned flags, DrawingItem *stop_at)
+unsigned DrawingText::_renderItem(DrawingContext &ct, Geom::IntRect const &/*area*/, unsigned /*flags*/, DrawingItem * /*stop_at*/)
 {
     if (_drawing.outline()) {
         guint32 rgba = _drawing.outlinecolor;
@@ -201,8 +199,7 @@ DrawingText::_renderItem(DrawingContext &ct, Geom::IntRect const &area, unsigned
     return RENDER_OK;
 }
 
-void
-DrawingText::_clipItem(DrawingContext &ct, Geom::IntRect const &area)
+void DrawingText::_clipItem(DrawingContext &ct, Geom::IntRect const &/*area*/)
 {
     Inkscape::DrawingContext::Save save(ct);