more cast cleanup

(bzr r13922.1.11)

10 files changed, 21 insertions, 21 deletions

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index a38a52371..3fe935e7d 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -706,7 +706,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
 
     // copy style for Paste Style action
     if (!sorted_items.empty()) {
-        SPObject *object = static_cast<SPObject *>(sorted_items[0]);
+        SPObject *object = sorted_items[0];
         SPItem *item = dynamic_cast<SPItem *>(object);
         if (item) {
             SPCSSAttr *style = take_style_from_item(item);
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 45c8ce68a..cb2771503 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -1467,7 +1467,7 @@ void FilterEffectsDialog::FilterModifier::update_selection(Selection *sel)
     std::set<SPObject*> used;
     std::vector<SPItem*> itemlist=sel->itemList();
     for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
-        SPObject *obj = SP_OBJECT (*i);
+        SPObject *obj = *i;
         SPStyle *style = obj->style;
         if (!style || !SP_IS_ITEM(obj)) {
             continue;
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index dde040036..173acca93 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -562,7 +562,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
 
     if (check_searchin_text.get_active()) {
         for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
-            SPObject *obj = SP_OBJECT (*i);
+            SPObject *obj = *i;
             SPItem *item = dynamic_cast<SPItem *>(obj);
             g_assert(item != NULL);
             if (item_text_match(item, text, exact, casematch)) {
@@ -585,7 +585,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
 
         if (ids) {
             for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
-                SPObject *obj = SP_OBJECT (*i);
+                SPObject *obj = *i;
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 if (item_id_match(item, text, exact, casematch)) {
                     if (out.end()==find(out.begin(),out.end(), *i)) {
@@ -601,7 +601,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
 
         if (style) {
             for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
-                SPObject *obj = SP_OBJECT (*i);
+                SPObject *obj = *i;
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 g_assert(item != NULL);
                 if (item_style_match(item, text, exact, casematch)) {
@@ -618,7 +618,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
 
         if (attrname) {
             for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
-                SPObject *obj = SP_OBJECT (*i);
+                SPObject *obj = *i;
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 g_assert(item != NULL);
                 if (item_attr_match(item, text, exact, casematch)) {
@@ -635,7 +635,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
 
         if (attrvalue) {
             for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
-                SPObject *obj = SP_OBJECT (*i);
+                SPObject *obj = *i;
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 g_assert(item != NULL);
                 if (item_attrvalue_match(item, text, exact, casematch)) {
@@ -652,7 +652,7 @@ std::vector<SPItem*> Find::filter_fields (std::vector<SPItem*> &l, bool exact, b
 
         if (font) {
             for(std::vector<SPItem*>::const_reverse_iterator i=in.rbegin(); in.rend() != i; i++) {
-                SPObject *obj = SP_OBJECT (*i);
+                SPObject *obj = *i;
                 SPItem *item = dynamic_cast<SPItem *>(obj);
                 g_assert(item != NULL);
                 if (item_font_match(item, text, exact, casematch)) {
@@ -719,7 +719,7 @@ std::vector<SPItem*> Find::filter_types (std::vector<SPItem*> &l)
 {
     std::vector<SPItem*> n;
     for(std::vector<SPItem*>::const_reverse_iterator i=l.rbegin(); l.rend() != i; i++) {
-        SPObject *obj = SP_OBJECT (*i);
+        SPObject *obj = *i;
         SPItem *item = dynamic_cast<SPItem *>(obj);
         g_assert(item != NULL);
         if (item_type_match(item)) {
@@ -763,7 +763,7 @@ std::vector<SPItem*> &Find::all_selection_items (Inkscape::Selection *s, std::ve
 {
 	std::vector<SPItem*> itemlist=s->itemList();
     for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
-        SPObject *obj = SP_OBJECT (*i);
+        SPObject *obj = *i;
         SPItem *item = dynamic_cast<SPItem *>(obj);
         g_assert(item != NULL);
         if (item && !item->cloned && !desktop->isLayer(item)) {
@@ -857,7 +857,7 @@ void Find::onAction()
         Inkscape::Selection *selection = desktop->getSelection();
         selection->clear();
         selection->setList(n);
-        SPObject *obj = reinterpret_cast<SPObject *>(n[0]);
+        SPObject *obj = n[0];
         SPItem *item = dynamic_cast<SPItem *>(obj);
         g_assert(item != NULL);
         scroll_to_show_item(desktop, item);
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 8bd130c2e..4465d73a9 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -210,7 +210,7 @@ void GridArrangeTab::arrange()
         cnt=0;
         const std::vector<SPItem*> sizes(sorted);
         for (std::vector<SPItem*>::const_iterator i = sizes.begin();i!=sizes.end();i++) {
-            SPItem *item = SP_ITEM(*i);
+            SPItem *item = *i;
             Geom::OptRect b = item->documentVisualBounds();
             if (b) {
                 width = b->dimensions()[Geom::X];
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index 5fab9fcfc..ed71c826f 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -652,7 +652,7 @@ bool TagsPanel::_handleButtonEvent(GdkEventButton* event)
                             bool wasadded = false;
                             std::vector<SPItem*> items=_desktop->selection->itemList();
                         	for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
-                                SPObject *newobj = reinterpret_cast<SPObject *>(*i);
+                                SPObject *newobj = *i;
                                 bool addchild = true;
                                 for ( SPObject *child = obj->children; child != NULL; child = child->next) {
                                     if (SP_IS_TAG_USE(child) && SP_TAG_USE(child)->ref->getObject() == newobj) {
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index 9c4790379..815aa12ef 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -549,7 +549,7 @@ void TextEdit::onApply()
         if (SP_IS_TEXT (*i)) {
 
             // backwards compatibility:
-            reinterpret_cast<SPObject*>(*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));
 
             ++items;
         }
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index 21ad18c26..a9e109b5c 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -934,7 +934,7 @@ static void sp_gradient_drag(GradientTool &rc, Geom::Point const pt, guint /*sta
                 sp_item_gradient_set_coords (*i, POINT_RG_CENTER, 0, rc.origin, fill_or_stroke, true, false);
                 sp_item_gradient_set_coords (*i, POINT_RG_R1, 0, pt, fill_or_stroke, true, false);
             }
-            SP_OBJECT(*i)->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            (*i)->requestModified(SP_OBJECT_MODIFIED_FLAG);
         }
         if (ec->_grdrag) {
             ec->_grdrag->updateDraggers();
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index c8e032089..2c817694e 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -965,13 +965,13 @@ static void sp_mesh_drag(MeshTool &rc, Geom::Point const /*pt*/, guint /*state*/
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
 
             //FIXME: see above
-            sp_repr_css_change_recursive(SP_OBJECT(*i)->getRepr(), css, "style");
+            sp_repr_css_change_recursive((*i)->getRepr(), css, "style");
 
-            sp_item_set_gradient(SP_ITEM(*i), vector, (SPGradientType) type, fill_or_stroke);
+            sp_item_set_gradient(*i, vector, (SPGradientType) type, fill_or_stroke);
 
             // We don't need to do anything. Mesh is already sized appropriately.
  
-            SP_OBJECT(*i)->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            (*i)->requestModified(SP_OBJECT_MODIFIED_FLAG);
         }
         // if (ec->_grdrag) {
         //     ec->_grdrag->updateDraggers();
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 6ddb379cc..374386686 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -422,7 +422,7 @@ void NodeTool::selection_changed(Inkscape::Selection *sel) {
 
     std::vector<SPItem*> items=sel->itemList();
     for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
-        SPObject *obj = static_cast<SPObject*>(*i);
+        SPObject *obj = *i;
 
         if (SP_IS_ITEM(obj)) {
             gather_items(this, NULL, static_cast<SPItem*>(obj), SHAPE_ROLE_NORMAL, shapes);
diff --git a/src/ui/widget/style-subject.cpp b/src/ui/widget/style-subject.cpp
index 1ded546dd..95b89bf5f 100644
--- a/src/ui/widget/style-subject.cpp
+++ b/src/ui/widget/style-subject.cpp
@@ -114,7 +114,7 @@ void StyleSubject::CurrentLayer::_setLayer(SPObject *layer) {
     _layer_release.disconnect();
     _layer_modified.disconnect();
     if (_element) {
-        sp_object_unref(static_cast<SPObject *>(_element), NULL);
+        sp_object_unref(_element, NULL);
     }
     _element = layer;
     if (layer) {
@@ -126,7 +126,7 @@ void StyleSubject::CurrentLayer::_setLayer(SPObject *layer) {
 }
 
 SPObject *StyleSubject::CurrentLayer::_getLayer() const {
-    return static_cast<SPObject *>(_element);
+    return _element;
 }
 
 SPObject *StyleSubject::CurrentLayer::_getLayerSList() const {