more cast cleanup

(bzr r13922.1.11)

4 files changed, 8 insertions, 8 deletions

diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index 7d5a89cf5..1d258bbb0 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -579,7 +579,7 @@ void FillNStroke::updateFromPaint()
                     for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
                         //FIXME: see above
                         if (kind == FILL) {
-                            sp_repr_css_change_recursive(reinterpret_cast<SPObject*>(*i)->getRepr(), css, "style");
+                            sp_repr_css_change_recursive((*i)->getRepr(), css, "style");
                         }
 
                         if (!vector) {
@@ -605,7 +605,7 @@ void FillNStroke::updateFromPaint()
                     for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
                         //FIXME: see above
                         if (kind == FILL) {
-                            sp_repr_css_change_recursive(reinterpret_cast<SPObject*>(*i)->getRepr(), css, "style");
+                            sp_repr_css_change_recursive((*i)->getRepr(), css, "style");
                         }
 
                         SPGradient *gr = sp_item_set_gradient(*i, vector, gradient_type, (kind == FILL) ? Inkscape::FOR_FILL : Inkscape::FOR_STROKE);
@@ -649,11 +649,11 @@ void FillNStroke::updateFromPaint()
                     // objects who already have the same root pattern but through a different href
                     // chain. FIXME: move this to a sp_item_set_pattern
                     for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
-                        Inkscape::XML::Node *selrepr = reinterpret_cast<SPObject*>(*i)->getRepr();
+                        Inkscape::XML::Node *selrepr = (*i)->getRepr();
                         if ( (kind == STROKE) && !selrepr) {
                             continue;
                         }
-                        SPObject *selobj = reinterpret_cast<SPObject*>(*i);
+                        SPObject *selobj = *i;
 
                         SPStyle *style = selobj->style;
                         if (style && ((kind == FILL) ? style->fill : style->stroke).isPaintserver()) {
diff --git a/src/widgets/rect-toolbar.cpp b/src/widgets/rect-toolbar.cpp
index 2b07dd3b9..37ffd7553 100644
--- a/src/widgets/rect-toolbar.cpp
+++ b/src/widgets/rect-toolbar.cpp
@@ -112,7 +112,7 @@ static void sp_rtb_value_changed(GtkAdjustment *adj, GObject *tbl, gchar const *
             if (gtk_adjustment_get_value(adj) != 0) {
                 (SP_RECT(*i)->*setter)(Quantity::convert(gtk_adjustment_get_value(adj), unit, desktop->getNamedView()->svg_units));
             } else {
-                SP_OBJECT(*i)->getRepr()->setAttribute(value_name, NULL);
+                (*i)->getRepr()->setAttribute(value_name, NULL);
             }
             modmade = true;
         }
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index c05ef93e7..481fa0609 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -983,7 +983,7 @@ StrokeStyle::scaleLine()
             if (unit->type == Inkscape::Util::UNIT_TYPE_LINEAR) {
                 width = Inkscape::Util::Quantity::convert(width_typed, unit, "px");
             } else { // percentage
-                gdouble old_w = SP_OBJECT(*i)->style->stroke_width.computed;
+                gdouble old_w = (*i)->style->stroke_width.computed;
                 width = old_w * width_typed / 100;
             }
 
@@ -1167,7 +1167,7 @@ StrokeStyle::updateAllMarkers(std::vector<SPItem*> const &objects)
 
     // We show markers of the first object in the list only
     // FIXME: use the first in the list that has the marker of each type, if any
-    SPObject *object = SP_OBJECT(objects[0]);
+    SPObject *object = objects[0];
 
     for (unsigned i = 0; i < G_N_ELEMENTS(keyloc); ++i) {
         // For all three marker types,
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index 6b0fb34e6..2160cad2e 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -522,7 +522,7 @@ static void sp_text_lineheight_value_changed( GtkAdjustment *adj, GObject *tbl )
     std::vector<SPItem*> itemlist=selection->itemList();
     for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
         if (SP_IS_TEXT (*i)) {
-            SP_OBJECT(*i)->getRepr()->setAttribute("sodipodi:linespacing", sp_repr_css_property (css, "line-height", NULL));
+            (*i)->getRepr()->setAttribute("sodipodi:linespacing", sp_repr_css_property (css, "line-height", NULL));
             modmade = true;
         }
     }