warning cleanup

(bzr r4043)

8 files changed, 146 insertions, 146 deletions

diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index 82c56f2a4..c00e58f5e 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -131,12 +131,12 @@ void SvgPreview::set_preview_in_cache(const Glib::ustring& key, GdkPixbuf* px) {
     _pixmap_cache[key] = px;
 }
 
-GdkPixbuf* SvgPreview::get_preview(const gchar* uri, const gchar* id, NRArenaItem *root, 
-                                   double scale_factor, unsigned int psize) {
+GdkPixbuf* SvgPreview::get_preview(const gchar* uri, const gchar* id, NRArenaItem */*root*/,
+                                   double /*scale_factor*/, unsigned int psize) {
     // First try looking up the cached preview in the cache map
     Glib::ustring key = cache_key(uri, id, psize);
     GdkPixbuf* px = get_preview_from_cache(key);
-    
+
     if (px == NULL) {
         /*
             px = render_pixbuf(root, scale_factor, dbox, psize);
diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp
index ca2da205e..22f6f64be 100644
--- a/src/ui/dialog/document-metadata.cpp
+++ b/src/ui/dialog/document-metadata.cpp
@@ -81,7 +81,7 @@ DocumentMetadata::destroy()
     }
 }
 
-DocumentMetadata::DocumentMetadata(Behavior::BehaviorFactory behavior_factory) 
+DocumentMetadata::DocumentMetadata(Behavior::BehaviorFactory behavior_factory)
     : Dialog (behavior_factory, "dialogs.documentmetadata", SP_VERB_DIALOG_METADATA),
       _page_metadata1(1, 1), _page_metadata2(1, 1),
       _prefs_path("dialogs.documentmetadata")
@@ -110,15 +110,15 @@ DocumentMetadata::init()
 
     g_signal_connect(G_OBJECT(INKSCAPE), "activate_desktop",
                      G_CALLBACK(on_activate_desktop), 0);
-    
+
     g_signal_connect(G_OBJECT(INKSCAPE), "deactivate_desktop",
                      G_CALLBACK(on_deactivate_desktop), 0);
-    
+
     show_all_children();
     present();
 }
 
-DocumentMetadata::~DocumentMetadata() 
+DocumentMetadata::~DocumentMetadata()
 {
     Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP));
     repr->removeListenerByData (this);
@@ -144,28 +144,28 @@ attach_all (Gtk::Table &table, const Gtk::Widget *arr[], unsigned size, int star
     {
         if (arr[i] && arr[i+1])
         {
-            table.attach (const_cast<Gtk::Widget&>(*arr[i]),   1, 2, r, r+1, 
+            table.attach (const_cast<Gtk::Widget&>(*arr[i]),   1, 2, r, r+1,
                       Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
-            table.attach (const_cast<Gtk::Widget&>(*arr[i+1]), 2, 3, r, r+1, 
+            table.attach (const_cast<Gtk::Widget&>(*arr[i+1]), 2, 3, r, r+1,
                       Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
         }
         else
         {
             if (arr[i+1])
-                table.attach (const_cast<Gtk::Widget&>(*arr[i+1]), 1, 3, r, r+1, 
+                table.attach (const_cast<Gtk::Widget&>(*arr[i+1]), 1, 3, r, r+1,
                       Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
             else if (arr[i])
             {
                 Gtk::Label& label = static_cast<Gtk::Label&> (const_cast<Gtk::Widget&>(*arr[i]));
                 label.set_alignment (0.0);
-                table.attach (label, 0, 3, r, r+1, 
+                table.attach (label, 0, 3, r, r+1,
                       Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0);
             }
             else
             {
                 Gtk::HBox *space = manage (new Gtk::HBox);
                 space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y);
-                table.attach (*space, 0, 1, r, r+1, 
+                table.attach (*space, 0, 1, r, r+1,
                       (Gtk::AttachOptions)0, (Gtk::AttachOptions)0,0,0);
             }
         }
@@ -220,7 +220,7 @@ void
 DocumentMetadata::update()
 {
     if (_wr.isUpdating()) return;
-    
+
     _wr.setUpdating (true);
     set_sensitive (true);
 
@@ -228,7 +228,7 @@ DocumentMetadata::update()
     /* update the RDF entities */
     for (RDElist::iterator it = _rdflist.begin(); it != _rdflist.end(); it++)
         (*it)->update (SP_ACTIVE_DOCUMENT);
-        
+
     _licensor.update (SP_ACTIVE_DOCUMENT);
 
     _wr.setUpdating (false);
@@ -255,8 +255,8 @@ on_repr_attr_changed (Inkscape::XML::Node *, gchar const *, gchar const *, gchar
     _instance->update();
 }
 
-static void 
-on_activate_desktop (Inkscape::Application *, SPDesktop* dt, void*)
+static void
+on_activate_desktop (Inkscape::Application *, SPDesktop* /*dt*/, void*)
 {
     if (!_instance)
         return;
@@ -267,8 +267,8 @@ on_activate_desktop (Inkscape::Application *, SPDesktop* dt, void*)
     _instance->update();
 }
 
-static void 
-on_deactivate_desktop (Inkscape::Application *, SPDesktop* dt, void*)
+static void
+on_deactivate_desktop (Inkscape::Application *, SPDesktop* /*dt*/, void*)
 {
     if (!_instance)
         return;
@@ -278,8 +278,8 @@ on_deactivate_desktop (Inkscape::Application *, SPDesktop* dt, void*)
     _instance->_doc_replaced_connection.disconnect();
 }
 
-static void 
-on_doc_replaced (SPDesktop* dt, SPDocument* doc)
+static void
+on_doc_replaced (SPDesktop* dt, SPDocument* /*doc*/)
 {
     if (!_instance)
         return;
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 4f8db942d..f8192dc8c 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -90,10 +90,10 @@ DocumentProperties::destroy()
     }
 }
 
-DocumentProperties::DocumentProperties(Behavior::BehaviorFactory behavior_factory) 
+DocumentProperties::DocumentProperties(Behavior::BehaviorFactory behavior_factory)
     : Dialog (behavior_factory, "dialogs.documentoptions", SP_VERB_DIALOG_NAMEDVIEW),
       _page_page(1, 1), _page_guides(1, 1),
-      _page_snap(1, 1), _page_grids(1, 1), _page_snap_dtls(1, 1),
+      _page_snap(1, 1), _page_snap_dtls(1, 1), _page_grids(1, 1),
       _grids_button_new(_("_New"), _("Create new grid.")),
       _grids_button_remove(_("_Remove"), _("Remove selected grid.")),
       _prefs_path("dialogs.documentoptions")
@@ -274,50 +274,50 @@ DocumentProperties::build_snap()
     _rcbsnn.init (_("_Nodes"),
                 _("Snap nodes to grid lines, to guides, to paths, and to other nodes"),
                 "inkscape:snap-nodes", _wr);
-    
+
     //Options for snapping to objects
     _rcbsnop.init (_("Snap to pat_hs"),
                 _("Snap nodes to object paths"),
                 "inkscape:object-paths", _wr);
     _rcbsnon.init (_("Snap to n_odes"),
                 _("Snap nodes and guides to object nodes"),
-                "inkscape:object-nodes", _wr); 
+                "inkscape:object-nodes", _wr);
     _rcbsnbbn.init (_("Snap to bounding box co_rners"),
                 _("Snap bounding box corners to other bounding box corners"),
                 "inkscape:bbox-nodes", _wr);
     _rcbsnbbp.init (_("Snap to bounding box _edges"),
                 _("Snap bounding box corners and guides to bounding box edges"),
-                "inkscape:bbox-paths", _wr);    
-       
+                "inkscape:bbox-paths", _wr);
+
     _rsu_sno.init (_("Snap _distance"), _("Snap at any d_istance"),
                   _("Snapping distance, in screen pixels, for snapping to objects"),
                   _("If set, objects snap to the nearest object, regardless of distance"),
                   "objecttolerance", _wr);
