corrected the casts (hopefully)

(bzr r13922.1.10)

26 files changed, 68 insertions, 82 deletions

diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 52bc24f5f..a38a52371 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -525,7 +525,7 @@ bool ClipboardManagerImpl::pasteSize(SPDesktop *desktop, bool separately, bool a
         if (separately) {
         	std::vector<SPItem*> itemlist=selection->itemList();
             for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
-                SPItem *item = SP_ITEM(*i);
+                SPItem *item = *i;
                 if (item) {
                     Geom::OptRect obj_size = item->desktopVisualBounds();
                     if ( obj_size ) {
@@ -581,7 +581,7 @@ bool ClipboardManagerImpl::pastePathEffect(SPDesktop *desktop)
                 sp_selected_to_lpeitems(desktop);
                 std::vector<SPItem*> itemlist=selection->itemList();
                 for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
-                    SPItem *item = SP_ITEM(*i);
+                    SPItem *item = *i;
                     _applyPathEffect(item, effectstack);
                 }
 
@@ -664,7 +664,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
     // copy the defs used by all items
 	std::vector<SPItem*> itemlist=selection->itemList();
     for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
-        SPItem *item = SP_ITEM(*i);
+        SPItem *item = *i;
         if (item) {
             _copyUsedDefs(item);
         } else {
@@ -677,7 +677,7 @@ void ClipboardManagerImpl::_copySelection(Inkscape::Selection *selection)
     sort(sorted_items.begin(),sorted_items.end(),sp_object_compare_position);
 
     for(std::vector<SPItem*>::const_iterator i=sorted_items.begin();i!=sorted_items.end();i++){
-        SPItem *item = SP_ITEM(*i);
+        SPItem *item = *i;
         if (item) {
             Inkscape::XML::Node *obj = item->getRepr();
             Inkscape::XML::Node *obj_copy = _copyNode(obj, _doc, _root);
@@ -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.front());
+        SPObject *object = static_cast<SPObject *>(sorted_items[0]);
         SPItem *item = dynamic_cast<SPItem *>(object);
         if (item) {
             SPCSSAttr *style = take_style_from_item(item);
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index 34dbd150b..1ee72dcbc 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -151,7 +151,7 @@ void ActionAlign::do_action(SPDesktop *desktop, int index)
     for (std::vector<SPItem*>::iterator it(selected.begin());
          it != selected.end(); ++it)
     {
-    	SPItem* item=static_cast<SPItem*> (*it);
+    	SPItem* item= *it;
         desktop->getDocument()->ensureUpToDate();
         if (!sel_as_group)
             b = (item)->desktopPreferredBounds();
@@ -264,8 +264,8 @@ private :
         std::vector< BBoxSort  > sorted;
         for (std::vector<SPItem*>::iterator it(selected.begin());
             it != selected.end();
-            ++it)
-        {SPItem *item=static_cast<SPItem*>(*it);
+            ++it){
+            SPItem *item = *it;
             Geom::OptRect bbox = !prefs_bbox ? (item)->desktopVisualBounds() : (item)->desktopGeometricBounds();
             if (bbox) {
                 sorted.push_back(BBoxSort(item, *bbox, _orientation, _kBegin, _kEnd));
@@ -570,19 +570,19 @@ private :
 		sort(selected.begin(),selected.end(),sort_compare);
 	}
 	std::vector<SPItem*>::iterator it(selected.begin());
-	SPItem* item=static_cast<SPItem*>(*it);
-	Geom::Point p1 =  (item)->getCenter();
+	SPItem* item = *it;
+	Geom::Point p1 =  item->getCenter();
 	for (++it ;it != selected.end(); ++it)
 	{
-		item=static_cast<SPItem*>(*it);
-		Geom::Point p2 = (item)->getCenter();
+		item = *it;
+		Geom::Point p2 = item->getCenter();
 		Geom::Point delta = p1 - p2;
-		sp_item_move_rel((item),Geom::Translate(delta[Geom::X],delta[Geom::Y] ));
+		sp_item_move_rel(item,Geom::Translate(delta[Geom::X],delta[Geom::Y] ));
 		p1 = p2;
 	}
-	Geom::Point p2 = static_cast<SPItem*>(selected.front())->getCenter();
+	Geom::Point p2 = selected.front()->getCenter();
 	Geom::Point delta = p1 - p2;
-	sp_item_move_rel(static_cast<SPItem*>(selected.front()),Geom::Translate(delta[Geom::X],delta[Geom::Y] ));
+	sp_item_move_rel(selected.front(),Geom::Translate(delta[Geom::X],delta[Geom::Y] ));
 
         // restore compensation setting
         prefs->setInt("/options/clonecompensation/value", saved_compensation);
@@ -675,7 +675,7 @@ private :
             it != selected.end();
             ++it)
         {
-        	SPItem* item=static_cast<SPItem*>(*it);
+        	SPItem* item = *it;
             desktop->getDocument()->ensureUpToDate();
             Geom::OptRect item_box = !prefs_bbox ? (item)->desktopVisualBounds() : (item)->desktopGeometricBounds();
             if (item_box) {
@@ -761,7 +761,7 @@ private :
             it != selected.end();
             ++it)
         {
-        	SPItem* item=static_cast<SPItem*>(*it);
+        	SPItem* item = *it;
             if (SP_IS_TEXT (item) || SP_IS_FLOWTEXT (item)) {
                 Inkscape::Text::Layout const *layout = te_get_layout(item);
                 boost::optional<Geom::Point> pt = layout->baselineAnchorPoint();
@@ -805,7 +805,7 @@ private :
                  it != selected.end();
                  ++it)
             {
-            	SPItem* item=static_cast<SPItem*>(*it);
+            	SPItem* item = *it;
                 if (SP_IS_TEXT (item) || SP_IS_FLOWTEXT (item)) {
                     Inkscape::Text::Layout const *layout = te_get_layout(item);
                     boost::optional<Geom::Point> pt = layout->baselineAnchorPoint();
diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp
index 32eed088c..ca3971019 100644
--- a/src/ui/dialog/export.cpp
+++ b/src/ui/dialog/export.cpp
@@ -819,7 +819,7 @@ void Export::onAreaToggled ()
                     const gchar * id = "object";
                     const std::vector<XML::Node*> reprlst = SP_ACTIVE_DESKTOP->getSelection()->reprList();
                     for(std::vector<XML::Node*>::const_iterator i=reprlst.begin(); reprlst.end() != i; i++) {
-                        Inkscape::XML::Node * repr = (*i);
+                        Inkscape::XML::Node * repr = *i;
                         if (repr->attribute("id")) {
                             id = repr->attribute("id");
                             break;
@@ -1026,7 +1026,7 @@ void Export::onExport ()
 
         std::vector<SPItem*> itemlist=desktop->getSelection()->itemList();
         for(std::vector<SPItem*>::const_iterator i = itemlist.begin();i!=itemlist.end() && !interrupted ;i++){
-            SPItem *item = reinterpret_cast<SPItem *>(*i);
+            SPItem *item = *i;
 
             prog_dlg->set_data("current", GINT_TO_POINTER(n));
             prog_dlg->set_data("total", GINT_TO_POINTER(num));
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index a6312140d..45c8ce68a 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -690,7 +690,7 @@ private:
     void select_svg_element(){
         Inkscape::Selection* sel = _desktop->getSelection();
         if (sel->isEmpty()) return;
-        Inkscape::XML::Node* node = sel->reprList().front();
+        Inkscape::XML::Node* node = sel->reprList()[0];
         if (!node || !node->matchAttributeName("id")) return;
 
         std::ostringstream xlikhref;
@@ -1547,7 +1547,7 @@ void FilterEffectsDialog::FilterModifier::on_selection_toggled(const Glib::ustri
 
         std::vector<SPItem*> itemlist=sel->itemList();
         for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
-            SPItem * item = SP_ITEM(*i);
+            SPItem * item = *i;
             SPStyle *style = item->style;
             g_assert(style != NULL);
 
@@ -1655,7 +1655,7 @@ void FilterEffectsDialog::FilterModifier::remove_filter()
             if (!SP_IS_ITEM(*i)) {
                 continue;
             }
-            SPItem *item = SP_ITEM(*i);
+            SPItem *item = *i;
             if (!item->style) {
                 continue;
             }
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp
index 283d79c0d..dde040036 100644
--- a/src/ui/dialog/find.cpp
+++ b/src/ui/dialog/find.cpp
@@ -857,7 +857,7 @@ void Find::onAction()
         Inkscape::Selection *selection = desktop->getSelection();
         selection->clear();
         selection->setList(n);
-        SPObject *obj = reinterpret_cast<SPObject *>(n.front());
+        SPObject *obj = reinterpret_cast<SPObject *>(n[0]);
         SPItem *item = dynamic_cast<SPItem *>(obj);
         g_assert(item != NULL);
         scroll_to_show_item(desktop, item);
diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h
index 61f4463ae..4bcb900b6 100644
--- a/src/ui/dialog/find.h
+++ b/src/ui/dialog/find.h
@@ -16,7 +16,6 @@
 # include <config.h>
 #endif
 
-#include "selection.h"
 #include "ui/widget/panel.h"
 #include "ui/widget/button.h"
 #include "ui/widget/entry.h" 
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index e9a0fc017..1be87d180 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -159,7 +159,7 @@ std::vector<SPItem*> FontSubstitution::getFontReplacedItems(SPDocument* doc, Gli
 
     allList = get_all_items(x, doc->getRoot(), desktop, false, false, true, y);
     for(std::vector<SPItem*>::const_iterator i = allList.begin();i!=allList.end();i++){
-        SPItem *item = SP_ITEM(*i);
+        SPItem *item = *i;
         SPStyle *style = item->style;
         Glib::ustring family = "";
 
diff --git a/src/ui/dialog/font-substitution.h b/src/ui/dialog/font-substitution.h
index cdb4e22b4..0818d778c 100644
--- a/src/ui/dialog/font-substitution.h
+++ b/src/ui/dialog/font-substitution.h
@@ -13,7 +13,8 @@
 #define INKSCAPE_UI_FONT_SUBSTITUTION_H
 
 #include <glibmm/ustring.h>
-#include "selection.h"
+
+class SPItem;
 class SPDocument;
 
 namespace Inkscape {
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index fa469dc4b..7ca277ea2 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -581,7 +581,7 @@ void GlyphsPanel::insertText()
     std::vector<SPItem*> itemlist=targetDesktop->selection->itemList();
         for(std::vector<SPItem*>::const_iterator i=itemlist.begin(); itemlist.end() != i; i++) {
             if (SP_IS_TEXT(*i) || SP_IS_FLOWTEXT(*i)) {
-            textItem = SP_ITEM(*i);
+            textItem = *i;
             break;
         }
     }
diff --git a/src/ui/dialog/grid-arrange-tab.cpp b/src/ui/dialog/grid-arrange-tab.cpp
index 10498b0f9..8bd130c2e 100644
--- a/src/ui/dialog/grid-arrange-tab.cpp
+++ b/src/ui/dialog/grid-arrange-tab.cpp
@@ -172,7 +172,7 @@ void GridArrangeTab::arrange()
     const std::vector<SPItem*> items = selection ? selection->itemList() : std::vector<SPItem*>();
     cnt=0;
     for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();i++){
-        SPItem *item = SP_ITEM(*i);
+        SPItem *item = *i;
         Geom::OptRect b = item->documentVisualBounds();
         if (!b) {
             continue;
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 6ad3d61ac..e9ee7802d 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -368,7 +368,7 @@ void IconPreviewPanel::refreshPreview()
 
                 	std::vector<SPItem*> const items = sel->itemList();
                     for(std::vector<SPItem*>::const_iterator i=items.begin();!target && i!=items.end();i++){
-                        SPItem* item = SP_ITEM( *i);
+                        SPItem* item = *i;
                         gchar const *id = item->getId();
                         if ( id ) {
                             targetId = id;
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp
index 6e09be2ba..781c6ef93 100644
--- a/src/ui/dialog/objects.cpp
+++ b/src/ui/dialog/objects.cpp
@@ -479,7 +479,7 @@ void ObjectsPanel::_objectsSelected( Selection *sel ) {
     SPItem *item = NULL;
     std::vector<SPItem*> const items = sel->itemList();
     for(std::vector<SPItem*>::const_iterator i=items.begin(); i!=items.end();i++){
-        item = reinterpret_cast<SPItem *>(*i);
+        item = *i;
         if (setOpacity)
         {
             _setCompositingValues(item);
diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp
index a68e73caf..af1386e27 100644
--- a/src/ui/dialog/polar-arrange-tab.cpp
+++ b/src/ui/dialog/polar-arrange-tab.cpp
@@ -308,7 +308,7 @@ void PolarArrangeTab::arrange()
 	{
 		if(arrangeOnEllipse)
 		{
-			SPItem *item = SP_ITEM(*i);
+			SPItem *item = *i;
 
 			if(arrangeOnFirstEllipse)
 			{
@@ -375,7 +375,7 @@ void PolarArrangeTab::arrange()
 	int i = 0;
 	for(std::vector<SPItem*>::const_iterator it=tmp.begin();it!=tmp.end();it++)
 	{
-		SPItem *item = SP_ITEM(*it);
+		SPItem *item = *it;
 
 		// Ignore the reference ellipse if any
 		if(item != referenceEllipse)
diff --git a/src/ui/dialog/tags.cpp b/src/ui/dialog/tags.cpp
index b677711ff..5fab9fcfc 100644
--- a/src/ui/dialog/tags.cpp
+++ b/src/ui/dialog/tags.cpp
@@ -355,7 +355,7 @@ void TagsPanel::_objectsSelected( Selection *sel ) {
     std::vector<SPObject*> tmp=sel->list();
 	for(std::vector<SPObject*>::const_iterator i=tmp.begin();i!=tmp.end();i++)
     {
-        SPObject *obj = reinterpret_cast<SPObject *>(*i);
+        SPObject *obj = *i;
         _store->foreach(sigc::bind<SPObject *>( sigc::mem_fun(*this, &TagsPanel::_checkForSelected), obj));
     }
     _selectedConnection.unblock();
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp
index 1c1cf5937..9c4790379 100644
--- a/src/ui/dialog/text-edit.cpp
+++ b/src/ui/dialog/text-edit.cpp
@@ -422,7 +422,7 @@ SPItem *TextEdit::getSelectedTextItem (void)
 	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++)
     {
         if (SP_IS_TEXT(*i) || SP_IS_FLOWTEXT(*i))
-            return SP_ITEM (*i);
+            return *i;
     }
 
     return NULL;
diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp
index 0f81a7e58..459e6e937 100644
--- a/src/ui/dialog/transformation.cpp
+++ b/src/ui/dialog/transformation.cpp
@@ -655,7 +655,7 @@ void Transformation::updatePageTransform(Inkscape::Selection *selection)
 {
     if (selection && !selection->isEmpty()) {
         if (_check_replace_matrix.get_active()) {
-            Geom::Affine current (SP_ITEM(selection->itemList().front())->transform); // take from the first item in selection
+            Geom::Affine current (selection->itemList()[0]->transform); // take from the first item in selection
 
             Geom::Affine new_displayed = current;
 
@@ -750,8 +750,8 @@ void Transformation::applyPageMove(Inkscape::Selection *selection)
                      it != selected.end();
                      ++it)
                 {
-                	SPItem* item=static_cast<SPItem*>(*it);
-                    Geom::OptRect bbox = (item)->desktopPreferredBounds();
+                	SPItem* item = *it;
+                    Geom::OptRect bbox = item->desktopPreferredBounds();
                     if (bbox) {
                         sorted.push_back(BBoxSort(item, *bbox, Geom::X, x > 0? 1. : 0., x > 0? 0. : 1.));
                     }
@@ -775,8 +775,8 @@ void Transformation::applyPageMove(Inkscape::Selection *selection)
                      it != selected.end();
                      ++it)
                 {
-                	SPItem* item=static_cast<SPItem*>(*it);
-                	Geom::OptRect bbox = (item)->desktopPreferredBounds();
+                	SPItem* item = *it;
+                	Geom::OptRect bbox = item->desktopPreferredBounds();
                     if (bbox) {
                         sorted.push_back(BBoxSort(item, *bbox, Geom::Y, y > 0? 1. : 0., y > 0? 0. : 1.));
                     }
@@ -818,7 +818,7 @@ void Transformation::applyPageScale(Inkscape::Selection *selection)
     if (prefs->getBool("/dialogs/transformation/applyseparately")) {
     	std::vector<SPItem*> tmp=selection->itemList();
     	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++){
-            SPItem *item = SP_ITEM(*i);
+            SPItem *item = *i;
             Geom::OptRect bbox_pref = item->desktopPreferredBounds();
             Geom::OptRect bbox_geom = item->desktopGeometricBounds();
             if (bbox_pref && bbox_geom) {
@@ -882,7 +882,7 @@ void Transformation::applyPageRotate(Inkscape::Selection *selection)
     if (prefs->getBool("/dialogs/transformation/applyseparately")) {
     	std::vector<SPItem*> tmp=selection->itemList();
     	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++){
-            SPItem *item = SP_ITEM(*i);
+            SPItem *item = *i;
             sp_item_rotate_rel(item, Geom::Rotate (angle*M_PI/180.0));
         }
     } else {
@@ -902,7 +902,7 @@ void Transformation::applyPageSkew(Inkscape::Selection *selection)
     if (prefs->getBool("/dialogs/transformation/applyseparately")) {
     	std::vector<SPItem*> items=selection->itemList();
     	for(std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();i++){
-            SPItem *item = SP_ITEM(*i);
+            SPItem *item = *i;
 
             if (!_units_skew.isAbsolute()) { // percentage
                 double skewX = _scalar_skew_horizontal.getValue("%");
@@ -1004,7 +1004,7 @@ void Transformation::applyPageTransform(Inkscape::Selection *selection)
     if (_check_replace_matrix.get_active()) {
     	std::vector<SPItem*> tmp=selection->itemList();
     	for(std::vector<SPItem*>::const_iterator i=tmp.begin();i!=tmp.end();i++){
-            SPItem *item = SP_ITEM(*i);
+            SPItem *item = *i;
             item->set_item_transform(displayed);
             SP_OBJECT(item)->updateRepr();
         }
@@ -1155,7 +1155,7 @@ void Transformation::onReplaceMatrixToggled()
     double f = _scalar_transform_f.getValue();
 
     Geom::Affine displayed (a, b, c, d, e, f);
-    Geom::Affine current = SP_ITEM(selection->itemList().front())->transform; // take from the first item in selection
+    Geom::Affine current = selection->itemList()[0]->transform; // take from the first item in selection
 
     Geom::Affine new_displayed;
     if (_check_replace_matrix.get_active()) {
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 193dff33c..760d19e89 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -2077,7 +2077,7 @@ void ContextMenu::ImageEdit(void)
 
     std::vector<SPItem*> itemlist=_desktop->selection->itemList();
     for(std::vector<SPItem*>::const_iterator i=itemlist.begin();i!=itemlist.end();i++){
-        Inkscape::XML::Node *ir = SP_ITEM(*i)->getRepr();
+        Inkscape::XML::Node *ir = (*i)->getRepr();
         const gchar *href = ir->attribute("xlink:href");
         
         if (strncmp (href,"file:",5) == 0) {
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index 9c6eead16..f48e572df 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -1318,7 +1318,7 @@ void cc_selection_set_avoid(bool const set_avoid)
 
     std::vector<SPItem*> l = selection->itemList();
     for(std::vector<SPItem*>::const_iterator i=l.begin();i!=l.end();i++) {
-        SPItem *item = SP_ITEM(*i);
+        SPItem *item = *i;
 
         char const *value = (set_avoid) ? "true" : NULL;
 
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index b61a108f0..adbbb2bd3 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -692,8 +692,8 @@ void EraserTool::set_to_accumulated() {
 
             if ( !toWorkOn.empty() ) {
                 if ( eraserMode ) {
-                    for (std::vector<SPItem*>::const_iterator i = toWorkOn.begin();i!=toWorkOn.end();i++) {
-                        SPItem *item = SP_ITEM(*i);
+                    for (std::vector<SPItem*>::const_iterator i = toWorkOn.begin(); i != toWorkOn.end(); i++){
+                    SPItem *item = *i;
 
                         if ( eraserMode ) {
                             Geom::OptRect bbox = item->visualBounds();
@@ -712,7 +712,7 @@ void EraserTool::set_to_accumulated() {
                                     // If the item was not completely erased, track the new remainder.
                                 	std::vector<SPItem*> nowSel(selection->itemList());
                                     for (std::vector<SPItem*>::const_iterator i2 = nowSel.begin();i2!=nowSel.end();i2++) {
-                                        remainingItems.push_back(SP_ITEM(*i2));
+                                        remainingItems.push_back(*i2);
                                     }
                                 }
                             } else {
@@ -722,11 +722,11 @@ void EraserTool::set_to_accumulated() {
                     }
                 } else {
                     for (std::vector<SPItem*> ::const_iterator i = toWorkOn.begin();i!=toWorkOn.end();i++) {
-                        sp_object_ref( SP_ITEM(*i), 0 );
+                        sp_object_ref( *i, 0 );
                     }
 
                     for (std::vector<SPItem*>::const_iterator i = toWorkOn.begin();i!=toWorkOn.end();i++) {
-                        SPItem *item = SP_ITEM(*i);
+                        SPItem *item = *i;
                         item->deleteObject(true);
                         sp_object_unref(item);
                         workDone = true;
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index 6f7b220ed..21ad18c26 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -506,7 +506,7 @@ bool GradientTool::root_handler(GdkEvent* event) {
             } else {
             	std::vector<SPItem*>  items=selection->itemList();
                 for (std::vector<SPItem*>::const_iterator i = items.begin();i!=items.end();i++) {
-                    SPItem *item = SP_ITEM(*i);
+                    SPItem *item = *i;
                     SPGradientType new_type = (SPGradientType) prefs->getInt("/tools/gradient/newgradient", SP_GRADIENT_TYPE_LINEAR);
                     Inkscape::PaintTarget fsmode = (prefs->getInt("/tools/gradient/newfillorstroke", 1) != 0) ? Inkscape::FOR_FILL : Inkscape::FOR_STROKE;
 
@@ -890,12 +890,6 @@ bool GradientTool::root_handler(GdkEvent* event) {
     return ret;
 }
 
-int sp_item_repr_compare_position_obj(SPObject const *first, SPObject const *second)
-{
-    return sp_repr_compare_position(((SPItem*)first)->getRepr(),
-    		((SPItem*)second)->getRepr())<0;
-}
-
 static void sp_gradient_drag(GradientTool &rc, Geom::Point const pt, guint /*state*/, guint32 etime)
 {
     SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop;
@@ -931,14 +925,14 @@ static void sp_gradient_drag(GradientTool &rc, Geom::Point const pt, guint /*sta
             //FIXME: see above
             sp_repr_css_change_recursive(SP_OBJECT(*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);
 
             if (type == SP_GRADIENT_TYPE_LINEAR) {
-                sp_item_gradient_set_coords (SP_ITEM(*i), POINT_LG_BEGIN, 0, rc.origin, fill_or_stroke, true, false);
-                sp_item_gradient_set_coords (SP_ITEM(*i), POINT_LG_END, 0, pt, fill_or_stroke, true, false);
+                sp_item_gradient_set_coords (*i, POINT_LG_BEGIN, 0, rc.origin, fill_or_stroke, true, false);
+                sp_item_gradient_set_coords (*i, POINT_LG_END, 0, pt, fill_or_stroke, true, false);
             } else if (type == SP_GRADIENT_TYPE_RADIAL) {
-                sp_item_gradient_set_coords (SP_ITEM(*i), POINT_RG_CENTER, 0, rc.origin, fill_or_stroke, true, false);
-                sp_item_gradient_set_coords (SP_ITEM(*i), POINT_RG_R1, 0, pt, fill_or_stroke, true, false);
+                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);
         }
@@ -949,7 +943,7 @@ static void sp_gradient_drag(GradientTool &rc, Geom::Point const pt, guint /*sta
             ec->_grdrag->local_change = true;
             // give the grab out-of-bounds values of xp/yp because we're already dragging
             // and therefore are already out of tolerance
-            ec->_grdrag->grabKnot (SP_ITEM(selection->itemList().front()),
+            ec->_grdrag->grabKnot (selection->itemList()[0],
                                    type == SP_GRADIENT_TYPE_LINEAR? POINT_LG_END : POINT_RG_R1,
                                    -1, // ignore number (though it is always 1)
                                    fill_or_stroke, 99999, 99999, etime);
diff --git a/src/ui/tools/gradient-tool.h b/src/ui/tools/gradient-tool.h
index 786aed372..6fe3bca9f 100644
--- a/src/ui/tools/gradient-tool.h
+++ b/src/ui/tools/gradient-tool.h
@@ -18,7 +18,6 @@
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 #include "ui/tools/tool-base.h"
-class SPObject;//kill it
 
 #define SP_GRADIENT_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::GradientTool*>((Inkscape::UI::Tools::ToolBase*)obj))
 #define SP_IS_GRADIENT_CONTEXT(obj) (dynamic_cast<const Inkscape::UI::Tools::GradientTool*>((const Inkscape::UI::Tools::ToolBase*)obj) != NULL)
@@ -26,12 +25,12 @@ class SPObject;//kill it
 namespace Inkscape {
 namespace UI {
 namespace Tools {
-int sp_item_repr_compare_position_obj(SPObject const *first, SPObject const *second);//kill it
 
 class GradientTool : public ToolBase {
 public:
 	GradientTool();
 	virtual ~GradientTool();
+
     Geom::Point origin;
 
     bool cursor_addnode;
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 2b44639c8..5295a16c0 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -444,7 +444,7 @@ bool MeasureTool::root_handler(GdkEvent* event) {
                 std::vector<SPItem*> items = desktop->getDocument()->getItemsAtPoints(desktop->dkey, points);
                 std::vector<double> intersection_times;
                 for (std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++) {
-                    SPItem *item = static_cast<SPItem*>(*i);
+                    SPItem *item = *i;
 
                     if (SP_IS_SHAPE(item)) {
                        calculate_intersections(desktop, item, lineseg, SP_SHAPE(item)->getCurve(), intersection_times);
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index 0a34e4855..c8e032089 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -48,7 +48,6 @@
 
 // Mesh specific
 #include "ui/tools/mesh-tool.h"
-#include "ui/tools/gradient-tool.h"//not needed
 #include "sp-mesh-gradient.h"
 #include "display/sp-ctrlcurve.h"
 
@@ -478,12 +477,12 @@ bool MeshTool::root_handler(GdkEvent* event) {
             if (over_line) {
                 // We take the first item in selection, because with doubleclick, the first click
                 // always resets selection to the single object under cursor
-                sp_mesh_context_split_near_point(this, SP_ITEM(selection->itemList().front()), this->mousepoint_doc, event->button.time);
+                sp_mesh_context_split_near_point(this, selection->itemList()[0], this->mousepoint_doc, event->button.time);
             } else {
                 // Create a new gradient with default coordinates.
             	std::vector<SPItem*> items=selection->itemList();
                 for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
-                    SPItem *item = SP_ITEM(*i);
+                    SPItem *item = *i;
                     SPGradientType new_type = SP_GRADIENT_TYPE_MESH;
                     Inkscape::PaintTarget fsmode = (prefs->getInt("/tools/gradient/newfillorstroke", 1) != 0) ? Inkscape::FOR_FILL : Inkscape::FOR_STROKE;
 
@@ -932,12 +931,6 @@ bool MeshTool::root_handler(GdkEvent* event) {
 
     return ret;
 }
-/*
-int sp_item_repr_compare_position_obj(SPObject const *first, SPObject const *second)
-{
-    return sp_repr_compare_position(((SPItem*)first)->getRepr(),
-    		((SPItem*)second)->getRepr())<0;
-}*/
 
 static void sp_mesh_drag(MeshTool &rc, Geom::Point const /*pt*/, guint /*state*/, guint32 /*etime*/) {
     SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop;
diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index 25cbf76a4..fbc1a9e6c 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -481,7 +481,7 @@ bool SelectTool::root_handler(GdkEvent* event) {
         case GDK_2BUTTON_PRESS:
             if (event->button.button == 1) {
                 if (!selection->isEmpty()) {
-                    SPItem *clicked_item = static_cast<SPItem *>(selection->itemList().front());
+                    SPItem *clicked_item = selection->itemList()[0];
 
                     if (dynamic_cast<SPGroup *>(clicked_item) && !dynamic_cast<SPBox3D *>(clicked_item)) { // enter group if it's not a 3D box
                         desktop->setCurrentLayer(clicked_item);
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index ac41f3a34..d92d326e0 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -553,13 +553,13 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
     	std::vector<SPItem*> const items(selection->itemList());
 
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
-            SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(*i));
+            SPItem *item = *i;
             g_assert(item != NULL);
             sp_object_ref(item);
         }
 
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
-            SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(*i));
+            SPItem *item = *i;
             g_assert(item != NULL);
 
             if (is_transform_modes(tc->mode)) {
@@ -574,7 +574,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         }
 
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
-            SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(*i));
+            SPItem *item = *i;
             g_assert(item != NULL);
             sp_object_unref(item);
         }
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index 6f7764506..8c5e4215e 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -1089,7 +1089,7 @@ sp_tweak_dilate (TweakTool *tc, Geom::Point event_p, Geom::Point p, Geom::Point
 
     std::vector<SPItem*> items=selection->itemList();
     for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
-        SPItem *item = dynamic_cast<SPItem *>(static_cast<SPObject *>(*i));
+        SPItem *item = *i;
 
         if (is_color_mode (tc->mode)) {
             if (do_fill || do_stroke || do_opacity) {