Warning cleanup.

(bzr r13657)

5 files changed, 25 insertions, 29 deletions

diff --git a/src/ui/widget/addtoicon.cpp b/src/ui/widget/addtoicon.cpp
index ce665295b..0798d1c98 100644
--- a/src/ui/widget/addtoicon.cpp
+++ b/src/ui/widget/addtoicon.cpp
@@ -127,13 +127,12 @@ void AddToIcon::render_vfunc( const Glib::RefPtr<Gdk::Drawable>& window,
 #endif
 }
 
-bool
-AddToIcon::activate_vfunc(GdkEvent* event,
-                            Gtk::Widget& /*widget*/,
-                            const Glib::ustring& path,
-                            const Gdk::Rectangle& /*background_area*/,
-                            const Gdk::Rectangle& /*cell_area*/,
-                            Gtk::CellRendererState /*flags*/)
+bool AddToIcon::activate_vfunc(GdkEvent* /*event*/,
+                               Gtk::Widget& /*widget*/,
+                               const Glib::ustring& /*path*/,
+                               const Gdk::Rectangle& /*background_area*/,
+                               const Gdk::Rectangle& /*cell_area*/,
+                               Gtk::CellRendererState /*flags*/)
 {
     return false;
 }
diff --git a/src/ui/widget/clipmaskicon.cpp b/src/ui/widget/clipmaskicon.cpp
index 6331d70d8..943b1bebc 100644
--- a/src/ui/widget/clipmaskicon.cpp
+++ b/src/ui/widget/clipmaskicon.cpp
@@ -154,13 +154,12 @@ void ClipMaskIcon::render_vfunc( const Glib::RefPtr<Gdk::Drawable>& window,
 #endif
 }
 
-bool
-ClipMaskIcon::activate_vfunc(GdkEvent* event,
-                            Gtk::Widget& /*widget*/,
-                            const Glib::ustring& path,
-                            const Gdk::Rectangle& /*background_area*/,
-                            const Gdk::Rectangle& /*cell_area*/,
-                            Gtk::CellRendererState /*flags*/)
+bool ClipMaskIcon::activate_vfunc(GdkEvent* /*event*/,
+                                  Gtk::Widget& /*widget*/,
+                                  const Glib::ustring& /*path*/,
+                                  const Gdk::Rectangle& /*background_area*/,
+                                  const Gdk::Rectangle& /*cell_area*/,
+                                  Gtk::CellRendererState /*flags*/)
 {
     return false;
 }
diff --git a/src/ui/widget/highlight-picker.cpp b/src/ui/widget/highlight-picker.cpp
index 8593f0bdf..09999b52d 100644
--- a/src/ui/widget/highlight-picker.cpp
+++ b/src/ui/widget/highlight-picker.cpp
@@ -147,13 +147,12 @@ void HighlightPicker::render_vfunc( const Glib::RefPtr<Gdk::Drawable>& window,
 #endif
 }
 
-bool
-HighlightPicker::activate_vfunc(GdkEvent* event,
-                            Gtk::Widget& /*widget*/,
-                            const Glib::ustring& path,
-                            const Gdk::Rectangle& /*background_area*/,
-                            const Gdk::Rectangle& /*cell_area*/,
-                            Gtk::CellRendererState /*flags*/)
+bool HighlightPicker::activate_vfunc(GdkEvent* /*event*/,
+                                     Gtk::Widget& /*widget*/,
+                                     const Glib::ustring& /*path*/,
+                                     const Gdk::Rectangle& /*background_area*/,
+                                     const Gdk::Rectangle& /*cell_area*/,
+                                     Gtk::CellRendererState /*flags*/)
 {    
     return false;
 }
diff --git a/src/ui/widget/insertordericon.cpp b/src/ui/widget/insertordericon.cpp
index a28b0f834..9aec7d135 100644
--- a/src/ui/widget/insertordericon.cpp
+++ b/src/ui/widget/insertordericon.cpp
@@ -135,13 +135,12 @@ void InsertOrderIcon::render_vfunc( const Glib::RefPtr<Gdk::Drawable>& window,
 #endif
 }
 
-bool
-InsertOrderIcon::activate_vfunc(GdkEvent* event,
-                            Gtk::Widget& /*widget*/,
-                            const Glib::ustring& path,
-                            const Gdk::Rectangle& /*background_area*/,
-                            const Gdk::Rectangle& /*cell_area*/,
-                            Gtk::CellRendererState /*flags*/)
+bool InsertOrderIcon::activate_vfunc(GdkEvent* /*event*/,
+                                     Gtk::Widget& /*widget*/,
+                                     const Glib::ustring& /*path*/,
+                                     const Gdk::Rectangle& /*background_area*/,
+                                     const Gdk::Rectangle& /*cell_area*/,
+                                     Gtk::CellRendererState /*flags*/)
 {
     return false;
 }
diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp
index 44d8dcbf3..e97285de4 100644
--- a/src/ui/widget/registered-widget.cpp
+++ b/src/ui/widget/registered-widget.cpp
@@ -108,7 +108,7 @@ RegisteredToggleButton::~RegisteredToggleButton()
     _toggled_connection.disconnect();
 }
 
-RegisteredToggleButton::RegisteredToggleButton (const Glib::ustring& label, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right, Inkscape::XML::Node* repr_in, SPDocument *doc_in, char const *active_str, char const *inactive_str)
+RegisteredToggleButton::RegisteredToggleButton (const Glib::ustring& /*label*/, const Glib::ustring& tip, const Glib::ustring& key, Registry& wr, bool right, Inkscape::XML::Node* repr_in, SPDocument *doc_in, char const *active_str, char const *inactive_str)
     : RegisteredWidget<Gtk::ToggleButton>()
     , _active_str(active_str)
     , _inactive_str(inactive_str)