Warning and uninitialized variable cleanup.

(bzr r10860)

20 files changed, 463 insertions, 570 deletions

diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp
index 2148e9e97..0eb3b1c35 100644
--- a/src/box3d-side.cpp
+++ b/src/box3d-side.cpp
@@ -61,20 +61,10 @@ box3d_side_get_type (void)
     return type;
 }
 
-static void
-box3d_side_class_init (Box3DSideClass *klass)
+static void box3d_side_class_init(Box3DSideClass *klass)
 {
-    GObjectClass * gobject_class;
-    SPObjectClass * sp_object_class;
-    SPItemClass * item_class;
-    SPPathClass * path_class;
-    SPShapeClass * shape_class;
-
-    gobject_class = (GObjectClass *) klass;
-    sp_object_class = (SPObjectClass *) klass;
-    item_class = (SPItemClass *) klass;
-    path_class = (SPPathClass *) klass;
-    shape_class = (SPShapeClass *) klass;
+    SPObjectClass *sp_object_class = reinterpret_cast<SPObjectClass *>(klass);
+    SPShapeClass *shape_class = reinterpret_cast<SPShapeClass *>(klass);
 
     parent_class = (SPShapeClass *)g_type_class_ref (SP_TYPE_SHAPE);
 
diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index 51c16bf3b..31e978f86 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -1642,26 +1642,23 @@ sp_export_area_y_value_changed (GtkAdjustment *adj, GtkObject *base)
 } // end of sp_export_area_y_value_changed()
 
 /// Called when x1-x0 or area width is changed
-static void
-sp_export_area_width_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
+static void sp_export_area_width_value_changed(GtkAdjustment */*adj*/, GtkObject *base)
 {
-    float x0, x1, xdpi, width, bmwidth;
-
-    if (g_object_get_data (G_OBJECT(base), "update"))
+    if (g_object_get_data (G_OBJECT(base), "update")) {
         return;
+    }
 
-    if (sp_unit_selector_update_test ((SPUnitSelector *)g_object_get_data
-           (G_OBJECT(base), "units"))) {
+    if (sp_unit_selector_update_test(reinterpret_cast<SPUnitSelector *>(g_object_get_data(G_OBJECT(base), "units")))) {
         return;
     }
 
     g_object_set_data ( G_OBJECT (base), "update", GUINT_TO_POINTER (TRUE));
 
-    x0 = sp_export_value_get_px (base, "x0");
-    x1 = sp_export_value_get_px (base, "x1");
-    xdpi = sp_export_value_get (base, "xdpi");
-    width = sp_export_value_get_px (base, "width");
-    bmwidth = floor (width * xdpi / DPI_BASE + 0.5);
+    float x0 = sp_export_value_get_px(base, "x0");
+    float x1 = sp_export_value_get_px(base, "x1");
+    float xdpi = sp_export_value_get(base, "xdpi");
+    float width = sp_export_value_get_px(base, "width");
+    float bmwidth = floor(width * xdpi / DPI_BASE + 0.5);
 
     if (bmwidth < SP_EXPORT_MIN_SIZE) {
 
@@ -1679,27 +1676,23 @@ sp_export_area_width_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
 } // end of sp_export_area_width_value_changed()
 
 /// Called when y1-y0 or area height is changed.
-static void
-sp_export_area_height_value_changed (GtkAdjustment */*adj*/, GtkObject *base)
+static void sp_export_area_height_value_changed(GtkAdjustment */*adj*/, GtkObject *base)
 {
-
-    float y0, y1, ydpi, height, bmheight;
-
-    if (g_object_get_data (G_OBJECT(base), "update"))
+    if (g_object_get_data(G_OBJECT(base), "update")) {
         return;
+    }
 
-    if (sp_unit_selector_update_test ((SPUnitSelector *)g_object_get_data
-           (G_OBJECT(base), "units"))) {
+    if (sp_unit_selector_update_test(reinterpret_cast<SPUnitSelector *>(g_object_get_data(G_OBJECT(base), "units")))) {
         return;
     }
 
     g_object_set_data (G_OBJECT (base), "update", GUINT_TO_POINTER (TRUE));
 
-    y0 = sp_export_value_get_px (base, "y0");
-    y1 = sp_export_value_get_px (base, "y1");
-    ydpi = sp_export_value_get (base, "ydpi");
-    height = sp_export_value_get_px (base, "height");
-    bmheight = floor (height * ydpi / DPI_BASE + 0.5);
+    float y0 = sp_export_value_get_px (base, "y0");
+    float y1 = sp_export_value_get_px (base, "y1");
+    float ydpi = sp_export_value_get (base, "ydpi");
+    float height = sp_export_value_get_px (base, "height");
+    float bmheight = floor (height * ydpi / DPI_BASE + 0.5);
 
     if (bmheight < SP_EXPORT_MIN_SIZE) {
         bmheight = SP_EXPORT_MIN_SIZE;
diff --git a/src/dialogs/text-edit.cpp b/src/dialogs/text-edit.cpp
index ae34fe4b1..307ab1fd1 100644
--- a/src/dialogs/text-edit.cpp
+++ b/src/dialogs/text-edit.cpp
@@ -732,7 +732,6 @@ sp_text_edit_dialog_read_selection ( GtkWidget *dlg,
      * interested in. */
     gchar *phrase = g_strdup(_("AaBbCcIiPpQq12369$\342\202\254\302\242?.;/()"));
 
-    Inkscape::XML::Node *repr;
     if (text)
     {
         guint items = sp_ted_get_selected_text_count ();
@@ -760,8 +759,7 @@ sp_text_edit_dialog_read_selection ( GtkWidget *dlg,
                 gtk_text_buffer_set_text (tb, "", 0);
             }
         } // end of if (docontent)
-        repr = text->getRepr();
-
+        text->getRepr(); // was being called but result ignored. Check this.
     } else {
         gtk_widget_set_sensitive (textw, FALSE);
         gtk_widget_set_sensitive (apply, FALSE);
@@ -847,23 +845,22 @@ sp_text_edit_dialog_read_selection ( GtkWidget *dlg,
 static void
 sp_text_edit_dialog_text_changed (GtkTextBuffer *tb, GtkWidget *dlg)
 {
-    GtkWidget *textw, *preview, *apply, *def, *fontsel;
-    GtkTextIter start, end;
-    gchar *str;
-
-    if (g_object_get_data (G_OBJECT (dlg), "blocked"))
+    if (g_object_get_data (G_OBJECT (dlg), "blocked")) {
         return;
+    }
 
-    SPItem *text = sp_ted_get_selected_text_item ();
+    SPItem *text = sp_ted_get_selected_text_item();
 
-    textw = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), "textw");
-    preview = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), "preview");
-    apply = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), "apply");
-    def = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), "default");
-    fontsel = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), "fontsel");
+    //GtkWidget *textw = reinterpret_cast<GtkWidget*>(g_object_get_data(G_OBJECT (dlg), "textw"));
+    GtkWidget *preview = reinterpret_cast<GtkWidget*>(g_object_get_data(G_OBJECT (dlg), "preview"));
+    GtkWidget *apply = reinterpret_cast<GtkWidget*>(g_object_get_data(G_OBJECT (dlg), "apply"));
+    GtkWidget *def = reinterpret_cast<GtkWidget*>(g_object_get_data(G_OBJECT (dlg), "default"));
+    GtkWidget *fontsel = reinterpret_cast<GtkWidget*>(g_object_get_data(G_OBJECT (dlg), "fontsel"));
 
+    GtkTextIter start;
+    GtkTextIter end;
     gtk_text_buffer_get_bounds (tb, &start, &end);