-    
+
     //Options for snapping to grids
     _rsu_sn.init (_("Snap di_stance"), _("Snap at any dis_tance"),
                   _("Snapping distance, in screen pixels, for snapping to grid"),
                   _("If set, objects snap to the nearest grid line, regardless of distance"),
                   "gridtolerance", _wr);
-                  
-	//Options for snapping to guides                  
+
+	//Options for snapping to guides
     _rsu_gusn.init (_("Snap dist_ance"), _("Snap at any distan_ce"),
                 _("Snapping distance, in screen pixels, for snapping to guides"),
                 _("If set, objects snap to the nearest guide, regardless of distance"),
                 "guidetolerance", _wr);
-                
-    //Other options to locate here: e.g. visual snapping indicators on/off 
-                
+
+    //Other options to locate here: e.g. visual snapping indicators on/off
+
     std::list<Gtk::ToggleButton*> slaves;
     slaves.push_back(_rcbsnop._button);
     slaves.push_back(_rcbsnon._button);
     _rcbsnn.setSlaveButton(slaves);
-    
+
     slaves.clear();
     slaves.push_back(_rcbsnbbp._button);
     slaves.push_back(_rcbsnbbn._button);
     _rcbsnbb.setSlaveButton(slaves);
-                
+
     Gtk::Label *label_g = manage (new Gtk::Label);
     label_g->set_markup (_("<b>Snapping of</b>"));
     Gtk::Label *label_o = manage (new Gtk::Label);
@@ -349,41 +349,41 @@ DocumentProperties::build_snap()
         0,                  _rsu_sn._vbox,
         0, 					0,
         label_gu,         	0,
-        0,                	_rsu_gusn._vbox        
+        0,                	_rsu_gusn._vbox
     };
 
     attach_all(_page_snap.table(), array, G_N_ELEMENTS(array));
  }
