warning cleanup

(bzr r4043)

3 files changed, 161 insertions, 180 deletions

diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index f6d3b0309..60750796f 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -4,7 +4,7 @@
  * Clone tiling dialog
  *
  * Authors:
- *   bulia byak <buliabyak@users.sf.net> 
+ *   bulia byak <buliabyak@users.sf.net>
  *   Johan Engelen <goejendaagh@zonnet.nl>
  *
  * Copyright (C) 2004-2006 Authors
@@ -95,7 +95,7 @@ static sigc::connection _color_changed_connection;
 static Inkscape::UI::Widget::ColorPicker *color_picker;
 
 static void
-clonetiler_dialog_destroy (GtkObject *object, gpointer data)
+clonetiler_dialog_destroy( GtkObject */*object*/, gpointer /*data*/ )
 {
     if (Inkscape::NSApplication::Application::getNewGui())
     {
@@ -109,14 +109,14 @@ clonetiler_dialog_destroy (GtkObject *object, gpointer data)
     _color_changed_connection.disconnect();
 
     delete color_picker;
-    
+
     wd.win = dlg = NULL;
     wd.stop = 0;
 
 }
 
 static gboolean
-clonetiler_dialog_delete (GtkObject *object, GdkEvent * /*event*/, gpointer data)
+clonetiler_dialog_delete (GtkObject */*object*/, GdkEvent * /*event*/, gpointer /*data*/)
 {
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
     gtk_window_get_size ((GtkWindow *) dlg, &w, &h);
@@ -221,7 +221,7 @@ enum {
 
 
 static NR::Matrix
-clonetiler_get_transform ( 
+clonetiler_get_transform (
     // symmetry group
     int type,
     // row, column
@@ -742,11 +742,11 @@ clonetiler_trace_setup (SPDocument *doc, gdouble zoom, SPItem *original)
     trace_arena = NRArena::create();
     /* Create ArenaItem and set transform */
     trace_visionkey = sp_item_display_key_new(1);
-    trace_root = sp_item_invoke_show( SP_ITEM(SP_DOCUMENT_ROOT (doc)), 
+    trace_root = sp_item_invoke_show( SP_ITEM(SP_DOCUMENT_ROOT (doc)),
                                       (NRArena *) trace_arena, trace_visionkey, SP_ITEM_SHOW_DISPLAY);
 
     // hide the (current) original and any tiled clones, we only want to pick the background
-    sp_item_invoke_hide(original, trace_visionkey); 
+    sp_item_invoke_hide(original, trace_visionkey);
     clonetiler_trace_hide_tiled_clones_recursively (SP_OBJECT(SP_DOCUMENT_ROOT (doc)));
 
     sp_document_root (doc)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
@@ -840,7 +840,7 @@ clonetiler_trace_finish ()
 }
 
 static void
-clonetiler_unclump (GtkWidget *widget, void *)
+clonetiler_unclump( GtkWidget */*widget*/, void * )
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
@@ -871,7 +871,7 @@ clonetiler_unclump (GtkWidget *widget, void *)
 
     g_slist_free (to_unclump);
 
-    sp_document_done (sp_desktop_document (desktop), SP_VERB_DIALOG_CLONETILER, 
+    sp_document_done (sp_desktop_document (desktop), SP_VERB_DIALOG_CLONETILER,
                       _("Unclump tiled clones"));
 }
 
@@ -892,7 +892,7 @@ clonetiler_number_of_clones (SPObject *obj)
 }
 
 static void
-clonetiler_remove (GtkWidget *widget, void *, bool do_undo = true)
+clonetiler_remove( GtkWidget */*widget*/, void *, bool do_undo = true )
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
@@ -924,7 +924,7 @@ clonetiler_remove (GtkWidget *widget, void *, bool do_undo = true)
     clonetiler_change_selection (NULL, selection, dlg);
 
     if (do_undo)
-        sp_document_done (sp_desktop_document (desktop), SP_VERB_DIALOG_CLONETILER, 
+        sp_document_done (sp_desktop_document (desktop), SP_VERB_DIALOG_CLONETILER,
                           _("Delete tiled clones"));
 }
 
@@ -939,10 +939,10 @@ transform_rect(NR::Rect const &r, NR::Matrix const &m)
     NR::Point const p4 = r.corner(4) * m;
     return NR::Rect(
         NR::Point(
-            std::min(std::min(p1[X], p2[X]), std::min(p3[X], p4[X])), 
-            std::min(std::min(p1[Y], p2[Y]), std::min(p3[Y], p4[Y]))), 
+            std::min(std::min(p1[X], p2[X]), std::min(p3[X], p4[X])),
+            std::min(std::min(p1[Y], p2[Y]), std::min(p3[Y], p4[Y]))),
         NR::Point(
-            std::max(std::max(p1[X], p2[X]), std::max(p3[X], p4[X])), 
+            std::max(std::max(p1[X], p2[X]), std::max(p3[X], p4[X])),
             std::max(std::max(p1[Y], p2[Y]), std::max(p3[Y], p4[Y]))));
 }
 
@@ -961,7 +961,7 @@ randomize01 (double val, double rand)
 
 
 static void
-clonetiler_apply (GtkWidget *widget, void *)
+clonetiler_apply( GtkWidget */*widget*/, void * )
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
     if (desktop == NULL)
@@ -1351,7 +1351,7 @@ clonetiler_apply (GtkWidget *widget, void *)
 
     clonetiler_change_selection (NULL, selection, dlg);
 
-    sp_document_done(sp_desktop_document(desktop), SP_VERB_DIALOG_CLONETILER, 
+    sp_document_done(sp_desktop_document(desktop), SP_VERB_DIALOG_CLONETILER,
                      _("Create tiled clones"));
 }
 
@@ -1444,7 +1444,7 @@ clonetiler_spinbox (GtkTooltips *tt, const char *tip, const char *attr, double l
 }
 
 static void
-clonetiler_symgroup_changed (GtkMenuItem *item, gpointer data)
+clonetiler_symgroup_changed( GtkMenuItem */*item*/, gpointer data )
 {
     gint group_new = GPOINTER_TO_INT (data);
     prefs_set_int_attribute ( prefs_path, "symmetrygroup", group_new );
@@ -1458,7 +1458,7 @@ clonetiler_xy_changed (GtkAdjustment *adj, gpointer data)
 }
 
 static void
-clonetiler_keep_bbox_toggled (GtkToggleButton *tb, gpointer data)
+clonetiler_keep_bbox_toggled( GtkToggleButton *tb, gpointer /*data*/ )
 {
     prefs_set_int_attribute (prefs_path, "keepbbox", gtk_toggle_button_get_active (tb));
 }
@@ -1507,7 +1507,7 @@ clonetiler_reset_recursive (GtkWidget *w)
 }
 
 static void
-clonetiler_reset (GtkWidget *widget, void *)
+clonetiler_reset( GtkWidget */*widget*/, void * )
 {
     clonetiler_reset_recursive (dlg);
 }
@@ -1564,7 +1564,7 @@ clonetiler_table_x_y_rand (int values)
 }
 
 static void