-    str = gtk_text_buffer_get_text (tb, &start, &end, TRUE);
+    gchar *str = gtk_text_buffer_get_text(tb, &start, &end, TRUE);
     font_instance *font = sp_font_selector_get_font(SP_FONT_SELECTOR(fontsel));
 
     if (font) {
diff --git a/src/display/cairo-templates.h b/src/display/cairo-templates.h
index b48a22702..45b6790e6 100644
--- a/src/display/cairo-templates.h
+++ b/src/display/cairo-templates.h
@@ -75,7 +75,8 @@ void ink_cairo_surface_blend(cairo_surface_t *in1, cairo_surface_t *in2, cairo_s
     // It would be better to render more than 1 tile at a time.
     #if HAVE_OPENMP
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    int num_threads = prefs->getIntLimited("/options/threading/numthreads", omp_get_num_procs(), 1, 256);
+    int numOfThreads = prefs->getIntLimited("/options/threading/numthreads", omp_get_num_procs(), 1, 256);
+    if (numOfThreads){} // inform compiler we are using it.
     #endif
 
     // The number of code paths here is evil.
@@ -83,14 +84,14 @@ void ink_cairo_surface_blend(cairo_surface_t *in1, cairo_surface_t *in2, cairo_s
         if (bpp2 == 4) {
             if (fast_path) {
                 #if HAVE_OPENMP
-                #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+                #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
                 #endif
                 for (int i = 0; i < limit; ++i) {
                     *(out_data + i) = blend(*(in1_data + i), *(in2_data + i));
                 }
             } else {
                 #if HAVE_OPENMP
-                #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+                #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
                 #endif
                 for (int i = 0; i < h; ++i) {
                     guint32 *in1_p = in1_data + i * stride1/4;
@@ -105,7 +106,7 @@ void ink_cairo_surface_blend(cairo_surface_t *in1, cairo_surface_t *in2, cairo_s
         } else {
             // bpp2 == 1
             #if HAVE_OPENMP
-            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
             #endif
             for (int i = 0; i < h; ++i) {
                 guint32 *in1_p = in1_data + i * stride1/4;
@@ -123,7 +124,7 @@ void ink_cairo_surface_blend(cairo_surface_t *in1, cairo_surface_t *in2, cairo_s
         if (bpp2 == 4) {
             // bpp1 == 1
             #if HAVE_OPENMP
-            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
             #endif
             for (int i = 0; i < h; ++i) {
                 guint8  *in1_p = reinterpret_cast<guint8*>(in1_data) + i * stride1;
@@ -140,7 +141,7 @@ void ink_cairo_surface_blend(cairo_surface_t *in1, cairo_surface_t *in2, cairo_s
             // bpp1 == 1 && bpp2 == 1
             if (fast_path) {
                 #if HAVE_OPENMP
-                #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+                #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
                 #endif
                 for (int i = 0; i < limit; ++i) {
                     guint8 *in1_p = reinterpret_cast<guint8*>(in1_data) + i;
@@ -153,7 +154,7 @@ void ink_cairo_surface_blend(cairo_surface_t *in1, cairo_surface_t *in2, cairo_s
                 }
             } else {
                 #if HAVE_OPENMP
-                #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+                #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
                 #endif
                 for (int i = 0; i < h; ++i) {
                     guint8 *in1_p = reinterpret_cast<guint8*>(in1_data) + i * stride1;
@@ -203,21 +204,22 @@ void ink_cairo_surface_filter(cairo_surface_t *in, cairo_surface_t *out, Filter
 
     #if HAVE_OPENMP
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    int num_threads = prefs->getIntLimited("/options/threading/numthreads", omp_get_num_procs(), 1, 256);
+    int numOfThreads = prefs->getIntLimited("/options/threading/numthreads", omp_get_num_procs(), 1, 256);
+    if (numOfThreads){} // inform compiler we are using it.
     #endif
 
     // this is provided just in case, to avoid problems with strict aliasing rules
     if (in == out) {
         if (bppin == 4) {
             #if HAVE_OPENMP
-            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
             #endif
             for (int i = 0; i < limit; ++i) {
                 *(in_data + i) = filter(*(in_data + i));
             }
         } else {
             #if HAVE_OPENMP
-            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
             #endif
             for (int i = 0; i < limit; ++i) {
                 guint8 *in_p = reinterpret_cast<guint8*>(in_data) + i;
@@ -235,14 +237,14 @@ void ink_cairo_surface_filter(cairo_surface_t *in, cairo_surface_t *out, Filter
             // bppin == 4, bppout == 4
             if (fast_path) {
                 #if HAVE_OPENMP
-                #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+                #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
                 #endif
                 for (int i = 0; i < limit; ++i) {
                     *(out_data + i) = filter(*(in_data + i));
                 }
             } else {
                 #if HAVE_OPENMP
-                #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+                #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
                 #endif
                 for (int i = 0; i < h; ++i) {
                     guint32 *in_p = in_data + i * stridein/4;
@@ -257,7 +259,7 @@ void ink_cairo_surface_filter(cairo_surface_t *in, cairo_surface_t *out, Filter
             // bppin == 4, bppout == 1
             // we use this path with COLORMATRIX_LUMINANCETOALPHA
             #if HAVE_OPENMP
-            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
             #endif
             for (int i = 0; i < h; ++i) {
                 guint32 *in_p = in_data + i * stridein/4;
@@ -274,7 +276,7 @@ void ink_cairo_surface_filter(cairo_surface_t *in, cairo_surface_t *out, Filter
         // Note: there is no path for bppin == 1, bppout == 4 because it is useless
         if (fast_path) {
             #if HAVE_OPENMP
-            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
             #endif
             for (int i = 0; i < limit; ++i) {
                 guint8 *in_p = reinterpret_cast<guint8*>(in_data) + i;
@@ -285,7 +287,7 @@ void ink_cairo_surface_filter(cairo_surface_t *in, cairo_surface_t *out, Filter
             }
         } else {
             #if HAVE_OPENMP
-            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+            #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
             #endif
             for (int i = 0; i < h; ++i) {
                 guint8 *in_p = reinterpret_cast<guint8*>(in_data) + i * stridein;
@@ -329,12 +331,13 @@ void ink_cairo_surface_synthesize(cairo_surface_t *out, cairo_rectangle_t const
     #if HAVE_OPENMP
     int limit = w * h;
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    int num_threads = prefs->getIntLimited("/options/threading/numthreads", omp_get_num_procs(), 1, 256);
+    int numOfThreads = prefs->getIntLimited("/options/threading/numthreads", omp_get_num_procs(), 1, 256);
+    if (numOfThreads){} // inform compiler we are using it.
     #endif
 
     if (bppout == 4) {
         #if HAVE_OPENMP
-        #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+        #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
         #endif
         for (int i = out_area.y; i < h; ++i) {
             guint32 *out_p = reinterpret_cast<guint32*>(out_data + i * strideout);
@@ -346,7 +349,7 @@ void ink_cairo_surface_synthesize(cairo_surface_t *out, cairo_rectangle_t const
     } else {
         // bppout == 1
         #if HAVE_OPENMP
-        #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(num_threads)
+        #pragma omp parallel for if(limit > OPENMP_THRESHOLD) num_threads(numOfThreads)
         #endif
         for (int i = out_area.y; i < h; ++i) {
             guint8 *out_p = out_data + i * strideout;
diff --git a/src/marker.cpp b/src/marker.cpp
index e75cdff43..a5681e180 100644
--- a/src/marker.cpp
+++ b/src/marker.cpp
@@ -5,6 +5,7 @@
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   Bryce Harrington <bryce@bryceharrington.org>
  *   Abhishek Sharma
+ *   Jon A. Cruz <jon@joncruz.org>
  *
  * Copyright (C) 1999-2003 Lauris Kaplinski
  *               2004-2006 Bryce Harrington
@@ -49,7 +50,7 @@ static void sp_marker_print (SPItem *item, SPPrintContext *ctx);
 
 static void sp_marker_view_remove (SPMarker *marker, SPMarkerView *view, unsigned int destroyitems);
 
-static SPGroupClass *parent_class;
+static SPGroupClass *parent_class = 0;
 
 /**
  * Registers the SPMarker class with Gdk and returns its type number.
@@ -78,18 +79,12 @@ sp_marker_get_type (void)
  * Initializes a SPMarkerClass object.  Establishes the function pointers to the class'
  * member routines in the class vtable, and sets pointers to parent classes.
  */
-static void
-sp_marker_class_init (SPMarkerClass *klass)
+static void sp_marker_class_init(SPMarkerClass *klass)
 {
-	GObjectClass *object_class;
-	SPObjectClass *sp_object_class;
-	SPItemClass *sp_item_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-	sp_object_class = (SPObjectClass *) klass;
-	sp_item_class = (SPItemClass *) klass;
+    SPObjectClass *sp_object_class = reinterpret_cast<SPObjectClass *>(klass);
+    SPItemClass *sp_item_class = reinterpret_cast<SPItemClass *>(klass);
 
-	parent_class = (SPGroupClass *)g_type_class_ref (SP_TYPE_GROUP);
+    parent_class = reinterpret_cast<SPGroupClass *>(g_type_class_ref(SP_TYPE_GROUP));
 
 	sp_object_class->build = sp_marker_build;
 	sp_object_class->release = sp_marker_release;
@@ -125,26 +120,20 @@ sp_marker_init (SPMarker *marker)
  *
  * \see sp_object_build()
  */
-static void
-sp_marker_build (SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+static void sp_marker_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-	SPGroup *group;
-	SPMarker *marker;
-
-	group = (SPGroup *) object;
-	marker = (SPMarker *) object;
-
-	object->readAttr( "markerUnits" );
-	object->readAttr( "refX" );
-	object->readAttr( "refY" );
-	object->readAttr( "markerWidth" );
-	object->readAttr( "markerHeight" );
-	object->readAttr( "orient" );
-	object->readAttr( "viewBox" );
-	object->readAttr( "preserveAspectRatio" );
-
-	if (((SPObjectClass *) parent_class)->build)
-		((SPObjectClass *) parent_class)->build (object, document, repr);
+    object->readAttr( "markerUnits" );
+    object->readAttr( "refX" );
+    object->readAttr( "refY" );
+    object->readAttr( "markerWidth" );
+    object->readAttr( "markerHeight" );
+    object->readAttr( "orient" );
+    object->readAttr( "viewBox" );
+    object->readAttr( "preserveAspectRatio" );
+
+    if (reinterpret_cast<SPObjectClass *>(parent_class)->build) {
+        reinterpret_cast<SPObjectClass *>(parent_class)->build(object, document, repr);
+    }
 }
 
 /**
@@ -159,22 +148,20 @@ sp_marker_build (SPObject *object, SPDocument *document, Inkscape::XML::Node *re
  *
  * \see sp_object_release()
  */
-static void
-sp_marker_release (SPObject *object)
+static void sp_marker_release(SPObject *object)
 {
-	SPMarker *marker;
-
-	marker = (SPMarker *) object;
+    SPMarker *marker = reinterpret_cast<SPMarker *>(object);
 
-	while (marker->views) {
-		/* Destroy all DrawingItems etc. */
-		/* Parent class ::hide method */
-		((SPItemClass *) parent_class)->hide ((SPItem *) marker, marker->views->key);
-		sp_marker_view_remove (marker, marker->views, TRUE);
-	}
+    while (marker->views) {
+        // Destroy all DrawingItems etc.
+        // Parent class ::hide method
+        reinterpret_cast<SPItemClass *>(parent_class)->hide(marker, marker->views->key);
+        sp_marker_view_remove (marker, marker->views, TRUE);
+    }
 
-	if (((SPObjectClass *) parent_class)->release)
-		((SPObjectClass *) parent_class)->release (object);
+    if (reinterpret_cast<SPObjectClass *>(parent_class)->release) {
+        reinterpret_cast<SPObjectClass *>(parent_class)->release(object);
+    }
 }
 
 /**
@@ -335,117 +322,126 @@ static void sp_marker_set(SPObject *object, unsigned int key, const gchar *value
  */
 static void sp_marker_update(SPObject *object, SPCtx *ctx, guint flags)
 {
-	SPMarker *marker = SP_MARKER(object);
-	SPItemCtx rctx;
-        Geom::Rect vb;
-	double x, y, width, height;
+    SPMarker *marker = SP_MARKER(object);
+    SPItemCtx rctx;
+
+    // fixme: We have to set up clip here too
 
-	/* fixme: We have to set up clip here too */
+    // Copy parent context
+    rctx.ctx = *ctx;
 
-	/* Copy parent context */
-	rctx.ctx = *ctx;
-	/* Initialize tranformations */
-	rctx.i2doc = Geom::identity();
-	rctx.i2vp = Geom::identity();
-	/* Set up viewport */
-	rctx.viewport = Geom::Rect::from_xywh(0, 0, marker->markerWidth.computed, marker->markerHeight.computed);
+    // Initialize tranformations
+    rctx.i2doc = Geom::identity();
+    rctx.i2vp = Geom::identity();
 
-	/* Start with identity transform */
-	marker->c2p.setIdentity();
+    // Set up viewport
+    rctx.viewport = Geom::Rect::from_xywh(0, 0, marker->markerWidth.computed, marker->markerHeight.computed);
+
+    // Start with identity transform
+    marker->c2p.setIdentity();
 
-	/* Viewbox is always present, either implicitly or explicitly */
+    // Viewbox is always present, either implicitly or explicitly
+    Geom::Rect vb;
     if (marker->viewBox) {
         vb = *marker->viewBox;
-	} else {
+    } else {
         vb = rctx.viewport;
-	}
-	/* Now set up viewbox transformation */
-	/* Determine actual viewbox in viewport coordinates */
-	if (marker->aspect_align == SP_ASPECT_NONE) {
-		x = 0.0;
-		y = 0.0;
-		width = rctx.viewport.width();
-		height = rctx.viewport.height();
-	} else {
-		double scalex, scaley, scale;
-		/* Things are getting interesting */
+    }
+
+    // Now set up viewbox transformation
+
+    // Determine actual viewbox in viewport coordinates
+    double x = 0;
+    double y = 0;
+    double width = 0;
+    double height = 0;
+    if (marker->aspect_align == SP_ASPECT_NONE) {
+        x = 0.0;
+        y = 0.0;
+        width = rctx.viewport.width();
+        height = rctx.viewport.height();
+    } else {
+        double scalex, scaley, scale;
+        // Things are getting interesting
         scalex = rctx.viewport.width() / (vb.width());
         scaley = rctx.viewport.height() / (vb.height());
-		scale = (marker->aspect_clip == SP_ASPECT_MEET) ? MIN (scalex, scaley) : MAX (scalex, scaley);
+        scale = (marker->aspect_clip == SP_ASPECT_MEET) ? MIN (scalex, scaley) : MAX (scalex, scaley);
         width = (vb.width()) * scale;
         height = (vb.height()) * scale;
-		/* Now place viewbox to requested position */
-		switch (marker->aspect_align) {
-		case SP_ASPECT_XMIN_YMIN:
-			x = 0.0;
-			y = 0.0;
-			break;
-		case SP_ASPECT_XMID_YMIN:
-			x = 0.5 * (rctx.viewport.width() - width);
-			y = 0.0;
-			break;
-		case SP_ASPECT_XMAX_YMIN:
-			x = 1.0 * (rctx.viewport.width() - width);
-			y = 0.0;
-			break;
-		case SP_ASPECT_XMIN_YMID:
-			x = 0.0;
-			y = 0.5 * (rctx.viewport.height() - height);
-			break;
-		case SP_ASPECT_XMID_YMID:
-			x = 0.5 * (rctx.viewport.width() - width);
-			y = 0.5 * (rctx.viewport.height() - height);
-			break;
-		case SP_ASPECT_XMAX_YMID:
-			x = 1.0 * (rctx.viewport.width() - width);
-			y = 0.5 * (rctx.viewport.height() - height);
-			break;
-		case SP_ASPECT_XMIN_YMAX:
-			x = 0.0;
-			y = 1.0 * (rctx.viewport.height() - height);
-			break;
-		case SP_ASPECT_XMID_YMAX:
-			x = 0.5 * (rctx.viewport.width() - width);
-			y = 1.0 * (rctx.viewport.height() - height);
-			break;
-		case SP_ASPECT_XMAX_YMAX:
-			x = 1.0 * (rctx.viewport.width() - width);
-			y = 1.0 * (rctx.viewport.height() - height);
-			break;
-		default:
-			x = 0.0;
-			y = 0.0;
-			break;
-		}
-	}
 
-	// viewbox transformation and reference translation
-	marker->c2p = Geom::Translate(-marker->refX.computed, -marker->refY.computed) *
-		Geom::Scale(width / vb.width(), height / vb.height());
+        // Now place viewbox to requested position
+        switch (marker->aspect_align) {
+            case SP_ASPECT_XMIN_YMIN:
+                x = 0.0;
+                y = 0.0;
+                break;
+            case SP_ASPECT_XMID_YMIN:
+                x = 0.5 * (rctx.viewport.width() - width);
+                y = 0.0;
+                break;
+            case SP_ASPECT_XMAX_YMIN:
+                x = 1.0 * (rctx.viewport.width() - width);
+                y = 0.0;
+                break;
+            case SP_ASPECT_XMIN_YMID:
+                x = 0.0;
+                y = 0.5 * (rctx.viewport.height() - height);
+                break;
+            case SP_ASPECT_XMID_YMID:
+                x = 0.5 * (rctx.viewport.width() - width);
+                y = 0.5 * (rctx.viewport.height() - height);
+                break;
+            case SP_ASPECT_XMAX_YMID:
+                x = 1.0 * (rctx.viewport.width() - width);
+                y = 0.5 * (rctx.viewport.height() - height);
+                break;
+            case SP_ASPECT_XMIN_YMAX:
+                x = 0.0;
+                y = 1.0 * (rctx.viewport.height() - height);
+                break;
+            case SP_ASPECT_XMID_YMAX:
+                x = 0.5 * (rctx.viewport.width() - width);
+                y = 1.0 * (rctx.viewport.height() - height);
+                break;
+            case SP_ASPECT_XMAX_YMAX:
+                x = 1.0 * (rctx.viewport.width() - width);
+                y = 1.0 * (rctx.viewport.height() - height);
+                break;
+            default:
+                x = 0.0;
+                y = 0.0;
+                break;
+        }
+    }
+    // TODO fixme: all that work is done to figure out x and y, which are just ignored. Check why.
+
+    // viewbox transformation and reference translation
+    marker->c2p = Geom::Translate(-marker->refX.computed, -marker->refY.computed) *
+        Geom::Scale(width / vb.width(), height / vb.height());
 
-	rctx.i2doc = marker->c2p * rctx.i2doc;
+    rctx.i2doc = marker->c2p * rctx.i2doc;
 
-	/* If viewBox is set reinitialize child viewport */
-	/* Otherwise it already correct */
-	if (marker->viewBox) {
-	    rctx.viewport = *marker->viewBox;
-            rctx.i2vp = Geom::identity();
-	}
+    // If viewBox is set reinitialize child viewport
+    // Otherwise it already correct
+    if (marker->viewBox) {
+        rctx.viewport = *marker->viewBox;
+        rctx.i2vp = Geom::identity();
+    }
 
-	// And invoke parent method
-	if (((SPObjectClass *) (parent_class))->update) {
-		((SPObjectClass *) (parent_class))->update (object, (SPCtx *) &rctx, flags);
-        }
+    // And invoke parent method
+    if (((SPObjectClass *) (parent_class))->update) {
+        ((SPObjectClass *) (parent_class))->update (object, (SPCtx *) &rctx, flags);
+    }
 
-        // As last step set additional transform of drawing group
-        for (SPMarkerView *v = marker->views; v != NULL; v = v->next) {
-            for (unsigned i = 0 ; i < v->items.size() ; i++) {
-                if (v->items[i]) {
-                    Inkscape::DrawingGroup *g = dynamic_cast<Inkscape::DrawingGroup *>(v->items[i]);
-                    g->setChildTransform(marker->c2p);
-                }
+    // As last step set additional transform of drawing group
+    for (SPMarkerView *v = marker->views; v != NULL; v = v->next) {
+        for (unsigned i = 0 ; i < v->items.size() ; i++) {
+            if (v->items[i]) {
+                Inkscape::DrawingGroup *g = dynamic_cast<Inkscape::DrawingGroup *>(v->items[i]);
+                g->setChildTransform(marker->c2p);
             }
         }
+    }
 }
 
 /**
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index f1ad17857..11334c651 100644
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
@@ -343,20 +343,21 @@ void sp_selected_to_lpeitems(SPDesktop *desktop)
         return;
     }
 
-    bool did = false;
-
     GSList *selected = g_slist_copy((GSList *) selection->itemList());
     GSList *to_select = NULL;
     selection->clear();
     GSList *items = g_slist_copy(selected);
 
-    did = sp_item_list_to_curves(items, &selected, &to_select, true);
+    sp_item_list_to_curves(items, &selected, &to_select, true);
 
-    g_slist_free (items);
+    g_slist_free(items);
+    items = 0;
     selection->setReprList(to_select);
     selection->addList(selected);
-    g_slist_free (to_select);
-    g_slist_free (selected);
+    g_slist_free(to_select);
+    to_select = 0;
+    g_slist_free(selected);
+    selected = 0;
 }
 
 bool
diff --git a/src/print.cpp b/src/print.cpp
index d2fc72175..a93ce0ab6 100644
--- a/src/print.cpp
+++ b/src/print.cpp
@@ -89,20 +89,15 @@ sp_print_document(Gtk::Window& parentWindow, SPDocument *doc)
     (void)res; // TODO handle this
 }
 
-void
-sp_print_document_to_file(SPDocument *doc, gchar const *filename)
+void sp_print_document_to_file(SPDocument *doc, gchar const *filename)
 {
-    Inkscape::Extension::Print *mod;
-    SPPrintContext context;
-    gchar const *oldconst;
-    gchar *oldoutput;
-    unsigned int ret;
-
     doc->ensureUpToDate();
 
-    mod = Inkscape::Extension::get_print(SP_MODULE_KEY_PRINT_PS);
-    oldconst = mod->get_param_string("destination");
-    oldoutput = g_strdup(oldconst);
+    Inkscape::Extension::Print *mod = Inkscape::Extension::get_print(SP_MODULE_KEY_PRINT_PS);
+    SPPrintContext context;
+    gchar const *oldconst = mod->get_param_string("destination");
+    gchar *oldoutput = g_strdup(oldconst);
+
     mod->set_param_string("destination", (gchar *)filename);
 
 /* Start */
@@ -115,9 +110,9 @@ sp_print_document_to_file(SPDocument *doc, gchar const *filename)
     mod->root = (mod->base)->invoke_show(drawing, mod->dkey, SP_ITEM_SHOW_DISPLAY);
     drawing.setRoot(mod->root);
     /* Print document */
-    ret = mod->begin(doc);
+    mod->begin(doc);
     (mod->base)->invoke_print(&context);
-    ret = mod->finish();
+    mod->finish();
     /* Release drawing items */
     (mod->base)->invoke_hide(mod->dkey);
     mod->base = NULL;
@@ -126,8 +121,6 @@ sp_print_document_to_file(SPDocument *doc, gchar const *filename)
 
     mod->set_param_string("destination", oldoutput);
     g_free(oldoutput);
-
-    return;
 }
 
 
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index eab28912e..f7160cea8 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -2792,8 +2792,7 @@ void sp_selection_create_bitmap_copy(SPDesktop *desktop)
     // Run filter, if any
     if (run) {
         g_print("Running external filter: %s\n", run);
-        int retval;
-        retval = system(run);
+        system(run);
     }
 
     // Import the image back
diff --git a/src/sp-flowdiv.cpp b/src/sp-flowdiv.cpp
index 5cb258735..7a0c5e0b8 100644
--- a/src/sp-flowdiv.cpp
+++ b/src/sp-flowdiv.cpp
@@ -59,8 +59,7 @@ static SPItemClass * flowpara_parent_class;
 static SPObjectClass * flowline_parent_class;
 static SPObjectClass * flowregionbreak_parent_class;
 
-GType
-sp_flowdiv_get_type (void)
+GType sp_flowdiv_get_type(void)
 {
 	static GType group_type = 0;
 	if (!group_type) {
@@ -81,35 +80,29 @@ sp_flowdiv_get_type (void)
 	return group_type;
 }
 
-static void
-sp_flowdiv_class_init (SPFlowdivClass *klass)
+static void sp_flowdiv_class_init(SPFlowdivClass *klass)
 {
-	GObjectClass * object_class;
-	SPObjectClass * sp_object_class;
-
-	object_class = (GObjectClass *) klass;
-	sp_object_class = (SPObjectClass *) klass;
+    SPObjectClass *sp_object_class = reinterpret_cast<SPObjectClass *>(klass);
 
-	flowdiv_parent_class = (SPItemClass *)g_type_class_ref (SP_TYPE_ITEM);
+    flowdiv_parent_class = reinterpret_cast<SPItemClass *>(g_type_class_ref(SP_TYPE_ITEM));
 
-	sp_object_class->build = sp_flowdiv_build;
-	sp_object_class->set = sp_flowdiv_set;
-	sp_object_class->release = sp_flowdiv_release;
-	sp_object_class->write = sp_flowdiv_write;
-	sp_object_class->update = sp_flowdiv_update;
-	sp_object_class->modified = sp_flowdiv_modified;
+    sp_object_class->build = sp_flowdiv_build;
+    sp_object_class->set = sp_flowdiv_set;
+    sp_object_class->release = sp_flowdiv_release;
+    sp_object_class->write = sp_flowdiv_write;
+    sp_object_class->update = sp_flowdiv_update;
+    sp_object_class->modified = sp_flowdiv_modified;
 }
 
-static void
-sp_flowdiv_init (SPFlowdiv */*group*/)
+static void sp_flowdiv_init(SPFlowdiv */*group*/)
 {
 }
 
-static void
-sp_flowdiv_release (SPObject *object)
+static void sp_flowdiv_release(SPObject *object)
 {
-	if (((SPObjectClass *) flowdiv_parent_class)->release)
-		((SPObjectClass *) flowdiv_parent_class)->release (object);
+    if (reinterpret_cast<SPObjectClass *>(flowdiv_parent_class)->release) {
+        reinterpret_cast<SPObjectClass *>(flowdiv_parent_class)->release(object);
+    }
 }
 
 static void sp_flowdiv_update(SPObject *object, SPCtx *ctx, unsigned int flags)
@@ -117,8 +110,8 @@ static void sp_flowdiv_update(SPObject *object, SPCtx *ctx, unsigned int flags)
     SPItemCtx *ictx = reinterpret_cast<SPItemCtx *>(ctx);
     SPItemCtx cctx = *ictx;
 
-    if (((SPObjectClass *) (flowdiv_parent_class))->update) {
-        ((SPObjectClass *) (flowdiv_parent_class))->update(object, ctx, flags);
+    if (reinterpret_cast<SPObjectClass *>(flowdiv_parent_class)->update) {
+        reinterpret_cast<SPObjectClass *>(flowdiv_parent_class)->update(object, ctx, flags);
     }
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
@@ -149,10 +142,10 @@ static void sp_flowdiv_update(SPObject *object, SPCtx *ctx, unsigned int flags)
     }
 }
 
-static void sp_flowdiv_modified (SPObject *object, guint flags)
+static void sp_flowdiv_modified(SPObject *object, guint flags)
 {
-    if (((SPObjectClass *) (flowdiv_parent_class))->modified) {
-        ((SPObjectClass *) (flowdiv_parent_class))->modified(object, flags);
+    if (reinterpret_cast<SPObjectClass *>(flowdiv_parent_class)->modified) {
+        reinterpret_cast<SPObjectClass *>(flowdiv_parent_class)->modified(object, flags);
     }
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
@@ -176,19 +169,19 @@ static void sp_flowdiv_modified (SPObject *object, guint flags)
     }
 }
 
-static void
-sp_flowdiv_build (SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr)
+static void sp_flowdiv_build(SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr)
 {
-	object->_requireSVGVersion(Inkscape::Version(1, 2));
+    object->_requireSVGVersion(Inkscape::Version(1, 2));
 
-	if (((SPObjectClass *) flowdiv_parent_class)->build)
-		((SPObjectClass *) flowdiv_parent_class)->build (object, doc, repr);
+    if (reinterpret_cast<SPObjectClass *>(flowdiv_parent_class)->build) {
+        reinterpret_cast<SPObjectClass *>(flowdiv_parent_class)->build(object, doc, repr);
+    }
 }
 
 static void sp_flowdiv_set(SPObject *object, unsigned int key, const gchar *value)
 {
-    if (((SPObjectClass *) flowdiv_parent_class)->set) {
-        (((SPObjectClass *) flowdiv_parent_class)->set)(object, key, value);
+    if (reinterpret_cast<SPObjectClass *>(flowdiv_parent_class)->set) {
+        reinterpret_cast<SPObjectClass *>(flowdiv_parent_class)->set(object, key, value);
     }
 }
 
@@ -263,34 +256,28 @@ sp_flowtspan_get_type (void)
 	return group_type;
 }
 
-static void
-sp_flowtspan_class_init (SPFlowtspanClass *klass)
+static void sp_flowtspan_class_init(SPFlowtspanClass *klass)
 {
-	GObjectClass * object_class;
-	SPObjectClass * sp_object_class;
-
-	object_class = (GObjectClass *) klass;
-	sp_object_class = (SPObjectClass *) klass;
+    SPObjectClass *sp_object_class = reinterpret_cast<SPObjectClass *>(klass);
 
-	flowtspan_parent_class = (SPItemClass *)g_type_class_ref (SP_TYPE_ITEM);
+    flowtspan_parent_class = reinterpret_cast<SPItemClass *>(g_type_class_ref(SP_TYPE_ITEM));
 
-	sp_object_class->build = sp_flowtspan_build;
-	sp_object_class->set = sp_flowtspan_set;
-	sp_object_class->release = sp_flowtspan_release;
-	sp_object_class->write = sp_flowtspan_write;
-	sp_object_class->update = sp_flowtspan_update;
-	sp_object_class->modified = sp_flowtspan_modified;
+    sp_object_class->build = sp_flowtspan_build;
+    sp_object_class->set = sp_flowtspan_set;
+    sp_object_class->release = sp_flowtspan_release;
+    sp_object_class->write = sp_flowtspan_write;
+    sp_object_class->update = sp_flowtspan_update;
+    sp_object_class->modified = sp_flowtspan_modified;
 }
 
-static void
-sp_flowtspan_init (SPFlowtspan */*group*/)
+static void sp_flowtspan_init(SPFlowtspan */*group*/)
 {
 }
 
 static void sp_flowtspan_release(SPObject *object)
 {
-    if (((SPObjectClass *) flowtspan_parent_class)->release) {
-        ((SPObjectClass *) flowtspan_parent_class)->release(object);
+    if (reinterpret_cast<SPObjectClass *>(flowtspan_parent_class)->release) {
+        reinterpret_cast<SPObjectClass *>(flowtspan_parent_class)->release(object);
     }
 }
 
@@ -299,8 +286,8 @@ static void sp_flowtspan_update(SPObject *object, SPCtx *ctx, unsigned int flags
     SPItemCtx *ictx = reinterpret_cast<SPItemCtx *>(ctx);
     SPItemCtx cctx = *ictx;
 
-    if (((SPObjectClass *) (flowtspan_parent_class))->update) {
-        ((SPObjectClass *) (flowtspan_parent_class))->update(object, ctx, flags);
+    if (reinterpret_cast<SPObjectClass *>(flowtspan_parent_class)->update) {
+        reinterpret_cast<SPObjectClass *>(flowtspan_parent_class)->update(object, ctx, flags);
     }
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
@@ -333,8 +320,8 @@ static void sp_flowtspan_update(SPObject *object, SPCtx *ctx, unsigned int flags
 
 static void sp_flowtspan_modified(SPObject *object, guint flags)
 {
-    if (((SPObjectClass *) (flowtspan_parent_class))->modified) {
-        ((SPObjectClass *) (flowtspan_parent_class))->modified(object, flags);
+    if (reinterpret_cast<SPObjectClass *>(flowtspan_parent_class)->modified) {
+        reinterpret_cast<SPObjectClass *>(flowtspan_parent_class)->modified(object, flags);
     }
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
@@ -360,15 +347,15 @@ static void sp_flowtspan_modified(SPObject *object, guint flags)
 
 static void sp_flowtspan_build(SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr)
 {
-    if (((SPObjectClass *) flowtspan_parent_class)->build) {
-        ((SPObjectClass *) flowtspan_parent_class)->build(object, doc, repr);
+    if (reinterpret_cast<SPObjectClass *>(flowtspan_parent_class)->build) {
+        reinterpret_cast<SPObjectClass *>(flowtspan_parent_class)->build(object, doc, repr);
     }
 }
 
 static void sp_flowtspan_set(SPObject *object, unsigned int key, const gchar *value)
 {
-    if (((SPObjectClass *) flowtspan_parent_class)->set) {
-        (((SPObjectClass *) flowtspan_parent_class)->set)(object, key, value);
+    if (reinterpret_cast<SPObjectClass *>(flowtspan_parent_class)->set) {
+        reinterpret_cast<SPObjectClass *>(flowtspan_parent_class)->set(object, key, value);
     }
 }
 
@@ -444,34 +431,29 @@ sp_flowpara_get_type (void)
 	return group_type;
 }
 
-static void
-sp_flowpara_class_init (SPFlowparaClass *klass)
+static void sp_flowpara_class_init(SPFlowparaClass *klass)
 {
-	GObjectClass * object_class;
-	SPObjectClass * sp_object_class;
-
-	object_class = (GObjectClass *) klass;
-	sp_object_class = (SPObjectClass *) klass;
+    SPObjectClass *sp_object_class = reinterpret_cast<SPObjectClass *>(klass);
 
-	flowpara_parent_class = (SPItemClass *)g_type_class_ref (SP_TYPE_ITEM);
+    flowpara_parent_class = reinterpret_cast<SPItemClass *>(g_type_class_ref(SP_TYPE_ITEM));
 
-	sp_object_class->build = sp_flowpara_build;
-	sp_object_class->set = sp_flowpara_set;
-	sp_object_class->release = sp_flowpara_release;
-	sp_object_class->write = sp_flowpara_write;
-	sp_object_class->update = sp_flowpara_update;
-	sp_object_class->modified = sp_flowpara_modified;
+    sp_object_class->build = sp_flowpara_build;
+    sp_object_class->set = sp_flowpara_set;
+    sp_object_class->release = sp_flowpara_release;
+    sp_object_class->write = sp_flowpara_write;
+    sp_object_class->update = sp_flowpara_update;
+    sp_object_class->modified = sp_flowpara_modified;
 }
 
-static void
-sp_flowpara_init (SPFlowpara */*group*/)
+static void sp_flowpara_init (SPFlowpara */*group*/)
 {
 }
-static void
-sp_flowpara_release (SPObject *object)
+
+static void sp_flowpara_release(SPObject *object)
 {
-	if (((SPObjectClass *) flowpara_parent_class)->release)
-		((SPObjectClass *) flowpara_parent_class)->release (object);
+    if (reinterpret_cast<SPObjectClass *>(flowpara_parent_class)->release) {
+        reinterpret_cast<SPObjectClass *>(flowpara_parent_class)->release(object);
+    }
 }
 
 static void sp_flowpara_update(SPObject *object, SPCtx *ctx, unsigned int flags)
@@ -479,8 +461,8 @@ static void sp_flowpara_update(SPObject *object, SPCtx *ctx, unsigned int flags)
     SPItemCtx *ictx = reinterpret_cast<SPItemCtx *>(ctx);
     SPItemCtx cctx = *ictx;
 
-    if (((SPObjectClass *) (flowpara_parent_class))->update) {
-        ((SPObjectClass *) (flowpara_parent_class))->update(object, ctx, flags);
+    if (reinterpret_cast<SPObjectClass *>(flowpara_parent_class)->update) {
+        reinterpret_cast<SPObjectClass *>(flowpara_parent_class)->update(object, ctx, flags);
     }
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
@@ -513,8 +495,8 @@ static void sp_flowpara_update(SPObject *object, SPCtx *ctx, unsigned int flags)
 
 static void sp_flowpara_modified(SPObject *object, guint flags)
 {
-    if (((SPObjectClass *) (flowpara_parent_class))->modified) {
-        ((SPObjectClass *) (flowpara_parent_class))->modified(object, flags);
+    if (reinterpret_cast<SPObjectClass *>(flowpara_parent_class)->modified) {
+        reinterpret_cast<SPObjectClass *>(flowpara_parent_class)->modified(object, flags);
     }
 
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
@@ -538,18 +520,18 @@ static void sp_flowpara_modified(SPObject *object, guint flags)
     }
 }
 
-static void
-sp_flowpara_build (SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr)
+static void sp_flowpara_build(SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr)
 {
-	if (((SPObjectClass *) flowpara_parent_class)->build)
-		((SPObjectClass *) flowpara_parent_class)->build (object, doc, repr);
+    if (reinterpret_cast<SPObjectClass *>(flowpara_parent_class)->build) {
+        reinterpret_cast<SPObjectClass *>(flowpara_parent_class)->build(object, doc, repr);
+    }
 }
 
-static void
-sp_flowpara_set (SPObject *object, unsigned int key, const gchar *value)
+static void sp_flowpara_set(SPObject *object, unsigned int key, const gchar *value)
 {
-	if (((SPObjectClass *) flowpara_parent_class)->set)
-		(((SPObjectClass *) flowpara_parent_class)->set) (object, key, value);
+    if (reinterpret_cast<SPObjectClass *>(flowpara_parent_class)->set) {
+        reinterpret_cast<SPObjectClass *>(flowpara_parent_class)->set(object, key, value);
+    }
 }
 
 static Inkscape::XML::Node *sp_flowpara_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
@@ -598,8 +580,7 @@ static Inkscape::XML::Node *sp_flowpara_write(SPObject *object, Inkscape::XML::D
  *
  */
 
-GType
-sp_flowline_get_type (void)
+GType sp_flowline_get_type(void)
 {
 	static GType group_type = 0;
 	if (!group_type) {
@@ -620,62 +601,61 @@ sp_flowline_get_type (void)
 	return group_type;
 }
 
-static void
-sp_flowline_class_init (SPFlowlineClass *klass)
+static void sp_flowline_class_init(SPFlowlineClass *klass)
 {
-	GObjectClass * object_class;
-	SPObjectClass * sp_object_class;
-
-	object_class = (GObjectClass *) klass;
-	sp_object_class = (SPObjectClass *) klass;
+    SPObjectClass *sp_object_class = reinterpret_cast<SPObjectClass *>(klass);
 
-	flowline_parent_class = (SPObjectClass *)g_type_class_ref (SP_TYPE_OBJECT);
+    flowline_parent_class = reinterpret_cast<SPObjectClass *>(g_type_class_ref(SP_TYPE_OBJECT));
 
-	sp_object_class->release = sp_flowline_release;
-	sp_object_class->write = sp_flowline_write;
-	sp_object_class->modified = sp_flowline_modified;
+    sp_object_class->release = sp_flowline_release;
+    sp_object_class->write = sp_flowline_write;
+    sp_object_class->modified = sp_flowline_modified;
 }
 
-static void
-sp_flowline_init (SPFlowline */*group*/)
+static void sp_flowline_init(SPFlowline */*group*/)
 {
 }
-static void
-sp_flowline_release (SPObject *object)
+
+static void sp_flowline_release(SPObject *object)
 {
-	if (((SPObjectClass *) flowline_parent_class)->release)
-		((SPObjectClass *) flowline_parent_class)->release (object);
+    if (reinterpret_cast<SPObjectClass *>(flowline_parent_class)->release) {
+        reinterpret_cast<SPObjectClass *>(flowline_parent_class)->release(object);
+    }
 }
 
-static void
-sp_flowline_modified (SPObject *object, guint flags)
+static void sp_flowline_modified(SPObject *object, guint flags)
 {
-	if (((SPObjectClass *) (flowline_parent_class))->modified)
-		((SPObjectClass *) (flowline_parent_class))->modified (object, flags);
+    if (reinterpret_cast<SPObjectClass *>(flowline_parent_class)->modified) {
+        reinterpret_cast<SPObjectClass *>(flowline_parent_class)->modified(object, flags);
+    }
 
-	if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
-	flags &= SP_OBJECT_MODIFIED_CASCADE;
+    if (flags & SP_OBJECT_MODIFIED_FLAG) {
+        flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
+    }
+    flags &= SP_OBJECT_MODIFIED_CASCADE;
 }
-static Inkscape::XML::Node *
-sp_flowline_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
+
+static Inkscape::XML::Node *sp_flowline_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
 {
-	if ( flags&SP_OBJECT_WRITE_BUILD ) {
-		if ( repr == NULL ) repr = xml_doc->createElement("svg:flowLine");
-	} else {
-	}
+    if ( flags & SP_OBJECT_WRITE_BUILD ) {
+        if ( repr == NULL ) {
+            repr = xml_doc->createElement("svg:flowLine");
+        }
+    } else {
+    }
 
-	if (((SPObjectClass *) (flowline_parent_class))->write)
-		((SPObjectClass *) (flowline_parent_class))->write (object, xml_doc, repr, flags);
+    if (reinterpret_cast<SPObjectClass *>(flowline_parent_class)->write) {
+        reinterpret_cast<SPObjectClass *>(flowline_parent_class)->write(object, xml_doc, repr, flags);
+    }
 
-	return repr;
+    return repr;
 }
 
 /*
  *
  */
 
-GType
-sp_flowregionbreak_get_type (void)
+GType sp_flowregionbreak_get_type(void)
 {
 	static GType group_type = 0;
 	if (!group_type) {
@@ -696,54 +676,54 @@ sp_flowregionbreak_get_type (void)
 	return group_type;
 }
 
-static void
-sp_flowregionbreak_class_init (SPFlowregionbreakClass *klass)
+static void sp_flowregionbreak_class_init(SPFlowregionbreakClass *klass)
 {
-	GObjectClass * object_class;
-	SPObjectClass * sp_object_class;
+    SPObjectClass *sp_object_class = reinterpret_cast<SPObjectClass *>(klass);
 
-	object_class = (GObjectClass *) klass;
-	sp_object_class = (SPObjectClass *) klass;
+    flowregionbreak_parent_class = reinterpret_cast<SPObjectClass *>(g_type_class_ref(SP_TYPE_OBJECT));
 
-	flowregionbreak_parent_class = (SPObjectClass *)g_type_class_ref (SP_TYPE_OBJECT);
-
-	sp_object_class->release = sp_flowregionbreak_release;
-	sp_object_class->write = sp_flowregionbreak_write;
-	sp_object_class->modified = sp_flowregionbreak_modified;
+    sp_object_class->release = sp_flowregionbreak_release;
+    sp_object_class->write = sp_flowregionbreak_write;
+    sp_object_class->modified = sp_flowregionbreak_modified;
 }
 
-static void
-sp_flowregionbreak_init (SPFlowregionbreak */*group*/)
+static void sp_flowregionbreak_init(SPFlowregionbreak */*group*/)
 {
 }
-static void
-sp_flowregionbreak_release (SPObject *object)
+
+static void sp_flowregionbreak_release(SPObject *object)
 {
-	if (((SPObjectClass *) flowregionbreak_parent_class)->release)
-		((SPObjectClass *) flowregionbreak_parent_class)->release (object);
+    if (reinterpret_cast<SPObjectClass *>(flowregionbreak_parent_class)->release) {
+        reinterpret_cast<SPObjectClass *>(flowregionbreak_parent_class)->release(object);
+    }
 }
 
-static void
-sp_flowregionbreak_modified (SPObject *object, guint flags)
+static void sp_flowregionbreak_modified(SPObject *object, guint flags)
 {
-	if (((SPObjectClass *) (flowregionbreak_parent_class))->modified)
-		((SPObjectClass *) (flowregionbreak_parent_class))->modified (object, flags);
+    if (reinterpret_cast<SPObjectClass *>(flowregionbreak_parent_class)->modified) {
+        reinterpret_cast<SPObjectClass *>(flowregionbreak_parent_class)->modified(object, flags);
+    }
 
-	if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
-	flags &= SP_OBJECT_MODIFIED_CASCADE;
+    if (flags & SP_OBJECT_MODIFIED_FLAG) {
+        flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
+    }
+    flags &= SP_OBJECT_MODIFIED_CASCADE;
 }
-static Inkscape::XML::Node *
-sp_flowregionbreak_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
+
+static Inkscape::XML::Node *sp_flowregionbreak_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
 {
-	if ( flags&SP_OBJECT_WRITE_BUILD ) {
-		if ( repr == NULL ) repr = xml_doc->createElement("svg:flowLine");
-	} else {
-	}
+    if ( flags & SP_OBJECT_WRITE_BUILD ) {
+        if ( repr == NULL ) {
+            repr = xml_doc->createElement("svg:flowLine");
+        }
+    } else {
+    }
 
-	if (((SPObjectClass *) (flowregionbreak_parent_class))->write)
-		((SPObjectClass *) (flowregionbreak_parent_class))->write (object, xml_doc, repr, flags);
+    if (reinterpret_cast<SPObjectClass *>(flowregionbreak_parent_class)->write) {
+        reinterpret_cast<SPObjectClass *>(flowregionbreak_parent_class)->write(object, xml_doc, repr, flags);
+    }
 
-	return repr;
+    return repr;
 }
 
 /*
diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index 46969897f..fd5a8037e 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -576,15 +576,10 @@ GType sp_image_get_type(void)
 
 static void sp_image_class_init( SPImageClass * klass )
 {
-    GObjectClass * gobject_class;
-    SPObjectClass * sp_object_class;
-    SPItemClass * item_class;
+    SPObjectClass *sp_object_class = reinterpret_cast<SPObjectClass *>(klass);
+    SPItemClass *item_class = reinterpret_cast<SPItemClass *>(klass);
 
-    gobject_class = (GObjectClass *) klass;
-    sp_object_class = (SPObjectClass *) klass;
-    item_class = (SPItemClass *) klass;
-
-    parent_class = (SPItemClass*)g_type_class_ref (SPItem::getType ());
+    parent_class = reinterpret_cast<SPItemClass*>(g_type_class_ref(SPItem::getType()));
 
     sp_object_class->build = sp_image_build;
     sp_object_class->release = sp_image_release;
diff --git a/src/sp-metadata.cpp b/src/sp-metadata.cpp
index 3f2d3b584..831bb5a70 100644
--- a/src/sp-metadata.cpp
+++ b/src/sp-metadata.cpp
@@ -146,14 +146,13 @@ static void sp_metadata_release(SPObject *object)
 static void sp_metadata_set(SPObject *object, unsigned int key, const gchar *value)
 {
     debug("0x%08x %s(%u): '%s'",(unsigned int)object,
-            sp_attribute_name(key),key,value);
-    SPMetadata * metadata;
+          sp_attribute_name(key),key,value);
+    SP_METADATA(object); // ensures the object is of the proper type.
 
-    metadata = SP_METADATA (object);
-
-    /* see if any parents need this value */
-    if (((SPObjectClass *) metadata_parent_class)->set)
-        ((SPObjectClass *) metadata_parent_class)->set (object, key, value);
+    // see if any parents need this value
+    if (reinterpret_cast<SPObjectClass *>(metadata_parent_class)->set) {
+        reinterpret_cast<SPObjectClass *>(metadata_parent_class)->set(object, key, value);
+    }
 }
 
 /**
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index 2de38d9f8..c2640911e 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -89,13 +89,9 @@ sp_namedview_get_type()
 
 static void sp_namedview_class_init(SPNamedViewClass * klass)
 {
-    GObjectClass * gobject_class;
-    SPObjectClass * sp_object_class;
+    SPObjectClass *sp_object_class = reinterpret_cast<SPObjectClass *>(klass);
 
-    gobject_class = (GObjectClass *) klass;
-    sp_object_class = (SPObjectClass *) klass;
-
-    parent_class = (SPObjectGroupClass*) g_type_class_ref(SP_TYPE_OBJECTGROUP);
+    parent_class = reinterpret_cast<SPObjectGroupClass *>(g_type_class_ref(SP_TYPE_OBJECTGROUP));
 
     sp_object_class->build = sp_namedview_build;
     sp_object_class->release = sp_namedview_release;
diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index 892f24c95..826c271cf 100644
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -156,8 +156,8 @@ void SPObject::sp_object_init(SPObject *object)
     object->parent = object->next = NULL;
 
     //used XML Tree here.
-    Inkscape::XML::Node *repr = object->getRepr();
-    repr = NULL;
+    object->getRepr(); // TODO check why this call is made
+
     SPObjectImpl::setIdNull(object);
 
     object->_collection_policy = SPObject::COLLECT_WITH_PARENT;
diff --git a/src/sp-root.cpp b/src/sp-root.cpp
index 788d1958a..f405141bf 100644
--- a/src/sp-root.cpp
+++ b/src/sp-root.cpp
@@ -78,18 +78,12 @@ sp_root_get_type(void)
  * Initializes an SPRootClass object by setting its class and parent class objects, and registering
  * function pointers (i.e.\ gobject-style virtual functions) for various operations.
  */
-static void
-sp_root_class_init(SPRootClass *klass)
+static void sp_root_class_init(SPRootClass *klass)
 {
-    GObjectClass *object_class;
-    SPObjectClass *sp_object_class;
-    SPItemClass *sp_item_class;
-
-    object_class = G_OBJECT_CLASS(klass);
-    sp_object_class = (SPObjectClass *) klass;
-    sp_item_class = (SPItemClass *) klass;
+    SPObjectClass *sp_object_class = reinterpret_cast<SPObjectClass *>(klass);
+    SPItemClass *sp_item_class = reinterpret_cast<SPItemClass *>(klass);
 
-    parent_class = (SPGroupClass *)g_type_class_ref(SP_TYPE_GROUP);
+    parent_class = reinterpret_cast<SPGroupClass *>(g_type_class_ref(SP_TYPE_GROUP));
 
     sp_object_class->build = sp_root_build;
     sp_object_class->release = sp_root_release;
diff --git a/src/sp-spiral.cpp b/src/sp-spiral.cpp
index 298a4444a..5341f6fd9 100644
--- a/src/sp-spiral.cpp
+++ b/src/sp-spiral.cpp
@@ -6,6 +6,7 @@
  *   Mitsuru Oka <oka326@parkcity.ne.jp>
  *   Lauris Kaplinski <lauris@kaplinski.com>
  *   Abhishek Sharma
+ *   Jon A. Cruz <jon@joncruz.org>
  *
  * Copyright (C) 1999-2002 Lauris Kaplinski
  * Copyright (C) 2000-2001 Ximian, Inc.
@@ -74,22 +75,14 @@ sp_spiral_get_type (void)
 /**
  * SPSpiral vtable initialization.
  */
-static void
-sp_spiral_class_init (SPSpiralClass *klass)
+static void sp_spiral_class_init(SPSpiralClass *klass)
 {
-    GObjectClass * gobject_class;
-    SPObjectClass * sp_object_class;
-    SPItemClass * item_class;
-    SPLPEItemClass * lpe_item_class;
-    SPShapeClass *shape_class;
-
-    gobject_class = (GObjectClass *) klass;
-    sp_object_class = (SPObjectClass *) klass;
-    item_class = (SPItemClass *) klass;
-    lpe_item_class = (SPLPEItemClass *) klass;
-    shape_class = (SPShapeClass *) klass;
+    SPObjectClass *sp_object_class = reinterpret_cast<SPObjectClass *>(klass);
+    SPItemClass *item_class = reinterpret_cast<SPItemClass *>(klass);
+    SPLPEItemClass *lpe_item_class = reinterpret_cast<SPLPEItemClass *>(klass);
+    SPShapeClass *shape_class = reinterpret_cast<SPShapeClass *>(klass);
 
-    parent_class = (SPShapeClass *)g_type_class_ref (SP_TYPE_SHAPE);
+    parent_class = reinterpret_cast<SPShapeClass *>(g_type_class_ref(SP_TYPE_SHAPE));
 
     sp_object_class->build = sp_spiral_build;
     sp_object_class->write = sp_spiral_write;
@@ -122,11 +115,11 @@ sp_spiral_init (SPSpiral * spiral)
 /**
  * Virtual build: set spiral properties from corresponding repr.
  */
-static void
-sp_spiral_build (SPObject * object, SPDocument * document, Inkscape::XML::Node * repr)
+static void sp_spiral_build(SPObject * object, SPDocument * document, Inkscape::XML::Node * repr)
 {
-    if (((SPObjectClass *) parent_class)->build)
-        ((SPObjectClass *) parent_class)->build (object, document, repr);
+    if (reinterpret_cast<SPObjectClass *>(parent_class)->build) {
+        reinterpret_cast<SPObjectClass *>(parent_class)->build(object, document, repr);
+    }
 
     object->readAttr( "sodipodi:cx" );
     object->readAttr( "sodipodi:cy" );
@@ -164,10 +157,10 @@ sp_spiral_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::X
     }
 
      // make sure the curve is rebuilt with all up-to-date parameters
-     sp_spiral_set_shape ((SPShape *) spiral);
+     sp_spiral_set_shape(spiral);
 
     //Duplicate the path
-    SPCurve *curve = ((SPShape *) spiral)->curve;
+    SPCurve *curve = spiral->curve;
     //Nulls might be possible if this called iteratively
     if ( !curve ) {
             //g_warning("sp_spiral_write(): No path to copy\n");
@@ -177,8 +170,9 @@ sp_spiral_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::X
     repr->setAttribute("d", d);
     g_free (d);
 
-    if (((SPObjectClass *) (parent_class))->write)
-        ((SPObjectClass *) (parent_class))->write (object, xml_doc, repr, flags | SP_SHAPE_WRITE_PATH);
+    if (reinterpret_cast<SPObjectClass *>(parent_class)->write) {
+        reinterpret_cast<SPObjectClass *>(parent_class)->write(object, xml_doc, repr, flags | SP_SHAPE_WRITE_PATH);
+    }
 
     return repr;
 }
@@ -186,14 +180,9 @@ sp_spiral_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::X
 /**
  * Virtual set: change spiral object attribute.
  */
-static void
-sp_spiral_set (SPObject *object, unsigned int key, const gchar *value)
+static void sp_spiral_set(SPObject *object, unsigned int key, const gchar *value)
 {
-    SPSpiral *spiral;
-    SPShape  *shape;
-
-    spiral = SP_SPIRAL (object);
-    shape  = SP_SHAPE (object);
+    SPSpiral *spiral = SP_SPIRAL(object);
 
     /// \todo fixme: we should really collect updates
     switch (key) {
@@ -273,8 +262,9 @@ sp_spiral_set (SPObject *object, unsigned int key, const gchar *value)
         object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
         break;
     default:
-        if (((SPObjectClass *) parent_class)->set)
-            ((SPObjectClass *) parent_class)->set (object, key, value);
+        if (reinterpret_cast<SPObjectClass *>(parent_class)->set) {
+            reinterpret_cast<SPObjectClass *>(parent_class)->set(object, key, value);
+        }
         break;
     }
 }
@@ -282,19 +272,18 @@ sp_spiral_set (SPObject *object, unsigned int key, const gchar *value)
 /**
  * Virtual update callback.
  */
-static void
-sp_spiral_update (SPObject *object, SPCtx *ctx, guint flags)
+static void sp_spiral_update(SPObject *object, SPCtx *ctx, guint flags)
 {
     if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG | SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) {
-        ((SPShape *) object)->setShape ();
+        reinterpret_cast<SPShape *>(object)->setShape();
     }
 
-    if (((SPObjectClass *) parent_class)->update)
-        ((SPObjectClass *) parent_class)->update (object, ctx, flags);
+    if (reinterpret_cast<SPObjectClass *>(parent_class)->update) {
+        reinterpret_cast<SPObjectClass *>(parent_class)->update(object, ctx, flags);
+    }
 }
 
-static void
-sp_spiral_update_patheffect(SPLPEItem *lpeitem, bool write)
+static void sp_spiral_update_patheffect(SPLPEItem *lpeitem, bool write)
 {
     SPShape *shape = (SPShape *) lpeitem;
     sp_spiral_set_shape(shape);
@@ -310,14 +299,13 @@ sp_spiral_update_patheffect(SPLPEItem *lpeitem, bool write)
         }
     }
 
-    ((SPObject *)shape)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    shape->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 /**
  * Return textual description of spiral.
  */
-static gchar *
-sp_spiral_description (SPItem * item)
+static gchar *sp_spiral_description(SPItem * item)
 {
     // TRANSLATORS: since turn count isn't an integer, please adjust the
     // string as needed to deal with an localized plural forms.
diff --git a/src/sp-star.cpp b/src/sp-star.cpp
index d224ff1ba..8ea10f52b 100644
--- a/src/sp-star.cpp
+++ b/src/sp-star.cpp
@@ -69,22 +69,14 @@ sp_star_get_type (void)
     return type;
 }
 
-static void
-sp_star_class_init (SPStarClass *klass)
+static void sp_star_class_init(SPStarClass *klass)
 {
-    GObjectClass * gobject_class;
-    SPObjectClass * sp_object_class;
-    SPItemClass * item_class;
-    SPLPEItemClass * lpe_item_class;
-    SPShapeClass * shape_class;
-
-    gobject_class = (GObjectClass *) klass;
-    sp_object_class = (SPObjectClass *) klass;
-    item_class = (SPItemClass *) klass;
-    lpe_item_class = (SPLPEItemClass *) klass;
-    shape_class = (SPShapeClass *) klass;
-
-    parent_class = (SPShapeClass *)g_type_class_ref (SP_TYPE_SHAPE);
+    SPObjectClass *sp_object_class = reinterpret_cast<SPObjectClass *>(klass);
+    SPItemClass *item_class = reinterpret_cast<SPItemClass *>(klass);
+    SPLPEItemClass *lpe_item_class = reinterpret_cast<SPLPEItemClass *>(klass);
+    SPShapeClass *shape_class = reinterpret_cast<SPShapeClass *>(klass);
+
+    parent_class = reinterpret_cast<SPShapeClass *>(g_type_class_ref(SP_TYPE_SHAPE));
 
     sp_object_class->build = sp_star_build;
     sp_object_class->write = sp_star_write;
diff --git a/src/sp-tspan.cpp b/src/sp-tspan.cpp
index f4e79f7d5..1b1ae3d52 100644
--- a/src/sp-tspan.cpp
+++ b/src/sp-tspan.cpp
@@ -92,12 +92,12 @@ sp_tspan_class_init(SPTSpanClass *classname)
 {
     SPObjectClass * sp_object_class;
     SPItemClass * item_class;
-	
+
     sp_object_class = (SPObjectClass *) classname;
     item_class = (SPItemClass *) classname;
-	
+
     tspan_parent_class = (SPItemClass*)g_type_class_ref(SP_TYPE_ITEM);
-	
+
     sp_object_class->build = sp_tspan_build;
     sp_object_class->release = sp_tspan_release;
     sp_object_class->set = sp_tspan_set;
@@ -122,7 +122,7 @@ sp_tspan_release(SPObject *object)
     SPTSpan *tspan = SP_TSPAN(object);
 
     tspan->attributes.~TextTagAttributes();
-	
+
     if (((SPObjectClass *) tspan_parent_class)->release)
         ((SPObjectClass *) tspan_parent_class)->release(object);
 }
@@ -131,14 +131,14 @@ static void
 sp_tspan_build(SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr)
 {
     //SPTSpan *tspan = SP_TSPAN(object);
-	
+
     object->readAttr( "x" );
     object->readAttr( "y" );
     object->readAttr( "dx" );
     object->readAttr( "dy" );
     object->readAttr( "rotate" );
     object->readAttr( "sodipodi:role" );
-	
+
     if (((SPObjectClass *) tspan_parent_class)->build)
         ((SPObjectClass *) tspan_parent_class)->build(object, doc, repr);
 }
@@ -147,7 +147,7 @@ static void
 sp_tspan_set(SPObject *object, unsigned key, gchar const *value)
 {
     SPTSpan *tspan = SP_TSPAN(object);
-	
+
     if (tspan->attributes.readSingleAttribute(key, value)) {
         object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
     } else {
@@ -172,12 +172,12 @@ static void sp_tspan_update(SPObject *object, SPCtx *ctx, guint flags)
     if (((SPObjectClass *) tspan_parent_class)->update) {
         ((SPObjectClass *) tspan_parent_class)->update(object, ctx, flags);
     }
-	
+
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
     }
     flags &= SP_OBJECT_MODIFIED_CASCADE;
-	
+
     for ( SPObject *ochild = object->firstChild() ; ochild ; ochild = ochild->getNext() ) {
         if ( flags || ( ochild->uflags & SP_OBJECT_MODIFIED_FLAG )) {
 	    ochild->updateDisplay(ctx, flags);
@@ -190,12 +190,12 @@ static void sp_tspan_modified(SPObject *object, unsigned flags)
     if (((SPObjectClass *) tspan_parent_class)->modified) {
         ((SPObjectClass *) tspan_parent_class)->modified(object, flags);
     }
-	
+
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
     }
     flags &= SP_OBJECT_MODIFIED_CASCADE;
-	
+
     for ( SPObject *ochild = object->firstChild() ; ochild ; ochild = ochild->getNext() ) {
         if (flags || (ochild->mflags & SP_OBJECT_MODIFIED_FLAG)) {
             ochild->emitModified(flags);
@@ -237,9 +237,9 @@ sp_tspan_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML
     if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
         repr = xml_doc->createElement("svg:tspan");
     }
-	
+
     tspan->attributes.writeTo(repr);
-	
+
     if ( flags&SP_OBJECT_WRITE_BUILD ) {
         GSList *l = NULL;
         for (SPObject* child = object->firstChild() ; child ; child = child->getNext() ) {
@@ -271,11 +271,11 @@ sp_tspan_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML
             }
         }
     }
-	
+
     if (((SPObjectClass *) tspan_parent_class)->write) {
         ((SPObjectClass *) tspan_parent_class)->write(object, xml_doc, repr, flags);
     }
-	
+
     return repr;
 }
 
@@ -333,20 +333,15 @@ sp_textpath_get_type()
     return type;
 }
 
-static void
-sp_textpath_class_init(SPTextPathClass *classname)
+static void sp_textpath_class_init(SPTextPathClass *classname)
 {
-    GObjectClass  *gobject_class = (GObjectClass *) classname;
-    SPObjectClass * sp_object_class;
-    SPItemClass * item_class;
-	
-    sp_object_class = (SPObjectClass *) classname;
-    item_class = (SPItemClass *) classname;
-	
-    textpath_parent_class = (SPItemClass*)g_type_class_ref(SP_TYPE_ITEM);
-	
+    GObjectClass  *gobject_class = reinterpret_cast<GObjectClass *>(classname);
+    SPObjectClass *sp_object_class = reinterpret_cast<SPObjectClass *>(classname);
+
+    textpath_parent_class = reinterpret_cast<SPItemClass*>(g_type_class_ref(SP_TYPE_ITEM));
+
     gobject_class->finalize = sp_textpath_finalize;
-		
+
     sp_object_class->build = sp_textpath_build;
     sp_object_class->release = sp_textpath_release;
     sp_object_class->set = sp_textpath_set;
@@ -359,7 +354,7 @@ static void
 sp_textpath_init(SPTextPath *textpath)
 {
     new (&textpath->attributes) TextTagAttributes;
-	
+
     textpath->startOffset._set = false;
     textpath->originalPath = NULL;
     textpath->isUpdating=false;
@@ -372,7 +367,7 @@ static void
 sp_textpath_finalize(GObject *obj)
 {
     SPTextPath *textpath = (SPTextPath *) obj;
-	
+
     delete textpath->sourcePath;
 }
 
@@ -380,12 +375,12 @@ static void
 sp_textpath_release(SPObject *object)
 {
     SPTextPath *textpath = SP_TEXTPATH(object);
-	
+
     textpath->attributes.~TextTagAttributes();
-	
+
     if (textpath->originalPath) delete textpath->originalPath;
     textpath->originalPath = NULL;
-		
+
     if (((SPObjectClass *) textpath_parent_class)->release)
         ((SPObjectClass *) textpath_parent_class)->release(object);
 }
@@ -399,7 +394,7 @@ static void sp_textpath_build(SPObject *object, SPDocument *doc, Inkscape::XML::
     object->readAttr( "rotate" );
     object->readAttr( "startOffset" );
     object->readAttr( "xlink:href" );
-	
+
     bool  no_content = true;
     for (Inkscape::XML::Node* rch = repr->firstChild() ; rch != NULL; rch = rch->next()) {
         if ( rch->type() == Inkscape::XML::TEXT_NODE )
@@ -408,13 +403,13 @@ static void sp_textpath_build(SPObject *object, SPDocument *doc, Inkscape::XML::
             break;
         }
     }
-	
+
     if ( no_content ) {
         Inkscape::XML::Document *xml_doc = doc->getReprDoc();
         Inkscape::XML::Node* rch = xml_doc->createTextNode("");
         repr->addChild(rch, NULL);
     }
-	
+
     if (((SPObjectClass *) textpath_parent_class)->build) {
         ((SPObjectClass *) textpath_parent_class)->build(object, doc, repr);
     }
@@ -424,7 +419,7 @@ static void
 sp_textpath_set(SPObject *object, unsigned key, gchar const *value)
 {
     SPTextPath *textpath = SP_TEXTPATH(object);
-	
+
     if (textpath->attributes.readSingleAttribute(key, value)) {
         object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
     } else {
@@ -447,22 +442,22 @@ sp_textpath_set(SPObject *object, unsigned key, gchar const *value)
 static void sp_textpath_update(SPObject *object, SPCtx *ctx, guint flags)
 {
     SPTextPath *textpath = SP_TEXTPATH(object);
-	
+
     textpath->isUpdating = true;
     if ( textpath->sourcePath->sourceDirty ) {
         refresh_textpath_source(textpath);
     }
     textpath->isUpdating = false;
-		
+
     if (((SPObjectClass *) textpath_parent_class)->update) {
         ((SPObjectClass *) textpath_parent_class)->update(object, ctx, flags);
     }
-		
+
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
     }
     flags &= SP_OBJECT_MODIFIED_CASCADE;
-			
+
     for ( SPObject *ochild = object->firstChild() ; ochild ; ochild = ochild->getNext() ) {
         if ( flags || ( ochild->uflags & SP_OBJECT_MODIFIED_FLAG )) {
             ochild->updateDisplay(ctx, flags);
@@ -476,18 +471,18 @@ void   refresh_textpath_source(SPTextPath* tp)
     if ( tp == NULL ) return;
     tp->sourcePath->refresh_source();
     tp->sourcePath->sourceDirty=false;
-	
+
     // finalisons
     if ( tp->sourcePath->originalPath ) {
         if (tp->originalPath) {
             delete tp->originalPath;
         }
         tp->originalPath = NULL;
-		
+
         tp->originalPath = new Path;
         tp->originalPath->Copy(tp->sourcePath->originalPath);
         tp->originalPath->ConvertWithBackData(0.01);
-		
+
     }
 }
 
@@ -496,12 +491,12 @@ static void sp_textpath_modified(SPObject *object, unsigned flags)
     if (((SPObjectClass *) textpath_parent_class)->modified) {
         ((SPObjectClass *) textpath_parent_class)->modified(object, flags);
     }
-	
+
     if (flags & SP_OBJECT_MODIFIED_FLAG) {
         flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
     }
     flags &= SP_OBJECT_MODIFIED_CASCADE;
-	
+
     for ( SPObject *ochild = object->firstChild() ; ochild ; ochild = ochild->getNext() ) {
         if (flags || (ochild->mflags & SP_OBJECT_MODIFIED_FLAG)) {
             ochild->emitModified(flags);
@@ -516,7 +511,7 @@ sp_textpath_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::
     if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
         repr = xml_doc->createElement("svg:textPath");
     }
-	
+
     textpath->attributes.writeTo(repr);
     if (textpath->startOffset._set) {
         if (textpath->startOffset.unit == SVGLength::PERCENT) {
@@ -531,7 +526,7 @@ sp_textpath_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::
     }
 
     if ( textpath->sourcePath->sourceHref ) repr->setAttribute("xlink:href", textpath->sourcePath->sourceHref);
-	
+
     if ( flags&SP_OBJECT_WRITE_BUILD ) {
         GSList *l = NULL;
         for (SPObject* child = object->firstChild() ; child ; child = child->getNext() ) {
@@ -563,11 +558,11 @@ sp_textpath_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::
             }
         }
     }
-	
+
     if (((SPObjectClass *) textpath_parent_class)->write) {
         ((SPObjectClass *) textpath_parent_class)->write(object, xml_doc, repr, flags);
     }
-	
+
     return repr;
 }
 
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 22b0f2241..b46963b2f 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -1326,23 +1326,11 @@ void sp_selected_path_create_updating_inset(SPDesktop *desktop)
     sp_selected_path_create_offset_object(desktop, -1, true);
 }
 
-void
-sp_selected_path_create_offset_object(SPDesktop *desktop, int expand, bool updating)
+void sp_selected_path_create_offset_object(SPDesktop *desktop, int expand, bool updating)
 {
-    Inkscape::Selection *selection;
-    Inkscape::XML::Node *repr;
-    SPItem *item;
-    SPCurve *curve;
-    gchar *style, *str;
-    float o_width, o_miter;
-    JoinType o_join;
-    ButtType o_butt;
-
-    curve = NULL;
-
-    selection = sp_desktop_selection(desktop);
-
-    item = selection->singleItem();
+    SPCurve *curve = NULL;
+    Inkscape::Selection *selection = sp_desktop_selection(desktop);
+    SPItem *item = selection->singleItem();
 
     if (item == NULL || ( !SP_IS_SHAPE(item) && !SP_IS_TEXT(item) ) ) {
         desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("Selected object is <b>not a path</b>, cannot inset/outset."));
@@ -1351,28 +1339,35 @@ sp_selected_path_create_offset_object(SPDesktop *desktop, int expand, bool updat
     if (SP_IS_SHAPE(item))
     {
         curve = SP_SHAPE(item)->getCurve();
-        if (curve == NULL)
+        if (curve == NULL) {
             return;
+        }
     }
     if (SP_IS_TEXT(item))
     {
         curve = SP_TEXT(item)->getNormalizedBpath();
-        if (curve == NULL)
+        if (curve == NULL) {
             return;
+        }
     }
 
     Geom::Affine const transform(item->transform);
 
     item->doWriteTransform(item->getRepr(), Geom::identity());
 
-	//XML Tree being used directly here while it shouldn't be...
-    style = g_strdup(item->getRepr()->attribute("style"));
+    //XML Tree being used directly here while it shouldn't be...
+    gchar *style = g_strdup(item->getRepr()->attribute("style"));
 
     // remember the position of the item
     gint pos = item->getRepr()->position();
+
     // remember parent
     Inkscape::XML::Node *parent = item->getRepr()->parent();
 
+    float o_width = 0;
+    JoinType o_join = join_straight;
+    ButtType o_butt = butt_straight;
+    float o_miter = 0;
     {
         SPStyle *i_style = item->style;
         int jointype = i_style->stroke_linejoin.value;
@@ -1475,12 +1470,8 @@ sp_selected_path_create_offset_object(SPDesktop *desktop, int expand, bool updat
     }
 
     {
-        gchar tstr[80];
-
-        tstr[79] = '\0';
-
         Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
-        repr = xml_doc->createElement("svg:path");
+        Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
         repr->setAttribute("sodipodi:type", "inkscape:offset");
         sp_repr_set_svg_double(repr, "inkscape:radius", ( expand > 0
                                                           ? o_width
@@ -1488,9 +1479,10 @@ sp_selected_path_create_offset_object(SPDesktop *desktop, int expand, bool updat
                                                           ? -o_width
                                                           : 0 ));
 
-        str = res->svg_dump_path();
+        gchar *str = res->svg_dump_path();
         repr->setAttribute("inkscape:original", str);
         g_free(str);
+        str = 0;
 
         if ( updating ) {
 
@@ -1591,9 +1583,10 @@ sp_selected_path_do_offset(SPDesktop *desktop, bool expand, double prefOffset)
 
         gchar *style = g_strdup(item->getRepr()->attribute("style"));
 
-        float o_width, o_miter;
-        JoinType o_join;
-        ButtType o_butt;
+        float o_width = 0;
+        float o_miter = 0;
+        JoinType o_join = join_straight;
+        ButtType o_butt = butt_straight;
 
         {
             SPStyle *i_style = item->style;
@@ -1736,11 +1729,6 @@ sp_selected_path_do_offset(SPDesktop *desktop, bool expand, double prefOffset)
         item->deleteObject(false);
 
         if (res->descr_cmd.size() > 1) { // if there's 0 or 1 node left, drop this path altogether
-
-            gchar tstr[80];
-
-            tstr[79] = '\0';
-
             Inkscape::XML::Document *xml_doc = desktop->doc()->getReprDoc();
             Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
 
diff --git a/src/spray-context.cpp b/src/spray-context.cpp
index ab5423f27..87247f2a6 100644
--- a/src/spray-context.cpp
+++ b/src/spray-context.cpp
@@ -133,7 +133,6 @@ static void sp_spray_context_class_init(SPSprayContextClass *klass)
 /* Method to rotate items */
 void sp_spray_rotate_rel(Geom::Point c, SPDesktop */*desktop*/, SPItem *item, Geom::Rotate const &rotation)
 {
-    Geom::Point center = c;
     Geom::Translate const s(c);
     Geom::Affine affine = Geom::Affine(s).inverse() * Geom::Affine(rotation) * Geom::Affine(s);
     // Rotate item.
diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp
index 986295aef..41ff675ac 100644
--- a/src/widgets/sp-attribute-widget.cpp
+++ b/src/widgets/sp-attribute-widget.cpp
@@ -239,14 +239,9 @@ void SPAttributeTable::change_object(SPObject *object)
         // Set up object
         modified_connection = object->connectModified(sigc::bind<2>(sigc::ptr_fun(&sp_attribute_table_object_modified), this));
         release_connection  = object->connectRelease (sigc::bind<1>(sigc::ptr_fun(&sp_attribute_table_object_release), this));
-        Gtk::Entry *ee;
-        Gtk::Widget *w;
-        const gchar *val;
         for (guint i = 0; i < (_attributes.size()); i++) {
-            ee = (Gtk::Entry *)_entries[i];
-            w = (Gtk::Widget *) ee;
-            val = object->getRepr()->attribute(_attributes[i].c_str());
-            ee->set_text (val ? val : (const gchar *) "");
+            const gchar *val = object->getRepr()->attribute(_attributes[i].c_str());
+            _entries[i]->set_text(val ? val : "");
         }
     }