Warning cleanup

(bzr r3962)

4 files changed, 26 insertions, 27 deletions

diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp
index bb636a91a..bb710a021 100644
--- a/src/display/canvas-arena.cpp
+++ b/src/display/canvas-arena.cpp
@@ -450,13 +450,13 @@ sp_canvas_arena_send_event (SPCanvasArena *arena, GdkEvent *event)
 }
 
 static void
-sp_canvas_arena_request_update (NRArena *arena, NRArenaItem *item, void *data)
+sp_canvas_arena_request_update (NRArena */*arena*/, NRArenaItem */*item*/, void *data)
 {
     sp_canvas_item_request_update (SP_CANVAS_ITEM (data));
 }
 
 static void
-sp_canvas_arena_request_render (NRArena *arena, NRRectL *area, void *data)
+sp_canvas_arena_request_render (NRArena */*arena*/, NRRectL *area, void *data)
 {
     sp_canvas_request_redraw (SP_CANVAS_ITEM (data)->canvas, area->x0, area->y0, area->x1, area->y1);
 }
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index beb5c088a..c00e2ea8f 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -396,7 +396,7 @@ CanvasAxonomGrid::readRepr()
  * Called when XML node attribute changed; updates dialog widgets if change was not done by widgets themselves.
  */
 void
-CanvasAxonomGrid::onReprAttrChanged(Inkscape::XML::Node *repr, gchar const *key, gchar const *oldval, gchar const *newval, bool is_interactive)
+CanvasAxonomGrid::onReprAttrChanged(Inkscape::XML::Node */*repr*/, gchar const */*key*/, gchar const */*oldval*/, gchar const */*newval*/, bool /*is_interactive*/)
 {
     readRepr();
 
@@ -453,7 +453,7 @@ CanvasAxonomGrid::updateWidgets()
 
 
 void
-CanvasAxonomGrid::Update (NR::Matrix const &affine, unsigned int flags)
+CanvasAxonomGrid::Update (NR::Matrix const &affine, unsigned int /*flags*/)
 {
     ow = origin * affine;
     sw = NR::Point(fabs(affine[0]),fabs(affine[3]));
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 846d3699a..e9eabad10 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -536,7 +536,6 @@ static void validateInt(gint oldVal,
 void
 CanvasXYGrid::readRepr()
 {
-    char buff[100];
     gchar const *value;
     if ( (value = repr->attribute("originx")) ) {
         sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &origin[NR::X], &gridunit);
@@ -599,7 +598,7 @@ CanvasXYGrid::readRepr()
  * Called when XML node attribute changed; updates dialog widgets if change was not done by widgets themselves.
  */
 void
-CanvasXYGrid::onReprAttrChanged(Inkscape::XML::Node *repr, gchar const *key, gchar const *oldval, gchar const *newval, bool is_interactive)
+CanvasXYGrid::onReprAttrChanged(Inkscape::XML::Node */*repr*/, gchar const */*key*/, gchar const */*oldval*/, gchar const */*newval*/, bool /*is_interactive*/)
 {
     readRepr();
 
@@ -655,7 +654,7 @@ CanvasXYGrid::updateWidgets()
 
 
 void
-CanvasXYGrid::Update (NR::Matrix const &affine, unsigned int flags)
+CanvasXYGrid::Update (NR::Matrix const &affine, unsigned int /*flags*/)
 {
     ow = origin * affine;
     sw = spacing * affine;
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index f3ffd7137..40e37c44f 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -69,43 +69,43 @@ class CanvasGrid {
 public:
     CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument *in_doc);
     virtual ~CanvasGrid();
-    
+
     static const char * getName(GridType type);
     static const char * getSVGName(GridType type);
     static GridType     getGridTypeFromSVGName(const char * typestr);
     static GridType     getGridTypeFromName(const char * typestr);
-    
+
     static CanvasGrid* NewGrid(SPNamedView * nv, Inkscape::XML::Node * repr, SPDocument *doc, GridType gridtype);
     static void writeNewGridToRepr(Inkscape::XML::Node * repr, SPDocument * doc, GridType gridtype);
 
     GridCanvasItem * createCanvasItem(SPDesktop * desktop);
-    
+
     virtual void Update (NR::Matrix const &affine, unsigned int flags) = 0;
     virtual void Render (SPCanvasBuf *buf) = 0;
-    
+
     virtual void readRepr() {};
-    virtual void onReprAttrChanged (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive) {};
-    
+    virtual void onReprAttrChanged (Inkscape::XML::Node * /*repr*/, const gchar */*key*/, const gchar */*oldval*/, const gchar */*newval*/, bool /*is_interactive*/) {};
+
     virtual Gtk::Widget & getWidget() = 0;
 
     Inkscape::XML::Node * repr;
     SPDocument *doc;
-    
+
     Inkscape::Snapper* snapper;
 
     static void on_repr_attr_changed (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive, void * data);
-    
+
 protected:
     GSList * canvasitems;  // list of created canvasitems
 
     SPNamedView * namedview;
-    
+
     Gtk::VBox vbox;
 
 private:
     CanvasGrid(const CanvasGrid&);
     CanvasGrid& operator=(const CanvasGrid&);
- 
+
 };
 
 
@@ -116,10 +116,10 @@ public:
 
     void Update (NR::Matrix const &affine, unsigned int flags);
     void Render (SPCanvasBuf *buf);
-    
+
     void readRepr();
     void onReprAttrChanged (Inkscape::XML::Node * repr, const gchar *key, const gchar *oldval, const gchar *newval, bool is_interactive);
-    
+
     Gtk::Widget & getWidget();
 
     NR::Point origin;
@@ -137,19 +137,19 @@ public:
 private:
     CanvasXYGrid(const CanvasXYGrid&);
     CanvasXYGrid& operator=(const CanvasXYGrid&);
-    
+
     void updateWidgets();
 
     Gtk::Table table;
-    
+
     Inkscape::UI::Widget::RegisteredUnitMenu    _rumg, _rums;
     Inkscape::UI::Widget::RegisteredScalarUnit  _rsu_ox, _rsu_oy, _rsu_sx, _rsu_sy;
     Inkscape::UI::Widget::RegisteredColorPicker _rcp_gcol, _rcp_gmcol;
     Inkscape::UI::Widget::RegisteredSuffixedInteger _rsi;
     Inkscape::UI::Widget::RegisteredCheckButton _rcb_dotted;
-    
-    Inkscape::UI::Widget::Registry _wr; 
-        
+
+    Inkscape::UI::Widget::Registry _wr;
+
     bool render_dotted;
 };
 
@@ -160,11 +160,11 @@ class CanvasXYGridSnapper : public LineSnapper
 public:
     CanvasXYGridSnapper(CanvasXYGrid *grid, SPNamedView const *nv, NR::Coord const d);
 
-private:    
+private:
     LineList _getSnapLines(NR::Point const &p) const;
-    
+
     CanvasXYGrid *grid;
-}; 
+};
 
 }; /* namespace Inkscape */