Fixing warnings.

(bzr r11414)

6 files changed, 34 insertions, 45 deletions

diff --git a/src/live_effects/lpe-ruler.cpp b/src/live_effects/lpe-ruler.cpp
index d7a393197..5947726f0 100644
--- a/src/live_effects/lpe-ruler.cpp
+++ b/src/live_effects/lpe-ruler.cpp
@@ -152,10 +152,10 @@ LPERuler::doEffect_pwd2 (Geom::Piecewise<Geom::D2<Geom::SBasis> > const & pwd2_i
             t_cuts.push_back(roots[v][0]);
     }
     //draw the marks
-    for (unsigned i=0; i<t_cuts.size(); i++){
+    for (size_t i = 0; i < t_cuts.size(); i++) {
         Point A = pwd2_in(t_cuts[i]);
         Point n = rot90(unit_vector(speed(t_cuts[i])))*sign;
-        if ((i % mminterval) == i_shift) {
+        if (static_cast<int>(i % mminterval) == i_shift) {
             output.concat (ruler_mark(A, n, MARK_MAJOR));
         } else {
             output.concat (ruler_mark(A, n, MARK_MINOR));
diff --git a/src/mesh-context.cpp b/src/mesh-context.cpp
index f522463cf..3a7b12969 100644
--- a/src/mesh-context.cpp
+++ b/src/mesh-context.cpp
@@ -344,8 +344,7 @@ sp_mesh_context_is_over_line (SPMeshContext *rc, SPItem *item, Geom::Point event
 /**
 Split row/column near the mouse point.
 */
-static void
-sp_mesh_context_split_near_point (SPMeshContext *rc, SPItem *item,  Geom::Point mouse_p, guint32 /*etime*/)
+static void sp_mesh_context_split_near_point(SPMeshContext *rc, SPItem *item,  Geom::Point mouse_p, guint32 /*etime*/)
 {
 
 #ifdef DEBUG_MESH
@@ -962,7 +961,7 @@ sp_mesh_context_root_handler(SPEventContext *event_context, GdkEvent *event)
 }
 
 
-static void sp_mesh_drag(SPMeshContext &rc, Geom::Point const pt, guint /*state*/, guint32 etime)
+static void sp_mesh_drag(SPMeshContext &rc, Geom::Point const /*pt*/, guint /*state*/, guint32 /*etime*/)
 {
 
     SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop;
diff --git a/src/mesh-context.h b/src/mesh-context.h
index b43a187e2..ed93e404f 100644
--- a/src/mesh-context.h
+++ b/src/mesh-context.h
@@ -1,5 +1,5 @@
-#ifndef __SP_MESH_CONTEXT_H__
-#define __SP_MESH_CONTEXT_H__
+#ifndef SEEN_SP_MESH_CONTEXT_H
+#define SEEN_SP_MESH_CONTEXT_H
 
 /*
  * Mesh drawing and editing tool
@@ -50,13 +50,13 @@ struct SPMeshContextClass {
     SPEventContextClass parent_class;
 };
 
-/* Standard Gtk function */
+// Standard Gtk function
 GType sp_mesh_context_get_type();
 
-void sp_mesh_context_select_next (SPEventContext *event_context);
-void sp_mesh_context_select_prev (SPEventContext *event_context);
-static void sp_mesh_context_split_near_point (SPMeshContext *rc, SPItem *item,  Geom::Point mouse_p, guint32 /*etime*/);
-#endif
+void sp_mesh_context_select_next(SPEventContext *event_context);
+void sp_mesh_context_select_prev(SPEventContext *event_context);
+
+#endif // SEEN_SP_MESH_CONTEXT_H
 
 
 /*
diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index d86b73e78..262c35db1 100644
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
@@ -414,8 +414,7 @@ static void sp_meshrow_class_init(SPMeshRowClass *klass)
 /**
  * Callback to initialize SPMeshRow object.
  */
-static void
-sp_meshrow_init(SPMeshRow *meshrow)
+static void sp_meshrow_init(SPMeshRow * /*meshrow*/)
 {
     // Do nothing
 }
@@ -434,8 +433,7 @@ static void sp_meshrow_build(SPObject *object, SPDocument *document, Inkscape::X
 /**
  * Virtual set: set attribute to value.
  */
-static void
-sp_meshrow_set(SPObject *object, unsigned key, gchar const *value)
+static void sp_meshrow_set(SPObject * /*object*/, unsigned /*key*/, gchar const * /*value*/)
 {
     // Do nothing
 }
@@ -503,8 +501,7 @@ static void sp_meshpatch_class_init(SPMeshPatchClass *klass)
 /**
  * Callback to initialize SPMeshPatch object.
  */
-static void
-sp_meshpatch_init(SPMeshPatch *meshpatch)
+static void sp_meshpatch_init(SPMeshPatch * /*meshpatch*/)
 {
     // Do nothing
 }
@@ -2043,13 +2040,17 @@ sp_radialgradient_create_pattern(SPPaintServer *ps,
     return cp;
 }
 
-static cairo_pattern_t *
-sp_meshgradient_create_pattern(SPPaintServer *ps,
-                               cairo_t */* ct */,
-                               Geom::OptRect const &bbox,
-                               double opacity)
+static cairo_pattern_t *sp_meshgradient_create_pattern(SPPaintServer *ps,
+                                                       cairo_t * /* ct */,
+#if defined(MESH_DEBUG) || (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 4))
+                                                       Geom::OptRect const &bbox,
+                                                       double opacity
+#else
+                                                       Geom::OptRect const & /*bbox*/,
+                                                       double /*opacity*/
+#endif
+    )
 {
-
     using Geom::X;
     using Geom::Y;
 
@@ -2061,11 +2062,10 @@ sp_meshgradient_create_pattern(SPPaintServer *ps,
 
     gr->ensureArray();
 
-    SPMeshNodeArray* array = &(gr->array);
-
     cairo_pattern_t *cp = NULL;
 
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 4)
+    SPMeshNodeArray* array = &(gr->array);
 
     cp = cairo_pattern_create_mesh();
 
diff --git a/src/sp-mesh-array.cpp b/src/sp-mesh-array.cpp
index 2db0ef2eb..ce87e8aff 100644
--- a/src/sp-mesh-array.cpp
+++ b/src/sp-mesh-array.cpp
@@ -1958,8 +1958,8 @@ guint SPMeshNodeArray::color_pick( std::vector<guint> icorners, SPItem* item ) {
    selected: list of all corners selected (draggable indices).
    op: how other corners should be moved.
 */
-void SPMeshNodeArray::update_handles( guint corner, std::vector< guint > selected, Geom::Point p_old, MeshNodeOperation op ) {
-
+void SPMeshNodeArray::update_handles( guint corner, std::vector< guint > /*selected*/, Geom::Point p_old, MeshNodeOperation /*op*/ )
+{
     assert( drag_valid );
 
     // std::cout << "SPMeshNodeArray::update_handles: "
@@ -2230,9 +2230,6 @@ void SPMeshNodeArray::update_handles( guint corner, std::vector< guint > selecte
 
 
     //         Geom::Point dsx1 = pnodes[0][1]->p - 
-
-
-
 }
 
 
diff --git a/src/widgets/mesh-toolbar.cpp b/src/widgets/mesh-toolbar.cpp
index 7c37d757c..066e2a02a 100644
--- a/src/widgets/mesh-toolbar.cpp
+++ b/src/widgets/mesh-toolbar.cpp
@@ -76,7 +76,7 @@ static gboolean blocked = FALSE;
 /*
  * Core function, setup all the widgets whenever something changes on the desktop
  */
-static void ms_tb_selection_changed(Inkscape::Selection * /*selection*/, gpointer data)
+static void ms_tb_selection_changed(Inkscape::Selection * /*selection*/, gpointer /*data*/)
 {
     // DOES NOTHING AT MOMENT
 
@@ -116,9 +116,9 @@ static void ms_drag_selection_changed(gpointer /*dragger*/, gpointer data)
 
 }
 
-static void ms_defs_release(SPObject * defs, GtkWidget *widget)
+static void ms_defs_release(SPObject * /*defs*/, GtkWidget *widget)
 {
-    ms_tb_selection_changed(NULL, (gpointer) widget);
+    ms_tb_selection_changed(NULL, widget);
 }
 
 static void ms_defs_modified(SPObject * /*defs*/, guint /*flags*/, GtkWidget *widget)
@@ -150,8 +150,8 @@ static void ms_new_fillstroke_changed( EgeSelectOneAction *act, GObject * /*tbl*
     prefs->setInt("/tools/gradient/newfillorstroke", (fsmode == Inkscape::FOR_FILL) ? 1 : 0);
 }
 
-static void ms_row_changed (GtkAdjustment *adj, GObject *tbl ) {
-
+static void ms_row_changed(GtkAdjustment *adj, GObject * /*tbl*/ )
+{
     if (blocked) {
         return;
     }
@@ -167,8 +167,8 @@ static void ms_row_changed (GtkAdjustment *adj, GObject *tbl ) {
     blocked = FALSE;
 }
 
-static void ms_col_changed (GtkAdjustment *adj, GObject *tbl ) {
-
+static void ms_col_changed(GtkAdjustment *adj, GObject * /*tbl*/ )
+{
     if (blocked) {
         return;
     }
@@ -184,13 +184,6 @@ static void ms_col_changed (GtkAdjustment *adj, GObject *tbl ) {
     blocked = FALSE;
 }
 
-static void ms_edit_fillstroke_changed( EgeSelectOneAction *act, GObject * /*tbl*/ )
-{
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    Inkscape::PaintTarget fsmode = (ege_select_one_action_get_active( act ) == 0) ? Inkscape::FOR_FILL : Inkscape::FOR_STROKE;
-    prefs->setInt("/tools/gradient/editfillorstroke", (fsmode == Inkscape::FOR_FILL) ? 1 : 0);
-}
-
 /**
  * Mesh auxiliary toolbar construction and setup.
  *