-clonetiler_pick_switched (GtkToggleButton *tb, gpointer data)
+clonetiler_pick_switched( GtkToggleButton */*tb*/, gpointer data )
 {
     guint v = GPOINTER_TO_INT (data);
     prefs_set_int_attribute (prefs_path, "pick", v);
@@ -1572,7 +1572,7 @@ clonetiler_pick_switched (GtkToggleButton *tb, gpointer data)
 
 
 static void
-clonetiler_switch_to_create (GtkToggleButton *tb, GtkWidget *dlg)
+clonetiler_switch_to_create( GtkToggleButton */*tb*/, GtkWidget *dlg )
 {
     GtkWidget *rowscols = (GtkWidget *) g_object_get_data (G_OBJECT(dlg), "rowscols");
     GtkWidget *widthheight = (GtkWidget *) g_object_get_data (G_OBJECT(dlg), "widthheight");
@@ -1589,7 +1589,7 @@ clonetiler_switch_to_create (GtkToggleButton *tb, GtkWidget *dlg)
 
 
 static void
-clonetiler_switch_to_fill (GtkToggleButton *tb, GtkWidget *dlg)
+clonetiler_switch_to_fill( GtkToggleButton */*tb*/, GtkWidget *dlg )
 {
     GtkWidget *rowscols = (GtkWidget *) g_object_get_data (G_OBJECT(dlg), "rowscols");
     GtkWidget *widthheight = (GtkWidget *) g_object_get_data (G_OBJECT(dlg), "widthheight");
@@ -1629,7 +1629,7 @@ clonetiler_fill_height_changed (GtkAdjustment *adj, GtkWidget *u)
 
 
 static void
-clonetiler_do_pick_toggled (GtkToggleButton *tb, gpointer data)
+clonetiler_do_pick_toggled( GtkToggleButton *tb, gpointer /*data*/ )
 {
     GtkWidget *vvb = (GtkWidget *) g_object_get_data (G_OBJECT(dlg), "dotrace");
 
@@ -1655,12 +1655,12 @@ clonetiler_dialog (void)
             x = prefs_get_int_attribute (prefs_path, "x", -1000);
             y = prefs_get_int_attribute (prefs_path, "y", -1000);
         }
-        
+
         if (w ==0 || h == 0) {
             w = prefs_get_int_attribute (prefs_path, "w", 0);
             h = prefs_get_int_attribute (prefs_path, "h", 0);
         }
-        
+
 //        if (x<0) x=0;
 //        if (y<0) y=0;
 
@@ -1669,19 +1669,19 @@ clonetiler_dialog (void)
         }
         if (x >= 0 && y >= 0 && (x < (gdk_screen_width()-MIN_ONSCREEN_DISTANCE)) && (y < (gdk_screen_height()-MIN_ONSCREEN_DISTANCE))) {
             gtk_window_move ((GtkWindow *) dlg, x, y);
-        
+
         } else {
             gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER);
         }
-        
-        
+
+
         sp_transientize (dlg);
         wd.win = dlg;
         wd.stop = 0;
-        
-                             
+
+
         gtk_signal_connect ( GTK_OBJECT (dlg), "event", GTK_SIGNAL_FUNC (sp_dialog_event_handler), dlg);
-        
+
         gtk_signal_connect ( GTK_OBJECT (dlg), "destroy", G_CALLBACK (clonetiler_dialog_destroy), dlg);
         gtk_signal_connect ( GTK_OBJECT (dlg), "delete_event", G_CALLBACK (clonetiler_dialog_delete), dlg);
 
@@ -1691,7 +1691,7 @@ clonetiler_dialog (void)
             _dialogs_hidden_connection = Inkscape::NSApplication::Editor::connectDialogsHidden (sigc::bind (&on_dialog_hide, dlg));
             _dialogs_unhidden_connection = Inkscape::NSApplication::Editor::connectDialogsUnhidden (sigc::bind (&on_dialog_unhide, dlg));
             _desktop_activated_connection = Inkscape::NSApplication::Editor::connectDesktopActivated (sigc::bind (&on_transientize, &wd));
-        } else {            
+        } else {
             g_signal_connect   ( G_OBJECT (INKSCAPE), "shut_down", G_CALLBACK (clonetiler_dialog_delete), dlg);
             g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_hide", G_CALLBACK (sp_dialog_hide), dlg);
             g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_unhide", G_CALLBACK (sp_dialog_unhide), dlg);
@@ -2352,7 +2352,7 @@ clonetiler_dialog (void)
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs_get_int_attribute(prefs_path, "pick", 0) == PICK_B);
                 }
                 {
-                    //TRANSLATORS: only translate "string" in "context|string". 
+                    //TRANSLATORS: only translate "string" in "context|string".
                     // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), Q_("clonetiler|H"));
                     gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the hue of the color"), NULL);
@@ -2362,7 +2362,7 @@ clonetiler_dialog (void)
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs_get_int_attribute(prefs_path, "pick", 0) == PICK_H);
                 }
                 {
-                    //TRANSLATORS: only translate "string" in "context|string". 
+                    //TRANSLATORS: only translate "string" in "context|string".
                     // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), Q_("clonetiler|S"));
                     gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the saturation of the color"), NULL);
@@ -2372,7 +2372,7 @@ clonetiler_dialog (void)
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs_get_int_attribute(prefs_path, "pick", 0) == PICK_S);
                 }
                 {
-                    //TRANSLATORS: only translate "string" in "context|string". 
+                    //TRANSLATORS: only translate "string" in "context|string".
                     // For more details, see http://developer.gnome.org/doc/API/2.0/glib/glib-I18N.html#Q-:CAPS
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), Q_("clonetiler|L"));
                     gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the lightness of the color"), NULL);
