Warning cleanup.

(bzr r11144)

8 files changed, 21 insertions, 22 deletions

diff --git a/src/ui/context-menu.cpp b/src/ui/context-menu.cpp
index d8d495b1e..672ac440d 100644
--- a/src/ui/context-menu.cpp
+++ b/src/ui/context-menu.cpp
@@ -267,10 +267,9 @@ static void sp_item_select_this(GtkMenuItem *menuitem, SPItem *item)
     sp_desktop_selection(desktop)->set(item);
 }
 
-static void sp_item_select_same_fill_stroke(GtkMenuItem *menuitem, SPItem *item)
+static void sp_item_select_same_fill_stroke(GtkMenuItem *menuitem, SPItem * /*item*/)
 {
-    SPDesktop *desktop;
-    desktop = (SPDesktop*)g_object_get_data(G_OBJECT(menuitem), "desktop");
+    SPDesktop *desktop = static_cast<SPDesktop*>(g_object_get_data(G_OBJECT(menuitem), "desktop"));
     g_return_if_fail(desktop != NULL);
 
     sp_select_same_fill_stroke(desktop, true, true);
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 150abd66b..3068a2de7 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -428,7 +428,7 @@ void Export::set_default_filename () {
  * @param  sensitive  Whether the spin button is sensitive or not
  * @param  cb   Callback for when this spin button is changed (optional)
  */
-Gtk::Adjustment * Export::createSpinbutton( gchar const *key, float val, float min, float max,
+Gtk::Adjustment * Export::createSpinbutton( gchar const * /*key*/, float val, float min, float max,
                                       float step, float page, GtkWidget *us,
                                       GtkWidget *t, int x, int y,
                                       const gchar *ll, const gchar *lr,
@@ -606,7 +606,7 @@ void Export::onSelectionChanged()
     updateCheckbuttons ();
 }
 
-void Export::onSelectioModified ( guint flags )
+void Export::onSelectioModified ( guint /*flags*/ )
 {
     switch (current_key) {
         case SELECTION_DRAWING:
@@ -784,7 +784,7 @@ void Export::onAreaToggled ()
 
 /// Called when dialog is deleted
 
-gint Export::onProgressDelete ( GtkWidget *widget, GdkEvent *event, GObject *base )
+gint Export::onProgressDelete ( GtkWidget * /*widget*/, GdkEvent * /*event*/, GObject *base )
 {
     g_object_set_data (base, "cancel", (gpointer) 1);
     return TRUE;
@@ -792,7 +792,7 @@ gint Export::onProgressDelete ( GtkWidget *widget, GdkEvent *event, GObject *bas
 
 
 /// Called when progress is cancelled
-void Export::onProgressCancel ( GtkWidget *widget, GObject *base )
+void Export::onProgressCancel ( GtkWidget * /*widget*/, GObject *base )
 {
     g_object_set_data (base, "cancel", (gpointer) 1);
 } // end of sp_export_progress_cancel()
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index f5745e02b..5fd6e18d8 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -436,7 +436,7 @@ Find::item_style_match (SPItem *item, const gchar *text, bool exact, bool casema
     return found;
 }
 
-bool Find::item_attr_match(SPItem *item, const gchar *text, bool exact, bool casematch, bool replace/*=false*/)
+bool Find::item_attr_match(SPItem *item, const gchar *text, bool exact, bool /*casematch*/, bool replace/*=false*/)
 {
     bool found = false;
 
@@ -492,7 +492,7 @@ bool Find::item_attrvalue_match(SPItem *item, const gchar *text, bool exact, boo
 }
 
 
-bool Find::item_font_match(SPItem *item, const gchar *text, bool exact, bool casematch, bool replace/*=false*/)
+bool Find::item_font_match(SPItem *item, const gchar *text, bool exact, bool casematch, bool /*replace*/ /*=false*/)
 {
     bool ret = false;
 
diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h
index 5d4ac43ad..9e471b7b5 100644
--- a/src/ui/dialog/ocaldialogs.h
+++ b/src/ui/dialog/ocaldialogs.h
@@ -59,7 +59,7 @@ public:
     /**
      * Constructor
      */
-    FileDialogBase(const Glib::ustring &title, Gtk::Window& parent) : Gtk::Window(Gtk::WINDOW_TOPLEVEL)
+    FileDialogBase(const Glib::ustring &title, Gtk::Window& /*parent*/) : Gtk::Window(Gtk::WINDOW_TOPLEVEL)
     {
         set_title(title);
         sp_transientize((GtkWidget*) gobj());
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index c64bd22c6..b09096e63 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -245,7 +245,7 @@ void TextEdit::onSelectionModified(guint flags )
     onReadSelection (style, content);
 }
 
-void TextEdit::onReadSelection ( gboolean dostyle, gboolean docontent )
+void TextEdit::onReadSelection ( gboolean dostyle, gboolean /*docontent*/ )
 {
     if (blocked)
         return;
@@ -643,7 +643,7 @@ void TextEdit::onToggle()
 }
 
 
-void TextEdit::onLineSpacingChange(GtkComboBox* widget, gpointer data)
+void TextEdit::onLineSpacingChange(GtkComboBox* /*widget*/, gpointer data)
 {
     TextEdit *self  = static_cast<TextEdit *>(data);
     if (!self || self->blocked)
diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index ae1ebf5ca..51aea2935 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -509,9 +509,9 @@ void XmlTree::set_dt_select(Inkscape::XML::Node *repr)
 
 
 void XmlTree::on_tree_select_row(GtkCTree *tree,
-                        GtkCTreeNode *node,
-                        gint column,
-                        gpointer data)
+                                 GtkCTreeNode *node,
+                                 gint /*column*/,
+                                 gpointer data)
 {
     XmlTree *self = (XmlTree *)data;
 
@@ -535,9 +535,9 @@ void XmlTree::on_tree_select_row(GtkCTree *tree,
 }
 
 void XmlTree::on_tree_unselect_row(GtkCTree *tree,
-                          GtkCTreeNode *node,
-                          gint column,
-                          gpointer data)
+                                   GtkCTreeNode *node,
+                                   gint /*column*/,
+                                   gpointer data)
 {
     XmlTree *self = (XmlTree *)data;
 
@@ -764,7 +764,7 @@ void XmlTree::on_attr_select_row(GtkTreeSelection *selection, gpointer data)
 
 }
 
-void XmlTree::on_attr_row_changed(SPXMLViewAttrList *attributes, const gchar * name, gpointer data)
+void XmlTree::on_attr_row_changed(SPXMLViewAttrList *attributes, const gchar * name, gpointer /*data*/)
 {
     // Reselect the selected row if the data changes to refresh the attribute and value edit boxes.
     GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(attributes));
@@ -821,7 +821,7 @@ void XmlTree::on_document_replaced(SPDesktop *dt, SPDocument *doc)
     set_tree_document(doc);
 }
 
-void XmlTree::on_document_uri_set(gchar const */*uri*/, SPDocument *document)
+void XmlTree::on_document_uri_set(gchar const * /*uri*/, SPDocument * /*document*/)
 {
 /*
  * Seems to be no way to set the title on a docked dialog
diff --git a/src/ui/tool/control-point-selection.cpp b/src/ui/tool/control-point-selection.cpp
index b39a78979..a44fde3be 100644
--- a/src/ui/tool/control-point-selection.cpp
+++ b/src/ui/tool/control-point-selection.cpp
@@ -579,7 +579,7 @@ void ControlPointSelection::_commitHandlesTransform(CommitEvent ce)
     signal_commit.emit(ce);
 }
 
-bool ControlPointSelection::event(SPEventContext *event_context, GdkEvent *event)
+bool ControlPointSelection::event(SPEventContext * /*event_context*/, GdkEvent *event)
 {
     // implement generic event handling that should apply for all control point selections here;
     // for example, keyboard moves and transformations. This way this functionality doesn't need
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index cded702b4..97e25069f 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -158,7 +158,7 @@ PathManipulator::~PathManipulator()
 }
 
 /** Handle motion events to update the position of the curve drag point. */
-bool PathManipulator::event(SPEventContext *event_context, GdkEvent *event)
+bool PathManipulator::event(SPEventContext * /*event_context*/, GdkEvent *event)
 {
     if (empty()) return false;