- 
+
 void
 DocumentProperties::build_snap_dtls()
 {
     _page_snap_dtls.show();
-    
+
     _rcbsng.init (_("_Snap guides while dragging"),
                 _("While dragging a guide, snap to object nodes or bounding box corners ('snap to nodes' or 'snap to bounding box corners', both on the previous tab, must be enabled)"),
                 "inkscape:snap-guide", _wr);
-    
+
     _rcbic.init (_("_Include the object's rotation center"),
                 _("Also snap the rotation center of an object when snapping nodes or guides"),
                 "inkscape:snap-center", _wr);
     //Applies to both nodes and guides, but not to bboxes, that's why its located here
-    
-    //Other options to locate here: e.g. visual snapping indicators on/off 
-                
+
+    //Other options to locate here: e.g. visual snapping indicators on/off
+
     Gtk::Label *label_i= manage (new Gtk::Label);
     label_i->set_markup (_("<b>Snapping to intersections</b>"));
     Gtk::Label *label_m = manage (new Gtk::Label);
     label_m->set_markup (_("<b>Miscellaneous</b>"));
-    
+
     Gtk::Widget *const array[] =
     {
         label_i,            0,
         0,                  0,
-        0,                  0,        
+        0,                  0,
         label_m,            0,
         0,                  _rcbsng._button,
-        0,                  _rcbic._button,                
+        0,                  _rcbic._button,
     };
 
     attach_all(_page_snap_dtls.table(), array, G_N_ELEMENTS(array));
@@ -432,12 +432,12 @@ DocumentProperties::build_gridspage()
     label_crea->set_markup (_("<b>Creation</b>"));
     Gtk::Label* label_crea_type = manage (new Gtk::Label);
     label_crea_type->set_markup (_("Gridtype"));
-    
+
     for (gint t = 0; t <= GRID_MAXTYPENR; t++) {
         _grids_combo_gridtype.append_text( CanvasGrid::getName( (GridType) t ) );
     }
     _grids_combo_gridtype.set_active_text( CanvasGrid::getName(GRID_RECTANGULAR) );
-    
+
     Gtk::Label* label_def = manage (new Gtk::Label);
     label_def->set_markup (_("<b>Defined grids</b>"));
 
@@ -450,7 +450,7 @@ DocumentProperties::build_gridspage()
     {
         label_crea, 0,
         label_crea_type, (Gtk::Widget*) &_grids_combo_gridtype,
-        (Gtk::Widget*) &_grids_button_new,         (Gtk::Widget*) &_grids_button_remove, 
+        (Gtk::Widget*) &_grids_button_new,         (Gtk::Widget*) &_grids_button_remove,
         label_def,         0
     };
     attach_all(_page_grids.table(), widget_array, G_N_ELEMENTS(widget_array));
@@ -494,7 +494,7 @@ DocumentProperties::update()
     _rcp_hgui.setRgba32 (nv->guidehicolor);
 
     //-----------------------------------------------------------snap
-    
+
     _rcbsnbb.setActive (nv->snap_manager.getSnapModeBBox());
     _rcbsnn.setActive (nv->snap_manager.getSnapModeNode());
     _rcbsng.setActive (nv->snap_manager.getSnapModeGuide());
@@ -502,7 +502,7 @@ DocumentProperties::update()
     _rcbsnop.setActive(nv->snap_manager.object.getSnapToItemPath());
     _rcbsnon.setActive(nv->snap_manager.object.getSnapToItemNode());
     _rcbsnbbp.setActive(nv->snap_manager.object.getSnapToBBoxPath());
-    _rcbsnbbn.setActive(nv->snap_manager.object.getSnapToBBoxNode());    
+    _rcbsnbbn.setActive(nv->snap_manager.object.getSnapToBBoxNode());
     _rsu_sno.setValue (nv->objecttolerance);
 
     _rsu_sn.setValue (nv->gridtolerance);
@@ -536,7 +536,7 @@ DocumentProperties::on_response (int id)
 
 
 static void
-on_child_added(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, void * data)
+on_child_added(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node */*child*/, Inkscape::XML::Node */*ref*/, void * /*data*/)
 {
     if (!_instance)
         return;
@@ -545,7 +545,7 @@ on_child_added(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::
 }
 
 static void
-on_child_removed(Inkscape::XML::Node *repr, Inkscape::XML::Node *child, Inkscape::XML::Node *ref, void * data)
+on_child_removed(Inkscape::XML::Node */*repr*/, Inkscape::XML::Node */*child*/, Inkscape::XML::Node */*ref*/, void * /*data*/)
 {
     if (!_instance)
         return;
@@ -568,7 +568,7 @@ on_repr_attr_changed (Inkscape::XML::Node *, gchar const *, gchar const *, gchar
 }
 
 static void
-on_activate_desktop (Inkscape::Application *, SPDesktop* dt, void*)
+on_activate_desktop (Inkscape::Application *, SPDesktop* /*dt*/, void*)
 {
     if (!_instance)
         return;
@@ -582,7 +582,7 @@ on_activate_desktop (Inkscape::Application *, SPDesktop* dt, void*)
 }
 
 static void
-on_deactivate_desktop (Inkscape::Application *, SPDesktop* dt, void*)
+on_deactivate_desktop (Inkscape::Application *, SPDesktop* /*dt*/, void*)
 {
     if (!_instance)
         return;
@@ -632,12 +632,12 @@ DocumentProperties::onRemoveGrid()
     gint pagenum = _grids_notebook.get_current_page();
     if (pagenum == -1) // no pages
       return;
-      
+
     Gtk::Widget *page = _grids_notebook.get_nth_page(pagenum);
     if (!page) return;
-    
+
     Glib::ustring tabtext = _grids_notebook.get_tab_label_text(*page);
-    
+
     // find the grid with name tabtext (it's id) and delete that one.
     SPDesktop *dt = SP_ACTIVE_DESKTOP;
     SPNamedView *nv = sp_desktop_namedview(dt);
diff --git a/src/ui/dialog/filedialogimpl-gtkmm.cpp b/src/ui/dialog/filedialogimpl-gtkmm.cpp
index ecedd8b8f..b47e26d12 100644
--- a/src/ui/dialog/filedialogimpl-gtkmm.cpp
+++ b/src/ui/dialog/filedialogimpl-gtkmm.cpp
@@ -888,11 +888,11 @@ std::vector<Glib::ustring>FileOpenDialogImplGtk::getFilenames()
 /**
  * Constructor
  */
-FileSaveDialogImplGtk::FileSaveDialogImplGtk(Gtk::Window &parentWindow,
-            const Glib::ustring &dir,
-            FileDialogType fileTypes,
-            const Glib::ustring &title,
-            const Glib::ustring &default_key) :
+FileSaveDialogImplGtk::FileSaveDialogImplGtk( Gtk::Window &parentWindow,
+                                              const Glib::ustring &dir,
+                                              FileDialogType fileTypes,
+                                              const Glib::ustring &title,
+                                              const Glib::ustring &/*default_key*/ ) :
     FileDialogBaseGtk(parentWindow, title, Gtk::FILE_CHOOSER_ACTION_SAVE, fileTypes, "dialogs.save_as")
 {
     /* One file at a time */
@@ -1364,11 +1364,11 @@ void FileExportDialogImpl::createFileTypeMenu()
 /**
  * Constructor
  */
-FileExportDialogImpl::FileExportDialogImpl(Gtk::Window& parentWindow,
-            const Glib::ustring &dir,
-            FileDialogType fileTypes,
-            const Glib::ustring &title,
-            const Glib::ustring &default_key) :
+FileExportDialogImpl::FileExportDialogImpl( Gtk::Window& parentWindow,
+                                            const Glib::ustring &dir,
+                                            FileDialogType fileTypes,
+                                            const Glib::ustring &title,
+                                            const Glib::ustring &/*default_key*/ ) :
             FileDialogBaseGtk(parentWindow, title, Gtk::FILE_CHOOSER_ACTION_SAVE, fileTypes, "dialogs.export"),
             sourceX0Spinner("X0",         _("Left edge of source")),
             sourceY0Spinner("Y0",         _("Top edge of source")),
diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index 81c5d824b..85dc05c55 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -1,5 +1,5 @@
 /**
- * \brief Fill and Stroke dialog, 
+ * \brief Fill and Stroke dialog,
  * based on sp_object_properties_dialog
  *
  * Authors:
@@ -39,23 +39,23 @@ namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
-void on_selection_changed(Inkscape::Application *inkscape, 
+void on_selection_changed(Inkscape::Application *inkscape,
                           Inkscape::Selection *selection,
                           FillAndStroke *dlg)
 {
     dlg->selectionChanged(inkscape, selection);
 }
 
-void on_selection_modified(Inkscape::Application *inkscape, 
-                           Inkscape::Selection *selection, 
-                           guint flags,
+void on_selection_modified(Inkscape::Application *inkscape,
+                           Inkscape::Selection *selection,
+                           guint /*flags*/,
                            FillAndStroke *dlg)
 {
     dlg->selectionChanged(inkscape, selection);
 }
 
 
-FillAndStroke::FillAndStroke(Behavior::BehaviorFactory behavior_factory) 
+FillAndStroke::FillAndStroke(Behavior::BehaviorFactory behavior_factory)
     : Dialog (behavior_factory, "dialogs.fillstroke", SP_VERB_DIALOG_FILL_STROKE),
       _page_fill(1, 1, true, true),
       _page_stroke_paint(1, 1, true, true),
@@ -90,7 +90,7 @@ FillAndStroke::FillAndStroke(Behavior::BehaviorFactory behavior_factory)
     _fe_vbox.pack_start(_fe_alignment, false, false, 0);
 
     _fe_cb.signal_blend_blur_changed().connect(sigc::mem_fun(*this, &Inkscape::UI::Dialog::FillAndStroke::_blendBlurValueChanged));
-    
+
     // Opacity
     vbox->pack_start(_opacity_vbox, false, false, 2);
     _opacity_label_box.pack_start(_opacity_label, false, false, 4);
@@ -112,7 +112,7 @@ FillAndStroke::FillAndStroke(Behavior::BehaviorFactory behavior_factory)
     show_all_children();
 }
 
-FillAndStroke::~FillAndStroke() 
+FillAndStroke::~FillAndStroke()
 {
 }
 
@@ -174,7 +174,7 @@ FillAndStroke::_blendBlurValueChanged()
 
     // FIXME: fix for GTK breakage, see comment in SelectedStyle::on_opacity_changed; here it results in crash 1580903
     sp_canvas_force_full_redraw_after_interruptions(sp_desktop_canvas(desktop), 0);
-    
+
     //get current selection
     Inkscape::Selection *selection = sp_desktop_selection (desktop);
 
@@ -194,14 +194,14 @@ FillAndStroke::_blendBlurValueChanged()
 
     SPFilter *filter = 0;
     const bool remfilter = (blendmode == "normal" && radius == 0) || (blendmode == "filter" && !filter);
-        
+
     if(blendmode != "filter" || filter) {
         //apply created filter to every selected item
         for (GSList const *i = items; i != NULL; i = i->next) {
             SPItem * item = SP_ITEM(i->data);
             SPStyle *style = SP_OBJECT_STYLE(item);
             g_assert(style != NULL);
-            
+
             if(remfilter) {
                 remove_filter (item, false);
             }
@@ -210,7 +210,7 @@ FillAndStroke::_blendBlurValueChanged()
                     filter = new_filter_simple_from_item(document, item, blendmode.c_str(), radius);
                 sp_style_set_property_url (SP_OBJECT(item), "filter", SP_OBJECT(filter), false);
             }
-            
+
             //request update
             SP_OBJECT(item)->requestDisplayUpdate(( SP_OBJECT_MODIFIED_FLAG |
                                                     SP_OBJECT_STYLE_MODIFIED_FLAG ));
@@ -247,7 +247,7 @@ FillAndStroke::_opacityValueChanged()
 
     sp_repr_css_attr_unref (css);
 
-    sp_document_maybe_done (sp_desktop_document (SP_ACTIVE_DESKTOP), "fillstroke:opacity", SP_VERB_DIALOG_FILL_STROKE, 
+    sp_document_maybe_done (sp_desktop_document (SP_ACTIVE_DESKTOP), "fillstroke:opacity", SP_VERB_DIALOG_FILL_STROKE,
                             _("Change opacity"));
 
     // resume interruptibility
@@ -257,8 +257,8 @@ FillAndStroke::_opacityValueChanged()
 }
 
 void
-FillAndStroke::selectionChanged(Inkscape::Application *inkscape,
-                                Inkscape::Selection *selection)
+FillAndStroke::selectionChanged(Inkscape::Application */*inkscape*/,
+                                Inkscape::Selection */*selection*/)
 {
     if (_blocked)
         return;
@@ -276,7 +276,7 @@ FillAndStroke::selectionChanged(Inkscape::Application *inkscape,
             break;
         case QUERY_STYLE_SINGLE:
         case QUERY_STYLE_MULTIPLE_AVERAGED: // TODO: treat this slightly differently
-        case QUERY_STYLE_MULTIPLE_SAME: 
+        case QUERY_STYLE_MULTIPLE_SAME:
             _opacity_hbox.set_sensitive(true);
             _opacity_adjustment.set_value(100 * SP_SCALE24_TO_FLOAT(query->opacity.value));
             break;
@@ -307,7 +307,7 @@ FillAndStroke::selectionChanged(Inkscape::Application *inkscape,
                 break;
             case QUERY_STYLE_SINGLE:
             case QUERY_STYLE_MULTIPLE_AVERAGED:
-            case QUERY_STYLE_MULTIPLE_SAME: 
+            case QUERY_STYLE_MULTIPLE_SAME:
                 NR::Maybe<NR::Rect> bbox = sp_desktop_selection(SP_ACTIVE_DESKTOP)->bounds();
                 if (bbox) {
                     double perimeter = bbox->extent(NR::X) + bbox->extent(NR::Y);
@@ -320,7 +320,7 @@ FillAndStroke::selectionChanged(Inkscape::Application *inkscape,
                 break;
         }
     }
-    
+
     sp_style_unref(query);
 
     _blocked = false;
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 6a492eed1..ecaf3a11b 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -958,7 +958,7 @@ void FilterEffectsDialog::FilterModifier::on_activate_desktop(Application*, SPDe
 
 
 // When the selection changes, show the active filter(s) in the dialog
-void FilterEffectsDialog::FilterModifier::on_inkscape_change_selection(Application *inkscape,
+void FilterEffectsDialog::FilterModifier::on_inkscape_change_selection(Application */*inkscape*/,
                                                                        Selection *sel,
                                                                        FilterModifier* fm)
 {
@@ -1182,7 +1182,7 @@ int FilterEffectsDialog::CellRendererConnection::get_text_width() const
 }
 
 void FilterEffectsDialog::CellRendererConnection::get_size_vfunc(
-    Gtk::Widget& widget, const Gdk::Rectangle* cell_area,
+    Gtk::Widget& widget, const Gdk::Rectangle* /*cell_area*/,
     int* x_offset, int* y_offset, int* width, int* height) const
 {
     PrimitiveList& primlist = dynamic_cast<PrimitiveList&>(widget);
@@ -1783,7 +1783,7 @@ void FilterEffectsDialog::PrimitiveList::sanitize_connections(const Gtk::TreeIte
 }
 
 // Reorder the filter primitives to match the list order
-void FilterEffectsDialog::PrimitiveList::on_drag_end(const Glib::RefPtr<Gdk::DragContext>& dc)
+void FilterEffectsDialog::PrimitiveList::on_drag_end(const Glib::RefPtr<Gdk::DragContext>& /*dc*/)
 {
     SPFilter* filter = _dialog._filter_modifier.get_selected_filter();
     int ndx = 0;
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index b60d7e357..ee12e652a 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -46,7 +46,7 @@ static void lpeeditor_selection_changed (Inkscape::Selection * selection, gpoint
     lpeeditor->onSelectionChanged(selection);
 }
 
-static void lpeeditor_selection_modified (Inkscape::Selection *selection, guint flags, gpointer data)
+static void lpeeditor_selection_modified( Inkscape::Selection *selection, guint /*flags*/, gpointer data )
 {
     lpeeditor_selection_changed (selection, data);
 }
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 0d7f04d7d..f62c6d4f9 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -51,7 +51,7 @@
 static gdouble const _sw_presets[]     = { 32 ,  16 ,  10 ,  8 ,  6 ,  4 ,  3 ,  2 ,  1.5 ,  1 ,  0.75 ,  0.5 ,  0.25 ,  0.1 };
 static gchar const *const _sw_presets_str[] = {"32", "16", "10", "8", "6", "4", "3", "2", "1.5", "1", "0.75", "0.5", "0.25", "0.1"};
 
-static void 
+static void
 ss_selection_changed (Inkscape::Selection *, gpointer data)
 {
     Inkscape::UI::Widget::SelectedStyle *ss = (Inkscape::UI::Widget::SelectedStyle *) data;
@@ -59,13 +59,13 @@ ss_selection_changed (Inkscape::Selection *, gpointer data)
 }
 
 static void
-ss_selection_modified (Inkscape::Selection *selection, guint flags, gpointer data)
+ss_selection_modified( Inkscape::Selection *selection, guint /*flags*/, gpointer data )
 {
     ss_selection_changed (selection, data);
 }
 
 static void
-ss_subselection_changed (gpointer dragger, gpointer data)
+ss_subselection_changed( gpointer /*dragger*/, gpointer data )
 {
     ss_selection_changed (NULL, data);
 }
@@ -93,7 +93,7 @@ static GtkTargetEntry ui_drop_target_entries [] = {
 static guint nui_drop_target_entries = ENTRIES_SIZE(ui_drop_target_entries);
 
 
-SelectedStyle::SelectedStyle(bool layout)
+SelectedStyle::SelectedStyle(bool /*layout*/)
     : _desktop (NULL),
 
       _table(2, 6),
@@ -201,52 +201,52 @@ SelectedStyle::SelectedStyle(bool layout)
         __multiple[i] = (i == SS_FILL)? (_("Multiple selected objects have the same fill")) : (_("Multiple selected objects have the same stroke"));
 
         _popup_edit[i].add(*(new Gtk::Label((i == SS_FILL)? _("Edit fill...") : _("Edit stroke..."), 0.0, 0.5)));
-        _popup_edit[i].signal_activate().connect(sigc::mem_fun(*this, 
+        _popup_edit[i].signal_activate().connect(sigc::mem_fun(*this,
                                (i == SS_FILL)? &SelectedStyle::on_fill_edit : &SelectedStyle::on_stroke_edit ));
 
         _popup_lastused[i].add(*(new Gtk::Label(_("Last set color"), 0.0, 0.5)));
-        _popup_lastused[i].signal_activate().connect(sigc::mem_fun(*this, 
+        _popup_lastused[i].signal_activate().connect(sigc::mem_fun(*this,
                                (i == SS_FILL)? &SelectedStyle::on_fill_lastused : &SelectedStyle::on_stroke_lastused ));
 
         _popup_lastselected[i].add(*(new Gtk::Label(_("Last selected color"), 0.0, 0.5)));
-        _popup_lastselected[i].signal_activate().connect(sigc::mem_fun(*this, 
+        _popup_lastselected[i].signal_activate().connect(sigc::mem_fun(*this,
                                (i == SS_FILL)? &SelectedStyle::on_fill_lastselected : &SelectedStyle::on_stroke_lastselected ));
 
         _popup_invert[i].add(*(new Gtk::Label(_("Invert"), 0.0, 0.5)));
-        _popup_invert[i].signal_activate().connect(sigc::mem_fun(*this, 
+        _popup_invert[i].signal_activate().connect(sigc::mem_fun(*this,
                                (i == SS_FILL)? &SelectedStyle::on_fill_invert : &SelectedStyle::on_stroke_invert ));
 
         _popup_white[i].add(*(new Gtk::Label(_("White"), 0.0, 0.5)));
-        _popup_white[i].signal_activate().connect(sigc::mem_fun(*this, 
+        _popup_white[i].signal_activate().connect(sigc::mem_fun(*this,
                                (i == SS_FILL)? &SelectedStyle::on_fill_white : &SelectedStyle::on_stroke_white ));
 
         _popup_black[i].add(*(new Gtk::Label(_("Black"), 0.0, 0.5)));
-        _popup_black[i].signal_activate().connect(sigc::mem_fun(*this, 
+        _popup_black[i].signal_activate().connect(sigc::mem_fun(*this,
                                (i == SS_FILL)? &SelectedStyle::on_fill_black : &SelectedStyle::on_stroke_black ));
 
         _popup_copy[i].add(*(new Gtk::Label(_("Copy color"), 0.0, 0.5)));
-        _popup_copy[i].signal_activate().connect(sigc::mem_fun(*this, 
+        _popup_copy[i].signal_activate().connect(sigc::mem_fun(*this,
                                (i == SS_FILL)? &SelectedStyle::on_fill_copy : &SelectedStyle::on_stroke_copy ));
 
         _popup_paste[i].add(*(new Gtk::Label(_("Paste color"), 0.0, 0.5)));
-        _popup_paste[i].signal_activate().connect(sigc::mem_fun(*this, 
+        _popup_paste[i].signal_activate().connect(sigc::mem_fun(*this,
                                (i == SS_FILL)? &SelectedStyle::on_fill_paste : &SelectedStyle::on_stroke_paste ));
 
         _popup_swap[i].add(*(new Gtk::Label(_("Swap fill and stroke"), 0.0, 0.5)));
-        _popup_swap[i].signal_activate().connect(sigc::mem_fun(*this, 
+        _popup_swap[i].signal_activate().connect(sigc::mem_fun(*this,
                                &SelectedStyle::on_fillstroke_swap));
 
         _popup_opaque[i].add(*(new Gtk::Label((i == SS_FILL)? _("Make fill opaque") : _("Make stroke opaque"), 0.0, 0.5)));
-        _popup_opaque[i].signal_activate().connect(sigc::mem_fun(*this, 
+        _popup_opaque[i].signal_activate().connect(sigc::mem_fun(*this,
                                (i == SS_FILL)? &SelectedStyle::on_fill_opaque : &SelectedStyle::on_stroke_opaque ));
 
         //TRANSLATORS COMMENT: unset is a verb here
         _popup_unset[i].add(*(new Gtk::Label((i == SS_FILL)? _("Unset fill") : _("Unset stroke"), 0.0, 0.5)));
-        _popup_unset[i].signal_activate().connect(sigc::mem_fun(*this, 
+        _popup_unset[i].signal_activate().connect(sigc::mem_fun(*this,
                                (i == SS_FILL)? &SelectedStyle::on_fill_unset : &SelectedStyle::on_stroke_unset ));
 
         _popup_remove[i].add(*(new Gtk::Label((i == SS_FILL)? _("Remove fill") : _("Remove stroke"), 0.0, 0.5)));
-        _popup_remove[i].signal_activate().connect(sigc::mem_fun(*this, 
+        _popup_remove[i].signal_activate().connect(sigc::mem_fun(*this,
                                (i == SS_FILL)? &SelectedStyle::on_fill_remove : &SelectedStyle::on_stroke_remove ));
 
         _popup[i].attach(_popup_edit[i], 0,1, 0,1);
@@ -263,7 +263,7 @@ SelectedStyle::SelectedStyle(bool layout)
         _popup_copy[i].set_sensitive(false);
         _popup[i].attach(_popup_paste[i], 0,1, 11,12);
         _popup[i].attach(_popup_swap[i], 0,1, 12,13);
-          _popup[i].attach(*(new Gtk::SeparatorMenuItem()), 0,1, 13,14); 
+          _popup[i].attach(*(new Gtk::SeparatorMenuItem()), 0,1, 13,14);
         _popup[i].attach(_popup_opaque[i], 0,1, 14,15);
         _popup[i].attach(_popup_unset[i], 0,1, 15,16);
         _popup[i].attach(_popup_remove[i], 0,1, 16,17);
@@ -388,7 +388,7 @@ SelectedStyle::~SelectedStyle()
 
     for (int i = SS_FILL; i <= SS_STROKE; i++) {
         delete _color_preview[i];
-        // FIXME: do we need this? the destroy methods are not exported 
+        // FIXME: do we need this? the destroy methods are not exported
         //sp_gradient_image_destroy(GTK_OBJECT(_gradient_preview_l[i]));
         //sp_gradient_image_destroy(GTK_OBJECT(_gradient_preview_r[i]));
     }
@@ -424,12 +424,12 @@ SelectedStyle::setDesktop(SPDesktop *desktop)
     //_sw_unit = (SPUnit *) sp_desktop_namedview(desktop)->doc_units;
 }
 
-void SelectedStyle::dragDataReceived( GtkWidget *widget,
-                                      GdkDragContext *drag_context,
-                                      gint x, gint y,
+void SelectedStyle::dragDataReceived( GtkWidget */*widget*/,
+                                      GdkDragContext */*drag_context*/,
+                                      gint /*x*/, gint /*y*/,
                                       GtkSelectionData *data,
-                                      guint info,
-                                      guint event_time,
+                                      guint /*info*/,
+                                      guint /*event_time*/,
                                       gpointer user_data )
 {
     DropTracker* tracker = (DropTracker*)user_data;
@@ -454,7 +454,7 @@ void SelectedStyle::dragDataReceived( GtkWidget *widget,
                 sp_repr_css_set_property( css, (tracker->item == SS_FILL) ? "fill":"stroke", c );
                 sp_desktop_set_style( tracker->parent->_desktop, css );
                 sp_repr_css_attr_unref( css );
-                sp_document_done( sp_desktop_document(tracker->parent->_desktop) , SP_VERB_NONE, 
+                sp_document_done( sp_desktop_document(tracker->parent->_desktop) , SP_VERB_NONE,
                                   _("Drop color"));
             }
         }
@@ -465,7 +465,7 @@ void SelectedStyle::dragDataReceived( GtkWidget *widget,
 void SelectedStyle::on_fill_remove() {
     SPCSSAttr *css = sp_repr_css_attr_new ();
     sp_repr_css_set_property (css, "fill", "none");
-    sp_desktop_set_style (_desktop, css, true, true); 
+    sp_desktop_set_style (_desktop, css, true, true);
     sp_repr_css_attr_unref (css);
     sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
                       _("Remove fill"));
@@ -474,7 +474,7 @@ void SelectedStyle::on_fill_remove() {
 void SelectedStyle::on_stroke_remove() {
     SPCSSAttr *css = sp_repr_css_attr_new ();
     sp_repr_css_set_property (css, "stroke", "none");
-    sp_desktop_set_style (_desktop, css, true, true); 
+    sp_desktop_set_style (_desktop, css, true, true);
     sp_repr_css_attr_unref (css);
     sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
                       _("Remove stroke"));
@@ -483,7 +483,7 @@ void SelectedStyle::on_stroke_remove() {
 void SelectedStyle::on_fill_unset() {
     SPCSSAttr *css = sp_repr_css_attr_new ();
     sp_repr_css_unset_property (css, "fill");
-    sp_desktop_set_style (_desktop, css, true, true); 
+    sp_desktop_set_style (_desktop, css, true, true);
     sp_repr_css_attr_unref (css);
     sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
                       _("Unset fill"));
@@ -531,7 +531,7 @@ void SelectedStyle::on_fill_lastused() {
     sp_repr_css_set_property (css, "fill", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
                       _("Apply last set color to fill"));
 }
 
@@ -543,7 +543,7 @@ void SelectedStyle::on_stroke_lastused() {
     sp_repr_css_set_property (css, "stroke", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
                       _("Apply last set color to stroke"));
 }
 
@@ -565,7 +565,7 @@ void SelectedStyle::on_stroke_lastselected() {
     sp_repr_css_set_property (css, "stroke", c);
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
                       _("Apply last selected color to stroke"));
 }
 
@@ -607,7 +607,7 @@ void SelectedStyle::on_stroke_invert() {
     sp_repr_css_attr_unref (css);
     sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
                       _("Invert stroke"));
-} 
+}
 
 void SelectedStyle::on_fill_white() {
     SPCSSAttr *css = sp_repr_css_attr_new ();
@@ -629,7 +629,7 @@ void SelectedStyle::on_stroke_white() {
     sp_repr_css_set_property (css, "stroke-opacity", "1");
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
                       _("White stroke"));
 }
 
@@ -641,7 +641,7 @@ void SelectedStyle::on_fill_black() {
     sp_repr_css_set_property (css, "fill-opacity", "1.0");
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
                       _("Black fill"));
 }
 
@@ -653,7 +653,7 @@ void SelectedStyle::on_stroke_black() {
     sp_repr_css_set_property (css, "stroke-opacity", "1.0");
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
                       _("Black stroke"));
 }
 
@@ -696,7 +696,7 @@ void SelectedStyle::on_fill_paste() {
         sp_repr_css_set_property (css, "fill", text.c_str());
         sp_desktop_set_style (_desktop, css);
         sp_repr_css_attr_unref (css);
-        sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+        sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
                       _("Paste fill"));
     }
 }
@@ -768,7 +768,7 @@ void SelectedStyle::on_fillstroke_swap() {
 
     sp_desktop_set_style (_desktop, css);
     sp_repr_css_attr_unref (css);
-    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, 
+    sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE,
                       _("Swap fill and stroke"));
 }
 
@@ -784,7 +784,7 @@ void SelectedStyle::on_stroke_edit() {
         dialog->showPageStrokePaint();
 }
 
-bool 
+bool
 SelectedStyle::on_fill_click(GdkEventButton *event)
 {
     if (event->button == 1) { // click, open fill&stroke
@@ -805,7 +805,7 @@ SelectedStyle::on_fill_click(GdkEventButton *event)
     return true;
 }
 
-bool 
+bool
 SelectedStyle::on_stroke_click(GdkEventButton *event)
 {
     if (event->button == 1) { // click, open fill&stroke
@@ -824,7 +824,7 @@ SelectedStyle::on_stroke_click(GdkEventButton *event)
     return true;
 }
 
-bool 
+bool
 SelectedStyle::on_sw_click(GdkEventButton *event)
 {
     if (event->button == 1) { // click, open fill&stroke
@@ -839,7 +839,7 @@ SelectedStyle::on_sw_click(GdkEventButton *event)
     return true;
 }
 
-bool 
+bool
 SelectedStyle::on_opacity_click(GdkEventButton *event)
 {
     if (event->button == 2) { // middle click
@@ -912,7 +912,7 @@ SelectedStyle::update()
         _popup_copy[i].set_sensitive(false);
 
         // query style from desktop. This returns a result flag and fills query with the style of subselection, if any, or selection
-        int result = sp_desktop_query_style (_desktop, query, 
+        int result = sp_desktop_query_style (_desktop, query,
                                              (i == SS_FILL)? QUERY_STYLE_PROPERTY_FILL : QUERY_STYLE_PROPERTY_STROKE);
         switch (result) {
         case QUERY_STYLE_NOTHING:
@@ -926,7 +926,7 @@ SelectedStyle::update()
             break;
         case QUERY_STYLE_SINGLE:
         case QUERY_STYLE_MULTIPLE_AVERAGED:
-        case QUERY_STYLE_MULTIPLE_SAME: 
+        case QUERY_STYLE_MULTIPLE_SAME:
             if ( !_dropEnabled[i] ) {
                 gtk_drag_dest_set( GTK_WIDGET( (i==SS_FILL) ? _fill_place.gobj():_stroke_place.gobj()),
                                    GTK_DEST_DEFAULT_ALL,
@@ -1043,7 +1043,7 @@ SelectedStyle::update()
         break;
     case QUERY_STYLE_SINGLE:
     case QUERY_STYLE_MULTIPLE_AVERAGED:
-    case QUERY_STYLE_MULTIPLE_SAME: 
+    case QUERY_STYLE_MULTIPLE_SAME:
     {
         double w;
         if (_sw_unit) {
@@ -1057,9 +1057,9 @@ SelectedStyle::update()
             g_free (str);
         }
         {
-            gchar *str = g_strdup_printf(_("Stroke width: %.5g%s%s"), 
-                                         w, 
-                                         _sw_unit? sp_unit_get_abbreviation(_sw_unit) : "px", 
+            gchar *str = g_strdup_printf(_("Stroke width: %.5g%s%s"),
+                                         w,
+                                         _sw_unit? sp_unit_get_abbreviation(_sw_unit) : "px",
                                          (result_sw == QUERY_STYLE_MULTIPLE_AVERAGED)?
                                          _(" (averaged)") : "");
             _tooltips.set_tip(_stroke_width_place, str);
@@ -1183,9 +1183,9 @@ RotateableSwatch::color_adjust(float *hsl, double by, guint32 cc, guint modifier
     } else { // hue
         double old = hsl[0];
         hsl[0] += by/2;
-        while (hsl[0] < 0) 
+        while (hsl[0] < 0)
             hsl[0] += 1;
-        while (hsl[0] > 1) 
+        while (hsl[0] > 1)
             hsl[0] -= 1;
         diff = hsl[0] - old;
     }
@@ -1206,7 +1206,7 @@ RotateableSwatch::color_adjust(float *hsl, double by, guint32 cc, guint modifier
     SPCSSAttr *css = sp_repr_css_attr_new ();
     if (fillstroke == SS_FILL)
         sp_repr_css_set_property (css, "fill", c);
-    else 
+    else
         sp_repr_css_set_property (css, "stroke", c);
     sp_desktop_set_style (parent->getDesktop(), css);
     sp_repr_css_attr_unref (css);
@@ -1215,7 +1215,7 @@ RotateableSwatch::color_adjust(float *hsl, double by, guint32 cc, guint modifier
 
 void
 RotateableSwatch::do_motion(double by, guint modifier) {
-    if (parent->_mode[fillstroke] != SS_COLOR) 
+    if (parent->_mode[fillstroke] != SS_COLOR)
         return;
 
     if (!cr_set && modifier != 3) {
@@ -1259,19 +1259,19 @@ RotateableSwatch::do_motion(double by, guint modifier) {
     if (modifier == 3) { // do nothing
 
     } else if (modifier == 2) { // saturation
-        sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey, 
+        sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey,
                                 SP_VERB_DIALOG_FILL_STROKE, (_("Adjust saturation")));
         double ch = hsl[1];
         parent->getDesktop()->event_context->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Adusting <b>saturation</b>: was %.3g, now <b>%.3g</b> (diff %.3g); without modifiers to adjust hue, with <b>Ctrl</b> to adjust lightness"), ch - diff, ch, diff);
 
     } else if (modifier == 1) { // lightness
-        sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey, 
+        sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey,
                                 SP_VERB_DIALOG_FILL_STROKE, (_("Adjust lightness")));
         double ch = hsl[2];
         parent->getDesktop()->event_context->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Adusting <b>lightness</b>: was %.3g, now <b>%.3g</b> (diff %.3g); without modifiers to adjust hue, with <b>Shift</b> to adjust saturation"), ch - diff, ch, diff);
 
     } else { // hue
-        sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey, 
+        sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey,
                                 SP_VERB_DIALOG_FILL_STROKE, (_("Adjust hue")));
         double ch = hsl[0];
         parent->getDesktop()->event_context->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Adusting <b>hue</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Shift</b> to adjust saturation, with <b>Ctrl</b> to adjust lightness"), ch - diff, ch, diff);
@@ -1280,7 +1280,7 @@ RotateableSwatch::do_motion(double by, guint modifier) {
 
 void
 RotateableSwatch::do_release(double by, guint modifier) {
-    if (parent->_mode[fillstroke] != SS_COLOR) 
+    if (parent->_mode[fillstroke] != SS_COLOR)
         return;
 
     float hsl[3];
@@ -1300,15 +1300,15 @@ RotateableSwatch::do_release(double by, guint modifier) {
 
     if (modifier == 3) { // nothing
     } else if (modifier == 2) { // saturation
-        sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey, 
+        sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey,
                                 SP_VERB_DIALOG_FILL_STROKE, ("Adjust saturation"));
 
     } else if (modifier == 1) { // lightness
-        sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey, 
+        sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey,
                                 SP_VERB_DIALOG_FILL_STROKE, ("Adjust lightness"));
 
     } else { // hue
-        sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey, 
+        sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey,
                                 SP_VERB_DIALOG_FILL_STROKE, ("Adjust hue"));
     }
 
@@ -1327,7 +1327,7 @@ RotateableSwatch::do_release(double by, guint modifier) {
 } // namespace UI
 } // namespace Inkscape
 
-/* 
+/*
   Local Variables:
   mode:c++
   c-file-style:"stroustrup"