Cleaning up unused variables and other warnings.

(bzr r10972)

4 files changed, 13 insertions, 16 deletions

diff --git a/src/eraser-context.cpp b/src/eraser-context.cpp
index e77f31b85..628ad0164 100644
--- a/src/eraser-context.cpp
+++ b/src/eraser-context.cpp
@@ -395,7 +395,7 @@ sp_eraser_brush(SPEraserContext *dc)
     // get the real brush point, not the same as pointer (affected by hatch tracking and/or mass
     // drag)
     Geom::Point brush = sp_eraser_get_vpoint(dc, dc->cur);
-    Geom::Point brush_w = SP_EVENT_CONTEXT(dc)->desktop->d2w(brush); 
+    //Geom::Point brush_w = SP_EVENT_CONTEXT(dc)->desktop->d2w(brush); 
 
     double trace_thick = 1;
 
diff --git a/src/ui/dialog/ocaldialogs.cpp b/src/ui/dialog/ocaldialogs.cpp
index 5acd67929..c72f55862 100644
--- a/src/ui/dialog/ocaldialogs.cpp
+++ b/src/ui/dialog/ocaldialogs.cpp
@@ -513,9 +513,10 @@ void FileImportFromOCALDialog::searchTagEntryChangedCallback()
  */
 void FileImportFromOCALDialog::print_xml_element_names(xmlNode * a_node)
 {
-    xmlNode *cur_node = NULL;
+#ifdef WITH_GNOME_VFS
     guint row_num = 0;
-    for (cur_node = a_node; cur_node; cur_node = cur_node->next) {
+#endif
+    for (xmlNode *cur_node = a_node; cur_node; cur_node = cur_node->next) {
         // get itens information
         if (strcmp((const char*)cur_node->name, "rss")) //avoid the root
             if (cur_node->type == XML_ELEMENT_NODE && !strcmp((const char*)cur_node->parent->name, "item"))
@@ -523,10 +524,13 @@ void FileImportFromOCALDialog::print_xml_element_names(xmlNode * a_node)
                 if (!strcmp((const char*)cur_node->name, "title"))
                 {
                     xmlChar *title = xmlNodeGetContent(cur_node);
+#ifdef WITH_GNOME_VFS
+                    row_num =
+#endif
 #if WITH_GTKMM_2_24
-                    row_num = filesList->append((const char*)title);
+                    filesList->append(reinterpret_cast<const char*>(title));
 #else
-                    row_num = filesList->append_text((const char*)title);
+                    filesList->append_text(reinterpret_cast<const char*>(title));
 #endif
                     xmlFree(title);
                 }
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index 7c6b8e9af..8928c10ec 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -244,7 +244,6 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw)
         // FIXME: fix for GTK breakage, see comment in SelectedStyle::on_opacity_changed
         sp_desktop_canvas(desktop)->forceFullRedrawAfterInterruptions(0);
 
-        gdouble strokewidth = stroke_average_width (selection->itemList());
         int transform_stroke = prefs->getBool("/options/transform/stroke", true) ? 1 : 0;
 
         Geom::Affine scaler;
diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp
index 2fbf6a763..f9cda297f 100644
--- a/src/widgets/sp-color-notebook.cpp
+++ b/src/widgets/sp-color-notebook.cpp
@@ -83,18 +83,12 @@ GType sp_color_notebook_get_type(void)
     return type;
 }
 
-static void
-sp_color_notebook_class_init (SPColorNotebookClass *klass)
+static void sp_color_notebook_class_init(SPColorNotebookClass *klass)
 {
-    GtkObjectClass *object_class;
-    GtkWidgetClass *widget_class;
-    SPColorSelectorClass *selector_class;
-
-    object_class = (GtkObjectClass *) klass;
-    widget_class = (GtkWidgetClass *) klass;
-    selector_class = SP_COLOR_SELECTOR_CLASS (klass);
+    GtkObjectClass *object_class = reinterpret_cast<GtkObjectClass *>(klass);
+    GtkWidgetClass *widget_class = reinterpret_cast<GtkWidgetClass *>(klass);
 
-    parent_class = SP_COLOR_SELECTOR_CLASS (g_type_class_peek_parent (klass));
+    parent_class = SP_COLOR_SELECTOR_CLASS(g_type_class_peek_parent(klass));
 
     object_class->destroy = sp_color_notebook_destroy;