@@ -2537,9 +2537,9 @@ clonetiler_dialog (void)
                 // unitmenu
                 GtkWidget *u = sp_unit_selector_new (SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE);
                 sp_unit_selector_set_unit (SP_UNIT_SELECTOR(u), sp_desktop_namedview(SP_ACTIVE_DESKTOP)->doc_units);
-    
+
                 {
-                    // Width spinbutton 
+                    // Width spinbutton
                     GtkObject *a = gtk_adjustment_new (0.0, -1e6, 1e6, 1.0, 10.0, 10.0);
                     sp_unit_selector_add_adjustment (SP_UNIT_SELECTOR (u), GTK_ADJUSTMENT (a));
 
diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index 441047a27..1b74afb7e 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -66,7 +66,7 @@
 
 #define DPI_BASE PX_PER_IN
 
-#define EXPORT_COORD_PRECISION 3    
+#define EXPORT_COORD_PRECISION 3
 
 #define MIN_ONSCREEN_DISTANCE 50
 
@@ -74,32 +74,32 @@ static void sp_export_area_toggled   ( GtkToggleButton *tb, GtkObject *base );
 static void sp_export_export_clicked ( GtkButton *button, GtkObject *base );
 static void sp_export_browse_clicked ( GtkButton *button, gpointer userdata );
 
-static void sp_export_area_x_value_changed       ( GtkAdjustment *adj, 
+static void sp_export_area_x_value_changed       ( GtkAdjustment *adj,
                                                    GtkObject *base);
-                                             
-static void sp_export_area_y_value_changed       ( GtkAdjustment *adj, 
+
+static void sp_export_area_y_value_changed       ( GtkAdjustment *adj,
                                                    GtkObject *base);
-                                             
-static void sp_export_area_width_value_changed   ( GtkAdjustment *adj, 
+
+static void sp_export_area_width_value_changed   ( GtkAdjustment *adj,
                                                    GtkObject *base);
-                                                 
-static void sp_export_area_height_value_changed  ( GtkAdjustment *adj, 
+
+static void sp_export_area_height_value_changed  ( GtkAdjustment *adj,
                                                    GtkObject *base);
-                                                  
-static void sp_export_bitmap_width_value_changed ( GtkAdjustment *adj, 
+
+static void sp_export_bitmap_width_value_changed ( GtkAdjustment *adj,
                                                    GtkObject *base);
-                                                   
-static void sp_export_bitmap_height_value_changed ( GtkAdjustment *adj, 
+
+static void sp_export_bitmap_height_value_changed ( GtkAdjustment *adj,
                                                    GtkObject *base);
-                                                   
-static void sp_export_xdpi_value_changed         ( GtkAdjustment *adj, 
+
+static void sp_export_xdpi_value_changed         ( GtkAdjustment *adj,
                                                    GtkObject *base);
-                                           
-static void sp_export_selection_changed ( Inkscape::Application *inkscape, 
-                                          Inkscape::Selection *selection, 
+
+static void sp_export_selection_changed ( Inkscape::Application *inkscape,
+                                          Inkscape::Selection *selection,
                                           GtkObject *base);
-static void sp_export_selection_modified ( Inkscape::Application *inkscape, 
-                                           Inkscape::Selection *selection, 
+static void sp_export_selection_modified ( Inkscape::Application *inkscape,
+                                           Inkscape::Selection *selection,
                                            guint flags,
                                            GtkObject *base );
 
@@ -142,7 +142,7 @@ static const char * selection_labels[SELECTION_NUMBER_OF] = {
     N_("_Page"), N_("_Drawing"), N_("_Selection"), N_("_Custom")};
 
 static void
-sp_export_dialog_destroy ( GtkObject *object, gpointer data )
+sp_export_dialog_destroy ( GtkObject */*object*/, gpointer /*data*/ )
 {
     sp_signal_disconnect_by_data (INKSCAPE, dlg);
 
@@ -160,7 +160,7 @@ sp_export_dialog_destroy ( GtkObject *object, gpointer data )
 
 /// Called when dialog is closed or inkscape is shut down.
 static bool
-sp_export_dialog_delete ( GtkObject *object, GdkEvent *event, gpointer data )
+sp_export_dialog_delete ( GtkObject */*object*/, GdkEvent */*event*/, gpointer /*data*/ )
 {
 
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
@@ -289,50 +289,50 @@ sp_export_dialog_area_box (GtkWidget * dlg)
         b->set_data("key", GINT_TO_POINTER(i));
         gtk_object_set_data (GTK_OBJECT (dlg), selection_names[i], b->gobj());
         togglebox->pack_start(*b, false, true, 0);
-        gtk_signal_connect ( GTK_OBJECT (b->gobj()), "clicked", 
+        gtk_signal_connect ( GTK_OBJECT (b->gobj()), "clicked",
                              GTK_SIGNAL_FUNC (sp_export_area_toggled), dlg );
     }
 
-    g_signal_connect ( G_OBJECT (INKSCAPE), "change_selection", 
+    g_signal_connect ( G_OBJECT (INKSCAPE), "change_selection",
                        G_CALLBACK (sp_export_selection_changed), dlg );
-    g_signal_connect ( G_OBJECT (INKSCAPE), "modify_selection", 
+    g_signal_connect ( G_OBJECT (INKSCAPE), "modify_selection",
                        G_CALLBACK (sp_export_selection_modified), dlg );
-    g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop", 
+    g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop",
                        G_CALLBACK (sp_export_selection_changed), dlg );
-    
+
     Gtk::Table* t = new Gtk::Table(2, 6, FALSE);
     t->set_row_spacings (4);
     t->set_col_spacings (4);
 
-    sp_export_spinbutton_new ( "x0", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, us->gobj(), 
+    sp_export_spinbutton_new ( "x0", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, us->gobj(),
                                GTK_WIDGET(t->gobj()), 0, 0, _("_x0:"), NULL, EXPORT_COORD_PRECISION, 1,
-                               G_CALLBACK ( sp_export_area_x_value_changed), 
+                               G_CALLBACK ( sp_export_area_x_value_changed),
                                dlg );
 
-    sp_export_spinbutton_new ( "x1", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, us->gobj(), 
+    sp_export_spinbutton_new ( "x1", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, us->gobj(),
                                GTK_WIDGET(t->gobj()), 2, 0, _("x_1:"), NULL, EXPORT_COORD_PRECISION, 1,
-                               G_CALLBACK (sp_export_area_x_value_changed), 
+                               G_CALLBACK (sp_export_area_x_value_changed),
                                dlg );
 
-    sp_export_spinbutton_new ( "width", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, 
+    sp_export_spinbutton_new ( "width", 0.0, -1000000.0, 1000000.0, 0.1, 1.0,
                                us->gobj(), GTK_WIDGET(t->gobj()), 4, 0, _("Width:"), NULL, EXPORT_COORD_PRECISION, 1,
-                               G_CALLBACK 
-                                   (sp_export_area_width_value_changed), 
+                               G_CALLBACK
+                                   (sp_export_area_width_value_changed),
                                dlg );
 
-    sp_export_spinbutton_new ( "y0", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, us->gobj(), 
+    sp_export_spinbutton_new ( "y0", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, us->gobj(),
                                GTK_WIDGET(t->gobj()), 0, 1, _("_y0:"), NULL, EXPORT_COORD_PRECISION, 1,
-                               G_CALLBACK (sp_export_area_y_value_changed), 
+                               G_CALLBACK (sp_export_area_y_value_changed),
                                dlg );
 
-    sp_export_spinbutton_new ( "y1", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, us->gobj(), 
+    sp_export_spinbutton_new ( "y1", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, us->gobj(),
                                GTK_WIDGET(t->gobj()), 2, 1, _("y_1:"), NULL, EXPORT_COORD_PRECISION, 1,
-                               G_CALLBACK (sp_export_area_y_value_changed), 
+                               G_CALLBACK (sp_export_area_y_value_changed),
                                dlg );
 
-    sp_export_spinbutton_new ( "height", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, 
+    sp_export_spinbutton_new ( "height", 0.0, -1000000.0, 1000000.0, 0.1, 1.0,
                                us->gobj(), GTK_WIDGET(t->gobj()), 4, 1, _("Height:"), NULL, EXPORT_COORD_PRECISION, 1,
-                               G_CALLBACK (sp_export_area_height_value_changed), 
+                               G_CALLBACK (sp_export_area_height_value_changed),
                                dlg );
 
     vb->pack_start(*togglebox, false, false, 3);
@@ -473,36 +473,36 @@ sp_export_dialog (void)
             t->set_col_spacings (4);
             size_box->pack_start(*t);
 
-            sp_export_spinbutton_new ( "bmwidth", 16.0, 1.0, 1000000.0, 1.0, 10.0, 
+            sp_export_spinbutton_new ( "bmwidth", 16.0, 1.0, 1000000.0, 1.0, 10.0,
                                        NULL, GTK_WIDGET(t->gobj()), 0, 0,
                                        _("_Width:"), _("pixels at"), 0, 1,
-                                       G_CALLBACK 
-                                       (sp_export_bitmap_width_value_changed), 
+                                       G_CALLBACK
+                                       (sp_export_bitmap_width_value_changed),
                                        dlg );
 
-            sp_export_spinbutton_new ( "xdpi", 
-                                       prefs_get_double_attribute 
-                                       ( "dialogs.export.defaultxdpi", 
-                                         "value", DPI_BASE), 
+            sp_export_spinbutton_new ( "xdpi",
+                                       prefs_get_double_attribute
+                                       ( "dialogs.export.defaultxdpi",
+                                         "value", DPI_BASE),
                                        0.01, 100000.0, 0.1, 1.0, NULL, GTK_WIDGET(t->gobj()), 3, 0,
                                        NULL, _("dp_i"), 2, 1,
-                                       G_CALLBACK (sp_export_xdpi_value_changed), 
+                                       G_CALLBACK (sp_export_xdpi_value_changed),
                                        dlg );
 
-            sp_export_spinbutton_new ( "bmheight", 16.0, 1.0, 1000000.0, 1.0, 10.0, 
-                                       NULL, GTK_WIDGET(t->gobj()), 0, 1, 
-                                       _("Height:"), _("pixels at"), 0, 1, 
+            sp_export_spinbutton_new ( "bmheight", 16.0, 1.0, 1000000.0, 1.0, 10.0,
+                                       NULL, GTK_WIDGET(t->gobj()), 0, 1,
+                                       _("Height:"), _("pixels at"), 0, 1,
                                        G_CALLBACK
-                                       (sp_export_bitmap_height_value_changed), 
+                                       (sp_export_bitmap_height_value_changed),
                                        dlg );
 
             /** \todo
-             * Needs fixing: there's no way to set ydpi currently, so we use  
+             * Needs fixing: there's no way to set ydpi currently, so we use
              *       the defaultxdpi value here, too...
              */
-            sp_export_spinbutton_new ( "ydpi", prefs_get_double_attribute 
-                                       ( "dialogs.export.defaultxdpi", 
-                                         "value", DPI_BASE), 
+            sp_export_spinbutton_new ( "ydpi", prefs_get_double_attribute
+                                       ( "dialogs.export.defaultxdpi",
+                                         "value", DPI_BASE),
                                        0.01, 100000.0, 0.1, 1.0, NULL, GTK_WIDGET(t->gobj()), 3, 1,
                                        NULL, _("dpi"), 2, 0, NULL, dlg );
 
@@ -730,13 +730,13 @@ sp_export_find_default_selection(GtkWidget * dlg)
 
 
 /**
- * \brief  If selection changed or a different document activated, we must 
+ * \brief  If selection changed or a different document activated, we must
  * recalculate any chosen areas
  *
  */
 static void
-sp_export_selection_changed ( Inkscape::Application *inkscape, 
-                              Inkscape::Selection *selection, 
+sp_export_selection_changed ( Inkscape::Application *inkscape,
+                              Inkscape::Selection *selection,
                               GtkObject *base )
 {
     selection_type current_key;
@@ -760,15 +760,15 @@ sp_export_selection_changed ( Inkscape::Application *inkscape,
         GtkToggleButton * button;
         button = (GtkToggleButton *)gtk_object_get_data(base, selection_names[current_key]);
         sp_export_area_toggled(button, base);
-    } 
+    }
 
     sp_export_update_checkbuttons (base);
-} 
+}
 
 static void
-sp_export_selection_modified ( Inkscape::Application *inkscape, 
-                               Inkscape::Selection *selection, 
-                               guint flags,
+sp_export_selection_modified ( Inkscape::Application */*inkscape*/,
+                               Inkscape::Selection */*selection*/,
+                               guint /*flags*/,
                                GtkObject *base )
 {
     selection_type current_key;
@@ -857,7 +857,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
                     break;
                 }
             case SELECTION_DRAWING:
-                /** \todo 
+                /** \todo
                  * This returns wrong values if the document has a viewBox.
                  */
                 bbox = sp_item_bbox_desktop (SP_ITEM (SP_DOCUMENT_ROOT (doc)));
@@ -869,7 +869,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
                     break;
                 }
             case SELECTION_PAGE:
-                bbox = NR::Rect(NR::Point(0.0, 0.0), 
+                bbox = NR::Rect(NR::Point(0.0, 0.0),
                                 NR::Point(sp_document_width(doc), sp_document_height(doc))
                                 );
 
@@ -880,9 +880,9 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
             default:
                 break;
         } // switch
-        
+
         // remember area setting
-        prefs_set_string_attribute ( "dialogs.export.exportarea", 
+        prefs_set_string_attribute ( "dialogs.export.exportarea",
                                      "value", selection_names[key]);
 
         if ( key != SELECTION_CUSTOM && bbox ) {
@@ -891,7 +891,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
                                       bbox->max()[NR::X],
                                       bbox->max()[NR::Y]);
         }
-    
+
     } // end of if ( SP_ACTIVE_DESKTOP )
 
 
@@ -967,7 +967,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
 
 /// Called when dialog is deleted
 static gint
-sp_export_progress_delete ( GtkWidget *widget, GdkEvent *event, GObject *base )
+sp_export_progress_delete ( GtkWidget */*widget*/, GdkEvent */*event*/, GObject *base )
 {
     g_object_set_data (base, "cancel", (gpointer) 1);
     return TRUE;
@@ -975,7 +975,7 @@ sp_export_progress_delete ( GtkWidget *widget, GdkEvent *event, GObject *base )
 
 /// Called when progress is cancelled
 static void
-sp_export_progress_cancel ( GtkWidget *widget, GObject *base )
+sp_export_progress_cancel ( GtkWidget */*widget*/, GObject *base )
 {
     g_object_set_data (base, "cancel", (gpointer) 1);
 } // end of sp_export_progress_cancel()
@@ -1008,7 +1008,7 @@ sp_export_progress_callback (float value, void *data)
 GtkWidget *
 create_progress_dialog (GtkObject *base, gchar *progress_text) {
     GtkWidget *dlg, *prg, *btn; /* progressbar-stuff */
-    
+
     dlg = gtk_dialog_new ();
     gtk_window_set_title (GTK_WINDOW (dlg), _("Export in progress"));
     prg = gtk_progress_bar_new ();
@@ -1018,17 +1018,17 @@ create_progress_dialog (GtkObject *base, gchar *progress_text) {
 
     gtk_progress_bar_set_text ((GtkProgressBar *) prg, progress_text);
 
-    gtk_progress_bar_set_orientation ( (GtkProgressBar *) prg, 
+    gtk_progress_bar_set_orientation ( (GtkProgressBar *) prg,
                                        GTK_PROGRESS_LEFT_TO_RIGHT);
-    gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dlg)->vbox, 
+    gtk_box_pack_start ((GtkBox *) ((GtkDialog *) dlg)->vbox,
                         prg, FALSE, FALSE, 4 );
-    btn = gtk_dialog_add_button ( GTK_DIALOG (dlg), 
-                                  GTK_STOCK_CANCEL, 
+    btn = gtk_dialog_add_button ( GTK_DIALOG (dlg),
+                                  GTK_STOCK_CANCEL,
                                   GTK_RESPONSE_CANCEL );
-                                  
-    g_signal_connect ( (GObject *) dlg, "delete_event", 
+
+    g_signal_connect ( (GObject *) dlg, "delete_event",
                        (GCallback) sp_export_progress_delete, base);
-    g_signal_connect ( (GObject *) btn, "clicked", 
+    g_signal_connect ( (GObject *) btn, "clicked",
                        (GCallback) sp_export_progress_cancel, base);
     gtk_window_set_modal ((GtkWindow *) dlg, TRUE);
     gtk_widget_show_all (dlg);
@@ -1062,7 +1062,7 @@ filename_add_extension (const gchar *filename, const gchar *extension)
 
 /// Called when export button is clicked
 static void
-sp_export_export_clicked (GtkButton *button, GtkObject *base)
+sp_export_export_clicked (GtkButton */*button*/, GtkObject *base)
 {
     if (!SP_ACTIVE_DESKTOP) return;
 
@@ -1077,7 +1077,7 @@ sp_export_export_clicked (GtkButton *button, GtkObject *base)
         gint num = g_slist_length((GSList *) sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList());
         gint n = 0;
 
-        if (num < 1) 
+        if (num < 1)
             return;
 
         gchar *progress_text = g_strdup_printf (_("Exporting %d files"), num);
@@ -1112,10 +1112,10 @@ sp_export_export_clicked (GtkButton *button, GtkObject *base)
 
             if (width > 1 && height > 1) {
                 /* Do export */
-                if (!sp_export_png_file (sp_desktop_document (SP_ACTIVE_DESKTOP), fn, 
-                                         area.x0, area.y0, area.x1, area.y1, width, height, dpi, dpi, 
-                                         nv->pagecolor, 
-                                         NULL, NULL, TRUE,  // overwrite without asking 
+                if (!sp_export_png_file (sp_desktop_document (SP_ACTIVE_DESKTOP), fn,
+                                         area.x0, area.y0, area.x1, area.y1, width, height, dpi, dpi,
+                                         nv->pagecolor,
+                                         NULL, NULL, TRUE,  // overwrite without asking
                                          hide ? (GSList *) sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList() : NULL
                         )) {
                     gchar * error;
@@ -1182,11 +1182,11 @@ sp_export_export_clicked (GtkButton *button, GtkObject *base)
     g_free (fn);
     GtkWidget *prog_dlg = create_progress_dialog (base, progress_text);
     g_free (progress_text);
-    
+
     /* Do export */
-    if (!sp_export_png_file (sp_desktop_document (SP_ACTIVE_DESKTOP), filename_ext, 
-                             x0, y0, x1, y1, width, height, xdpi, ydpi, 
-                             nv->pagecolor, 
+    if (!sp_export_png_file (sp_desktop_document (SP_ACTIVE_DESKTOP), filename_ext,
+                             x0, y0, x1, y1, width, height, xdpi, ydpi,
+                             nv->pagecolor,
                              sp_export_progress_callback, base, FALSE,
                              hide ? (GSList *) sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList() : NULL
             )) {
@@ -1295,7 +1295,7 @@ sp_export_export_clicked (GtkButton *button, GtkObject *base)
 
 /// Called when Browse button is clicked
 static void
-sp_export_browse_clicked (GtkButton *button, gpointer userdata)
+sp_export_browse_clicked (GtkButton */*button*/, gpointer /*userdata*/)
 {
     GtkWidget *fs, *fe;
     const gchar *filename;
@@ -1350,7 +1350,7 @@ sp_export_browse_clicked (GtkButton *button, gpointer userdata)
 // TODO: Move this to nr-rect-fns.h.
 static bool
 sp_export_bbox_equal(NR::Rect const &one, NR::Rect const &two)
-{ 
+{
     double const epsilon = pow(10.0, -EXPORT_COORD_PRECISION);
     return (
         (fabs(one.min()[NR::X] - two.min()[NR::X]) < epsilon) &&
@@ -1562,7 +1562,7 @@ sp_export_area_y_value_changed (GtkAdjustment *adj, GtkObject *base)
 
 /// Called when x1-x0 or area width is changed
 static void
-sp_export_area_width_value_changed (GtkAdjustment *adj, GtkObject *base)
+sp_export_area_width_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 {
     float x0, x1, xdpi, width, bmwidth;
 
@@ -1599,7 +1599,7 @@ sp_export_area_width_value_changed (GtkAdjustment *adj, GtkObject *base)
 
 /// Called when y1-y0 or area height is changed.
 static void
-sp_export_area_height_value_changed (GtkAdjustment *adj, GtkObject *base)
+sp_export_area_height_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 {
 
     float y0, y1, ydpi, height, bmheight;
@@ -1682,7 +1682,7 @@ sp_export_set_image_x (GtkObject *base)
 
 /// Called when pixel width is changed
 static void
-sp_export_bitmap_width_value_changed (GtkAdjustment *adj, GtkObject *base)
+sp_export_bitmap_width_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 {
     float x0, x1, bmwidth, xdpi;
 
@@ -1717,7 +1717,7 @@ sp_export_bitmap_width_value_changed (GtkAdjustment *adj, GtkObject *base)
 
 /// Called when pixel height is changed
 static void
-sp_export_bitmap_height_value_changed (GtkAdjustment *adj, GtkObject *base)
+sp_export_bitmap_height_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 {
     float y0, y1, bmheight, xdpi;
 
@@ -1779,7 +1779,7 @@ sp_export_bitmap_height_value_changed (GtkAdjustment *adj, GtkObject *base)
     currently be independent.  This is likely to change in the future.
 */
 void
-sp_export_xdpi_value_changed (GtkAdjustment *adj, GtkObject *base)
+sp_export_xdpi_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 {
     float x0, x1, xdpi, bmwidth;
 
diff --git a/src/dialogs/stroke-style.cpp b/src/dialogs/stroke-style.cpp
index 08f3d9031..54c1b7164 100644
--- a/src/dialogs/stroke-style.cpp
+++ b/src/dialogs/stroke-style.cpp
@@ -134,9 +134,8 @@ sp_stroke_style_paint_widget_new(void)
  * On construction, simply does an update of the stroke style paint object.
  */
 static void
-sp_stroke_style_paint_construct(SPWidget *spw, SPPaintSelector *psel)
+sp_stroke_style_paint_construct(SPWidget *spw, SPPaintSelector */*psel*/)
 {
-    (void)psel;
 #ifdef SP_SS_VERBOSE
     g_print( "Stroke style widget constructed: inkscape %p repr %p\n",
              spw->inkscape, spw->repr );
@@ -150,12 +149,11 @@ sp_stroke_style_paint_construct(SPWidget *spw, SPPaintSelector *psel)
  * On signal modified, invokes an update of the stroke style paint object.
  */
 static void
-sp_stroke_style_paint_selection_modified ( SPWidget *spw,
-                                        Inkscape::Selection *selection,
-                                        guint flags,
-                                        SPPaintSelector *psel)
+sp_stroke_style_paint_selection_modified( SPWidget *spw,
+                                          Inkscape::Selection */*selection*/,
+                                          guint flags,
+                                          SPPaintSelector */*psel*/ )
 {
-    (void)selection;
     if (flags & ( SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_PARENT_MODIFIED_FLAG |
                   SP_OBJECT_STYLE_MODIFIED_FLAG) ) {
         sp_stroke_style_paint_update(spw);
@@ -167,11 +165,10 @@ sp_stroke_style_paint_selection_modified ( SPWidget *spw,
  * On signal selection changed, invokes an update of the stroke style paint object.
  */
 static void
-sp_stroke_style_paint_selection_changed ( SPWidget *spw,
-                                        Inkscape::Selection *selection,
-                                        SPPaintSelector *psel )
+sp_stroke_style_paint_selection_changed( SPWidget *spw,
+                                         Inkscape::Selection */*selection*/,
+                                         SPPaintSelector */*psel*/ )
 {
-    (void)selection;
     sp_stroke_style_paint_update (spw);
 }
 
@@ -180,11 +177,10 @@ sp_stroke_style_paint_selection_changed ( SPWidget *spw,
  * On signal change subselection, invoke an update of the stroke style widget.
  */
 static void
-sp_stroke_style_widget_change_subselection ( Inkscape::Application *inkscape,
-                                        SPDesktop *desktop,
-                                        SPWidget *spw )
+sp_stroke_style_widget_change_subselection( Inkscape::Application */*inkscape*/,
+                                            SPDesktop */*desktop*/,
+                                            SPWidget *spw )
 {
-    (void)inkscape;
     sp_stroke_style_paint_update (spw);
 }
 
@@ -271,10 +267,9 @@ sp_stroke_style_paint_update (SPWidget *spw)
  */
 static void
 sp_stroke_style_paint_mode_changed( SPPaintSelector *psel,
-                                    SPPaintSelectorMode mode,
+                                    SPPaintSelectorMode /*mode*/,
                                     SPWidget *spw )
 {
-    (void)mode;
     if (gtk_object_get_data(GTK_OBJECT(spw), "update")) {
         return;
     }
@@ -568,13 +563,10 @@ sp_stroke_radio_button(GtkWidget *tb, char const *icon,
 }
 
 static void
-sp_stroke_style_widget_transientize_callback(Inkscape::Application *inkscape,
-                                        SPDesktop *desktop,
-                                        SPWidget *spw )
+sp_stroke_style_widget_transientize_callback(Inkscape::Application */*inkscape*/,
+                                             SPDesktop */*desktop*/,
+                                             SPWidget */*spw*/ )
 {
-    (void)inkscape;
-    (void)desktop;
-    (void)spw;
 // TODO:  Either of these will cause crashes sometimes
 //    sp_stroke_style_line_update( SP_WIDGET(spw), desktop ? sp_desktop_selection(desktop) : NULL);
 //    ink_markers_menu_update(spw);
@@ -588,10 +580,8 @@ sp_stroke_style_widget_transientize_callback(Inkscape::Application *inkscape,
 static GtkWidget *
 sp_marker_prev_new(unsigned psize, gchar const *mname,
                    SPDocument *source, SPDocument *sandbox,
-                   gchar *menu_id, NRArena const *arena, unsigned visionkey, NRArenaItem *root)
+                   gchar *menu_id, NRArena const */*arena*/, unsigned /*visionkey*/, NRArenaItem *root)
 {
-    (void)arena;
-    (void)visionkey;
     // Retrieve the marker named 'mname' from the source SVG document
     SPObject const *marker = source->getObjectById(mname);
     if (marker == NULL)
@@ -730,10 +720,8 @@ sp_marker_menu_build (GtkWidget *m, GSList *marker_list, SPDocument *source, SPD
  *
  */
 static void
-sp_marker_list_from_doc (GtkWidget *m, SPDocument *current_doc, SPDocument *source, SPDocument *markers_doc, SPDocument *sandbox, gchar *menu_id)
+sp_marker_list_from_doc (GtkWidget *m, SPDocument */*current_doc*/, SPDocument *source, SPDocument */*markers_doc*/, SPDocument *sandbox, gchar *menu_id)
 {
-    (void)current_doc;
-    (void)markers_doc;
     GSList *ml = ink_marker_list_get(source);
     GSList *clean_ml = NULL;
 
@@ -842,9 +830,8 @@ ink_marker_menu_create_menu(GtkWidget *m, gchar *menu_id, SPDocument *doc, SPDoc
  * Creates a menu widget to display markers from markers.svg
  */
 static GtkWidget *
-ink_marker_menu( GtkWidget *tbl, gchar *menu_id, SPDocument *sandbox)
+ink_marker_menu( GtkWidget */*tbl*/, gchar *menu_id, SPDocument *sandbox)
 {
-    (void)tbl;
     SPDesktop *desktop = inkscape_active_desktop();
     SPDocument *doc = sp_desktop_document(desktop);
     GtkWidget *mnu = gtk_option_menu_new();
@@ -1299,9 +1286,8 @@ sp_stroke_style_line_widget_new(void)
  * the stroke line style to be updated.
  */
 static void
-sp_stroke_style_line_construct(SPWidget *spw, gpointer data)
+sp_stroke_style_line_construct(SPWidget *spw, gpointer /*data*/)
 {
-    (void)data;
 #ifdef SP_SS_VERBOSE
     g_print( "Stroke style widget constructed: inkscape %p repr %p\n",
              spw->inkscape, spw->repr );
@@ -1319,12 +1305,11 @@ sp_stroke_style_line_construct(SPWidget *spw, gpointer data)
  * Triggers update action.
  */
 static void
-sp_stroke_style_line_selection_modified ( SPWidget *spw,
-                                       Inkscape::Selection *selection,
-                                       guint flags,
-                                       gpointer data )
+sp_stroke_style_line_selection_modified( SPWidget *spw,
+                                         Inkscape::Selection *selection,
+                                         guint flags,
+                                         gpointer /*data*/ )
 {
-    (void)data;
     if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_PARENT_MODIFIED_FLAG)) {
         sp_stroke_style_line_update (spw, selection);
     }
@@ -1336,11 +1321,10 @@ sp_stroke_style_line_selection_modified ( SPWidget *spw,
  * Triggers update action.
  */
 static void
-sp_stroke_style_line_selection_changed ( SPWidget *spw,
-                                       Inkscape::Selection *selection,
-                                       gpointer data )
+sp_stroke_style_line_selection_changed( SPWidget *spw,
+                                        Inkscape::Selection *selection,
+                                        gpointer /*data*/ )
 {
-    (void)data;
     sp_stroke_style_line_update (spw, selection);
 }
 
@@ -1627,9 +1611,8 @@ sp_stroke_style_scale_line(SPWidget *spw)
  * Causes all line styles to be applied to all selected items.
  */
 static void
-sp_stroke_style_width_changed(GtkAdjustment *adj, SPWidget *spw)
+sp_stroke_style_width_changed(GtkAdjustment */*adj*/, SPWidget *spw)
 {
-    (void)adj;
     if (gtk_object_get_data(GTK_OBJECT(spw), "update")) {
         return;
     }
@@ -1642,9 +1625,8 @@ sp_stroke_style_width_changed(GtkAdjustment *adj, SPWidget *spw)
  * Causes all line styles to be applied to all selected items.
  */
 static void
-sp_stroke_style_miterlimit_changed(GtkAdjustment *adj, SPWidget *spw)
+sp_stroke_style_miterlimit_changed(GtkAdjustment */*adj*/, SPWidget *spw)
 {
-    (void)adj;
     if (gtk_object_get_data(GTK_OBJECT(spw), "update")) {
         return;
     }
@@ -1657,9 +1639,8 @@ sp_stroke_style_miterlimit_changed(GtkAdjustment *adj, SPWidget *spw)
  * Causes all line styles to be applied to all selected items.
  */
 static void
-sp_stroke_style_line_dash_changed(SPDashSelector *dsel, SPWidget *spw)
+sp_stroke_style_line_dash_changed(SPDashSelector */*dsel*/, SPWidget *spw)
 {
-    (void)dsel;
     if (gtk_object_get_data(GTK_OBJECT(spw), "update")) {
         return;
     }