(cppcheck and janitorial tasks:) C-style casting to C++-style casting

(bzr r11011)

20 files changed, 79 insertions, 77 deletions

diff --git a/src/dom/domimpl.cpp b/src/dom/domimpl.cpp
index 1d562005f..9f25cb3be 100644
--- a/src/dom/domimpl.cpp
+++ b/src/dom/domimpl.cpp
@@ -313,7 +313,7 @@ NodePtr NodeImpl::insertBefore(const NodePtr newChild,
     if (!refChild)
         return appendChild(newChild);
 
-    NodeImplPtr newChildImpl = dynamic_cast<NodeImpl *>(newChild.get());
+    NodeImplPtr newChildImpl = reinterpret_cast<NodeImpl *>(newChild.get());
     for (NodeImplPtr n = firstChild ; n.get() ; n=n->next)
         {
         if (n == refChild)
@@ -346,7 +346,7 @@ NodePtr NodeImpl::replaceChild(const NodePtr newChild,
     if (!oldChild)
         return NULL;
 
-    NodeImplPtr newChildImpl = dynamic_cast<NodeImpl *>(newChild.get());
+    NodeImplPtr newChildImpl = reinterpret_cast<NodeImpl *>(newChild.get());
     for (NodeImplPtr n = firstChild ; n.get() ; n=n->next)
         {
         if (n == oldChild)
@@ -405,7 +405,7 @@ NodePtr NodeImpl::appendChild(const NodePtr newChild)
         return NULL;
 
     NodeImplPtr newChildImpl =
-	     dynamic_cast<NodeImpl *> (newChild.get());
+	     reinterpret_cast<NodeImpl *> (newChild.get());
 
     newChildImpl->parent        = this;
     newChildImpl->ownerDocument = ownerDocument;
@@ -665,12 +665,12 @@ DOMString NodeImpl::lookupPrefix(const DOMString &theNamespaceURI)
         {
         case Node::ELEMENT_NODE:
             {
-            ElementPtr elem = (Element *)this;
+            ElementPtr elem = reinterpret_cast<Element *>(this);
             return lookupNamespacePrefix(theNamespaceURI, elem);
             }
         case Node::DOCUMENT_NODE:
             {
-            DocumentPtr doc = (Document *)this;
+            DocumentPtr doc = reinterpret_cast<Document *>(this);
             ElementPtr elem = doc->getDocumentElement();
             return elem->lookupPrefix(theNamespaceURI);
             }
@@ -681,7 +681,7 @@ DOMString NodeImpl::lookupPrefix(const DOMString &theNamespaceURI)
             return DOMString("");  // type is unknown
         case Node::ATTRIBUTE_NODE:
             {
-            AttrPtr attr = (Attr *)this;
+            AttrPtr attr = reinterpret_cast<Attr *>(this);
             ElementPtr elem = attr->getOwnerElement();
             if ( elem.get() )
                 {
@@ -735,7 +735,7 @@ bool NodeImpl::isDefaultNamespace(const DOMString &theNamespaceURI)
             }
         case DOCUMENT_NODE:
             { //just use braces for local declaration
-            DocumentPtr doc = (Document *)this;
+            DocumentPtr doc = reinterpret_cast<Document *>(this);
             ElementPtr elem = doc->getDocumentElement();
             return elem->isDefaultNamespace(theNamespaceURI);
             }
@@ -746,7 +746,7 @@ bool NodeImpl::isDefaultNamespace(const DOMString &theNamespaceURI)
             return false;
         case ATTRIBUTE_NODE:
             {//braces only for scope
-            AttrPtr attr = (Attr *)this;
+            AttrPtr attr = reinterpret_cast<Attr *>(this);
             ElementPtr ownerElement = attr->getOwnerElement();
             if ( ownerElement.get() )
                 {
@@ -824,7 +824,7 @@ DOMString NodeImpl::lookupNamespaceURI(const DOMString &thePrefix)
             }
         case DOCUMENT_NODE:
             {
-            DocumentPtr doc = (Document *)this;
+            DocumentPtr doc = reinterpret_cast<Document *>(this);
             ElementPtr elem = doc->getDocumentElement();
             return elem->lookupNamespaceURI(thePrefix);
             }
@@ -836,7 +836,7 @@ DOMString NodeImpl::lookupNamespaceURI(const DOMString &thePrefix)
 
         case ATTRIBUTE_NODE:
             {
-            ElementPtr ownerElement = ((Attr *)this)->getOwnerElement();
+            ElementPtr ownerElement = (reinterpret_cast<Attr *>(this))->getOwnerElement();
             if ( ownerElement.get() )
                 {
                 return ownerElement->lookupNamespaceURI(thePrefix);
@@ -870,7 +870,7 @@ bool NodeImpl::isEqualNode(const NodePtr nodeArg)
     if (!nodeArg)
         return false;
 
-    if (nodeArg == (NodePtr )this)
+    if (nodeArg == static_cast<NodePtr>(this))
         return true;
 
     NodePtr node = nodeArg;
@@ -913,8 +913,8 @@ DOMUserData *NodeImpl::setUserData(const DOMString &key,
         if (entry->key == key)
             {
             DOMUserData *oldData = entry->data;
-            entry->data    = (DOMUserData *)data;
-            entry->handler = (UserDataHandler *)handler;
+            entry->data    = const_cast<DOMUserData *>(data);
+            entry->handler = const_cast<UserDataHandler *>(handler);
             return oldData;
             }
         prev  = entry;
@@ -1390,7 +1390,7 @@ DOMString ElementImpl::getAttribute(const DOMString& name)
     NodePtr node = attributes.getNamedItem(name);
     if (!node || node->getNodeType() != ATTRIBUTE_NODE)
         return DOMString("");
-    AttrPtr attr = dynamic_cast<Attr *>(node.get());
+    AttrPtr attr = reinterpret_cast<Attr *>(node.get());
     return attr->getValue();
 }
 
@@ -1424,7 +1424,7 @@ AttrPtr ElementImpl::getAttributeNode(const DOMString& name)
     NodePtr node = attributes.getNamedItem(name);
     if (!node || node->getNodeType() != ATTRIBUTE_NODE)
         return NULL;
-    AttrPtr attr = dynamic_cast<Attr *>(node.get());
+    AttrPtr attr = reinterpret_cast<Attr *>(node.get());
     return attr;
 }
 
@@ -1465,7 +1465,7 @@ void ElementImpl::getElementsByTagNameRecursive(NodeList &list,
         {
         if (node->getNodeType() != Node::ELEMENT_NODE)
             continue;
-        ElementPtr childElem = dynamic_cast<Element *>(node.get());
+        ElementPtr childElem = reinterpret_cast<Element *>(node.get());
         getElementsByTagNameRecursive(list, name, childElem);
         }
 }
@@ -1490,7 +1490,7 @@ DOMString ElementImpl::getAttributeNS(const DOMString& namespaceURI,
     NodePtr node = attributes.getNamedItemNS(namespaceURI, localName);
     if (!node || node->getNodeType()!=ATTRIBUTE_NODE)
         return DOMString("");
-    AttrPtr attr = dynamic_cast<Attr *>(node.get());
+    AttrPtr attr = reinterpret_cast<Attr *>(node.get());
     return attr->getValue();
 }
 
@@ -1527,7 +1527,7 @@ void ElementImpl::removeAttributeNS(const DOMString& namespaceURI,
     NodePtr node = attributes.getNamedItemNS(namespaceURI, localName);
     if (!node || node->getNodeType() != ATTRIBUTE_NODE)
         return (Attr *)0;
-    AttrPtr attr = dynamic_cast<Attr *>(node.get());
+    AttrPtr attr = reinterpret_cast<Attr *>(node.get());
     return attr;
 }
 
@@ -1558,7 +1558,7 @@ void ElementImpl::getElementsByTagNameNSRecursive(NodeList &list,
         {
         if (node->getNodeType() != Node::ELEMENT_NODE)
             continue;
-        ElementPtr childElem = dynamic_cast<Element *>(node.get());
+        ElementPtr childElem = reinterpret_cast<Element *>(node.get());
         getElementsByTagNameNSRecursive(list, namespaceURI, tagName, childElem);
         }
 }
@@ -1700,7 +1700,7 @@ void ElementImpl::normalizeNamespaces()
         NodePtr attrNode = attrs.item(i);
         if (attrNode->getNodeType() != Node::ATTRIBUTE_NODE)
             continue;
-        AttrImplPtr attr = dynamic_cast<AttrImpl *>(attrNode.get());
+        AttrImplPtr attr = reinterpret_cast<AttrImpl *>(attrNode.get());
         DOMString attrNS     = attr->getNamespaceURI();
         DOMString attrName   = attr->getLocalName();
         DOMString attrPrefix = attr->getPrefix();
@@ -1823,7 +1823,7 @@ void ElementImpl::normalizeNamespaces()
         NodePtr attrNode = attrs.item(i);
         if (attrNode->getNodeType() != Node::ATTRIBUTE_NODE)
             continue;
-        AttrPtr attr = dynamic_cast<Attr *>(attrNode.get());
+        AttrPtr attr = reinterpret_cast<Attr *>(attrNode.get());
         DOMString attrNS     = attr->getNamespaceURI();
         DOMString attrPrefix = attr->getPrefix();
         DOMString attrValue  = attr->getNodeValue();
@@ -1915,7 +1915,7 @@ void ElementImpl::normalizeNamespaces()
         {
         if (child->getNodeType() != Node::ELEMENT_NODE)
             continue;
-        ElementImplPtr childElement = dynamic_cast<ElementImpl *>(child.get());
+        ElementImplPtr childElement = reinterpret_cast<ElementImpl *>(child.get());
         childElement->normalizeNamespaces();
         }
 
@@ -3000,7 +3000,7 @@ NodePtr DocumentImpl::renameNode(const NodePtr node,
                                const DOMString &qualifiedName)
                                throw (DOMException)
 {
-    NodeImplPtr nodeImpl = dynamic_cast<NodeImpl *> (node.get());
+    NodeImplPtr nodeImpl = reinterpret_cast<NodeImpl *> (node.get());
     nodeImpl->setNodeName(qualifiedName);
     return node;
 }
@@ -3021,7 +3021,7 @@ DocumentImpl::DocumentImpl(const DOMImplementation *domImpl,
 {
     nodeType        = DOCUMENT_NODE;
     nodeName        = "#document";
-    parent          = (DOMImplementation *)domImpl;
+    parent          = const_cast<DOMImplementation *>(domImpl);
     //documentURI     = stringCache(theNamespaceURI);
     qualifiedName   = theQualifiedName;
     if (theDoctype.get()) //only assign if not null.
diff --git a/src/draw-context.cpp b/src/draw-context.cpp
index e24a6704a..36d7eb8de 100644
--- a/src/draw-context.cpp
+++ b/src/draw-context.cpp
@@ -458,7 +458,7 @@ spdc_attach_selection(SPDrawContext *dc, Inkscape::Selection */*sel*/)
         /* Anchor list */
         for (GSList *l = dc->white_curves; l != NULL; l = l->next) {
             SPCurve *c;
-            c = (SPCurve*)l->data;
+            c = static_cast<SPCurve*>(l->data);
             g_return_if_fail( c->get_segment_count() > 0 );
             if ( !c->is_closed() ) {
                 SPDrawAnchor *a;
diff --git a/src/event-context.cpp b/src/event-context.cpp
index 2c0bcaaff..72b240828 100644
--- a/src/event-context.cpp
+++ b/src/event-context.cpp
@@ -814,7 +814,7 @@ sp_event_context_new(GType type, SPDesktop *desktop, gchar const *pref_path,
     g_return_val_if_fail(g_type_is_a(type, SP_TYPE_EVENT_CONTEXT), NULL);
     g_return_val_if_fail(desktop != NULL, NULL);
 
-    SPEventContext * const ec = (SPEventContext*) g_object_new(type, NULL);
+    SPEventContext * const ec = static_cast<SPEventContext*>(g_object_new(type, NULL));
 
     ec->desktop = desktop;
     ec->_message_context
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 47a98cb8a..b6a58c526 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -507,7 +507,7 @@ CairoRenderContext::getClipMode(void) const
 
 CairoRenderState* CairoRenderContext::_createState(void)
 {
-    CairoRenderState *state = (CairoRenderState*)g_try_malloc(sizeof(CairoRenderState));
+    CairoRenderState *state = static_cast<CairoRenderState*>(g_try_malloc(sizeof(CairoRenderState)));
     g_assert( state != NULL );
 
     state->has_filtereffect = FALSE;
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 4792d85d3..8548b398f 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -986,7 +986,7 @@ inkscape_remove_desktop (SPDesktop * desktop)
     if (DESKTOP_IS_ACTIVE (desktop)) {
         g_signal_emit (G_OBJECT (inkscape), inkscape_signals[DEACTIVATE_DESKTOP], 0, desktop);
         if (inkscape->desktops->next != NULL) {
-            SPDesktop * new_desktop = (SPDesktop *) inkscape->desktops->next->data;
+            SPDesktop * new_desktop = static_cast<SPDesktop *>(inkscape->desktops->next->data);
             inkscape->desktops = g_slist_remove (inkscape->desktops, new_desktop);
             inkscape->desktops = g_slist_prepend (inkscape->desktops, new_desktop);
             g_signal_emit (G_OBJECT (inkscape), inkscape_signals[ACTIVATE_DESKTOP], 0, new_desktop);
@@ -1022,7 +1022,7 @@ inkscape_activate_desktop (SPDesktop * desktop)
 
     g_assert (g_slist_find (inkscape->desktops, desktop));
 
-    SPDesktop *current = (SPDesktop *) inkscape->desktops->data;
+    SPDesktop *current = static_cast<SPDesktop *>(inkscape->desktops->data);
 
     g_signal_emit (G_OBJECT (inkscape), inkscape_signals[DEACTIVATE_DESKTOP], 0, current);
 
@@ -1055,8 +1055,9 @@ SPDesktop *
 inkscape_find_desktop_by_dkey (unsigned int dkey)
 {
     for (GSList *r = inkscape->desktops; r; r = r->next) {
-        if (((SPDesktop *) r->data)->dkey == dkey)
-            return ((SPDesktop *) r->data);
+        if ((static_cast<SPDesktop *>(r->data))->dkey == dkey){
+            return (static_cast<SPDesktop *>(r->data));
+        }
     }
     return NULL;
 }
@@ -1070,8 +1071,9 @@ inkscape_maximum_dkey()
     unsigned int dkey = 0;
 
     for (GSList *r = inkscape->desktops; r; r = r->next) {
-        if (((SPDesktop *) r->data)->dkey > dkey)
-            dkey = ((SPDesktop *) r->data)->dkey;
+        if ((static_cast<SPDesktop *>(r->data))->dkey > dkey){
+            dkey = (static_cast<SPDesktop *>(r->data))->dkey;
+        }
     }
 
     return dkey;
@@ -1083,7 +1085,7 @@ SPDesktop *
 inkscape_next_desktop ()
 {
     SPDesktop *d = NULL;
-    unsigned int dkey_current = ((SPDesktop *) inkscape->desktops->data)->dkey;
+    unsigned int dkey_current = (static_cast<SPDesktop *>(inkscape->desktops->data))->dkey;
 
     if (dkey_current < inkscape_maximum_dkey()) {
         // find next existing
@@ -1114,7 +1116,7 @@ SPDesktop *
 inkscape_prev_desktop ()
 {
     SPDesktop *d = NULL;
-    unsigned int dkey_current = ((SPDesktop *) inkscape->desktops->data)->dkey;
+    unsigned int dkey_current = (static_cast<SPDesktop *>(inkscape->desktops->data))->dkey;
 
     if (dkey_current > 0) {
         // find prev existing
@@ -1244,7 +1246,7 @@ inkscape_active_desktop (void)
         return NULL;
     }
 
-    return (SPDesktop *) inkscape->desktops->data;
+    return static_cast<SPDesktop *>(inkscape->desktops->data);
 }
 
 SPDocument *
@@ -1263,7 +1265,7 @@ bool inkscape_is_sole_desktop_for_document(SPDesktop const &desktop) {
         return false;
     }
     for ( GSList *iter = inkscape->desktops ; iter ; iter = iter->next ) {
-        SPDesktop *other_desktop=(SPDesktop *)iter->data;
+        SPDesktop *other_desktop=static_cast<SPDesktop *>(iter->data);
         SPDocument *other_document=other_desktop->doc();
         if ( other_document == document && other_desktop != &desktop ) {
             return false;
diff --git a/src/knot.cpp b/src/knot.cpp
index 26b75d660..aee4fe1a5 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -221,7 +221,7 @@ static void sp_knot_init(SPKnot *knot)
  */
 static void sp_knot_dispose(GObject *object)
 {
-    SPKnot *knot = (SPKnot *) object;
+    SPKnot *knot = static_cast<SPKnot *>(object);
 
     if ((knot->flags & SP_KNOT_GRABBED) && gdk_pointer_is_grabbed ()) {
         // This happens e.g. when deleting a node in node tool while dragging it
@@ -462,7 +462,7 @@ SPKnot *sp_knot_new(SPDesktop *desktop, const gchar *tip)
 {
     g_return_val_if_fail(desktop != NULL, NULL);
 
-    SPKnot * knot = (SPKnot*) g_object_new(SP_TYPE_KNOT, 0);
+    SPKnot * knot = static_cast<SPKnot*>(g_object_new(SP_TYPE_KNOT, 0));
 
     knot->desktop = desktop;
     knot->flags = SP_KNOT_VISIBLE;
diff --git a/src/marker.h b/src/marker.h
index eb907e2fb..6fdb82aa3 100644
--- a/src/marker.h
+++ b/src/marker.h
@@ -76,7 +76,7 @@ GType sp_marker_get_type (void);
 class SPMarkerReference : public Inkscape::URIReference {
 	SPMarkerReference(SPObject *obj) : URIReference(obj) {}
 	SPMarker *getObject() const {
-		return (SPMarker *)URIReference::getObject();
+		return static_cast<SPMarker *>(URIReference::getObject());
 	}
 protected:
 	virtual bool _acceptObject(SPObject *obj) const {
diff --git a/src/object-edit.cpp b/src/object-edit.cpp
index f042d2cf2..1c828e1e5 100644
--- a/src/object-edit.cpp
+++ b/src/object-edit.cpp
@@ -147,7 +147,7 @@ RectKnotHolderEntityRX::knot_set(Geom::Point const &p, Geom::Point const &/*orig
 
     update_knot();
 
-    ((SPObject*)rect)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    (static_cast<SPObject*>(rect))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 void
@@ -205,7 +205,7 @@ RectKnotHolderEntityRY::knot_set(Geom::Point const &p, Geom::Point const &/*orig
 
     update_knot();
 
-    ((SPObject *)rect)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    (static_cast<SPObject *>(rect))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 void
@@ -315,7 +315,7 @@ RectKnotHolderEntityWH::set_internal(Geom::Point const &p, Geom::Point const &or
 
     sp_rect_clamp_radii(rect);
 
-    ((SPObject *)rect)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    (static_cast<SPObject *>(rect))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 void
@@ -416,7 +416,7 @@ RectKnotHolderEntityXY::knot_set(Geom::Point const &p, Geom::Point const &origin
 
     update_knot();
 
-    ((SPObject *)rect)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    (static_cast<SPObject *>(rect))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 RectKnotHolder::RectKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler) :
@@ -780,7 +780,7 @@ ArcKnotHolderEntityStart::knot_set(Geom::Point const &p, Geom::Point const &/*or
         ge->start = sp_round(ge->start, M_PI/snaps);
     }
     sp_genericellipse_normalize(ge);
-    ((SPObject *)arc)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    (static_cast<SPObject *>(arc))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 Geom::Point
@@ -812,7 +812,7 @@ ArcKnotHolderEntityEnd::knot_set(Geom::Point const &p, Geom::Point const &/*orig
         ge->end = sp_round(ge->end, M_PI/snaps);
     }
     sp_genericellipse_normalize(ge);
-    ((SPObject *)arc)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    (static_cast<SPObject *>(arc))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 Geom::Point
@@ -832,7 +832,7 @@ ArcKnotHolderEntityEnd::knot_click(guint state)
 
     if (state & GDK_SHIFT_MASK) {
         ge->end = ge->start = 0;
-        ((SPObject *)ge)->updateRepr();
+        (static_cast<SPObject *>(ge))->updateRepr();
     }
 }
 
@@ -850,7 +850,7 @@ ArcKnotHolderEntityRX::knot_set(Geom::Point const &p, Geom::Point const &/*origi
         ge->ry.computed = ge->rx.computed;
     }
 
-    ((SPObject *)item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    (static_cast<SPObject *>(item))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 Geom::Point
@@ -868,7 +868,7 @@ ArcKnotHolderEntityRX::knot_click(guint state)
 
     if (state & GDK_CONTROL_MASK) {
         ge->ry.computed = ge->rx.computed;
-        ((SPObject *)ge)->updateRepr();
+        (static_cast<SPObject *>(ge))->updateRepr();
     }
 }
 
@@ -885,7 +885,7 @@ ArcKnotHolderEntityRY::knot_set(Geom::Point const &p, Geom::Point const &/*origi
         ge->rx.computed = ge->ry.computed;
     }
 
-    ((SPObject *)item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    (static_cast<SPObject *>(item))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 Geom::Point
@@ -903,7 +903,7 @@ ArcKnotHolderEntityRY::knot_click(guint state)
 
     if (state & GDK_CONTROL_MASK) {
         ge->rx.computed = ge->ry.computed;
-        ((SPObject *)ge)->updateRepr();
+        (static_cast<SPObject *>(ge))->updateRepr();
     }
 }
 
@@ -975,7 +975,7 @@ StarKnotHolderEntity1::knot_set(Geom::Point const &p, Geom::Point const &/*origi
         star->arg[0]  = arg1;
         star->arg[1] += darg1;
     }
-    ((SPObject *)star)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    (static_cast<SPObject *>(star))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 void
@@ -1003,7 +1003,7 @@ StarKnotHolderEntity2::knot_set(Geom::Point const &p, Geom::Point const &/*origi
             star->r[1]   = L2(d);
             star->arg[1] = atan2(d);
         }
-        ((SPObject *)star)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+        (static_cast<SPObject *>(star))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
     }
 }
 
@@ -1035,13 +1035,13 @@ sp_star_knot_click(SPItem *item, guint state)
 
     if (state & GDK_MOD1_MASK) {
         star->randomized = 0;
-        ((SPObject *)star)->updateRepr();
+        (static_cast<SPObject *>(star))->updateRepr();
     } else if (state & GDK_SHIFT_MASK) {
         star->rounded = 0;
-        ((SPObject *)star)->updateRepr();
+        (static_cast<SPObject *>(star))->updateRepr();
     } else if (state & GDK_CONTROL_MASK) {
         star->arg[1] = star->arg[0] + M_PI / star->sides;
-        ((SPObject *)star)->updateRepr();
+        (static_cast<SPObject *>(star))->updateRepr();
     }
 }
 
@@ -1142,7 +1142,7 @@ SpiralKnotHolderEntityInner::knot_set(Geom::Point const &p, Geom::Point const &o
         spiral->t0 = CLAMP(spiral->t0, 0.0, 0.999);
     }
 
-    ((SPObject *)spiral)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    (static_cast<SPObject *>(spiral))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 /*
@@ -1221,7 +1221,7 @@ SpiralKnotHolderEntityOuter::knot_set(Geom::Point const &p, Geom::Point const &/
         spiral->t0 = CLAMP(spiral->t0, 0.0, 0.999);
     }
 
-    ((SPObject *)spiral)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    (static_cast<SPObject *>(spiral))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 Geom::Point
@@ -1247,10 +1247,10 @@ SpiralKnotHolderEntityInner::knot_click(guint state)
 
     if (state & GDK_MOD1_MASK) {
         spiral->exp = 1;
-        ((SPObject *)spiral)->updateRepr();
+        (static_cast<SPObject *>(spiral))->updateRepr();
     } else if (state & GDK_SHIFT_MASK) {
         spiral->t0 = 0;
-        ((SPObject *)spiral)->updateRepr();
+        (static_cast<SPObject *>(spiral))->updateRepr();
     }
 }
 
@@ -1288,7 +1288,7 @@ OffsetKnotHolderEntity::knot_set(Geom::Point const &p, Geom::Point const &/*orig
     offset->knot = p;
     offset->knotSet = true;
 
-    ((SPObject *)offset)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    (static_cast<SPObject *>(offset))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 
diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index 1b0bcfebd..bda856914 100644
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
@@ -399,7 +399,7 @@ void Inkscape::ObjectSnapper::_collectPaths(Geom::Point /*p*/,
                     if (SP_IS_TEXT(root_item) || SP_IS_FLOWTEXT(root_item)) {
                         if (_snapmanager->snapprefs.isTargetSnappable(SNAPTARGET_TEXT_BASELINE)) {
                             // Snap to the text baseline
-                            Text::Layout const *layout = te_get_layout((SPItem *) root_item);
+                            Text::Layout const *layout = te_get_layout(static_cast<SPItem *>(root_item));
                             if (layout != NULL && layout->outputExists()) {
                                 Geom::PathVector *pv = new Geom::PathVector();
                                 pv->push_back(layout->baseline() * root_item->i2dt_affine() * (*i).additional_affine * _snapmanager->getDesktop()->doc2dt());
diff --git a/src/select-context.cpp b/src/select-context.cpp
index ad50edb71..922329d7a 100644
--- a/src/select-context.cpp
+++ b/src/select-context.cpp
@@ -489,7 +489,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event)
         case GDK_2BUTTON_PRESS:
             if (event->button.button == 1) {
                 if (!selection->isEmpty()) {
-                    SPItem *clicked_item = (SPItem *) selection->itemList()->data;
+                    SPItem *clicked_item = static_cast<SPItem *>(selection->itemList()->data);
                     if (SP_IS_GROUP(clicked_item) && !SP_IS_BOX3D(clicked_item)) { // enter group if it's not a 3D box
                         desktop->setCurrentLayer(reinterpret_cast<SPObject *>(clicked_item));
                         sp_desktop_selection(desktop)->clear();
diff --git a/src/shape-editor.cpp b/src/shape-editor.cpp
index 1fe6e620b..2034b9d2d 100644
--- a/src/shape-editor.cpp
+++ b/src/shape-editor.cpp
@@ -154,7 +154,7 @@ static void shapeeditor_event_attr_changed(Inkscape::XML::Node */*repr*/, gchar
                                            bool /*is_interactive*/, gpointer data)
 {
     g_assert(data);
-    ShapeEditor *sh = ((ShapeEditor *) data);
+    ShapeEditor *sh = static_cast<ShapeEditor *>(data);
 
     sh->shapeeditor_event_attr_changed(name);
 }
diff --git a/src/sp-clippath.h b/src/sp-clippath.h
index 6cab3f053..22877c3a9 100644
--- a/src/sp-clippath.h
+++ b/src/sp-clippath.h
@@ -81,7 +81,7 @@ class SPClipPathReference : public Inkscape::URIReference {
 public:
     SPClipPathReference(SPObject *obj) : URIReference(obj) {}
     SPClipPath *getObject() const {
-        return (SPClipPath *)URIReference::getObject();
+        return static_cast<SPClipPath *>(URIReference::getObject());
     }
 
 protected:
diff --git a/src/sp-gradient-reference.h b/src/sp-gradient-reference.h
index 2737df702..96980fd6f 100644
--- a/src/sp-gradient-reference.h
+++ b/src/sp-gradient-reference.h
@@ -11,7 +11,7 @@ public:
     SPGradientReference(SPObject *obj) : URIReference(obj) {}
 
     SPGradient *getObject() const {
-        return (SPGradient *)URIReference::getObject();
+        return reinterpret_cast<SPGradient *>(URIReference::getObject());
     }
 
 protected:
diff --git a/src/sp-mask.h b/src/sp-mask.h
index 6155131ff..e249e0c76 100644
--- a/src/sp-mask.h
+++ b/src/sp-mask.h
@@ -56,7 +56,7 @@ class SPMaskReference : public Inkscape::URIReference {
 public:
 	SPMaskReference(SPObject *obj) : URIReference(obj) {}
 	SPMask *getObject() const {
-		return (SPMask *)URIReference::getObject();
+		return static_cast<SPMask *>(URIReference::getObject());
 	}
 protected:
     /**
diff --git a/src/sp-paint-server.cpp b/src/sp-paint-server.cpp
index ceb36740f..ae4a60ba6 100644
--- a/src/sp-paint-server.cpp
+++ b/src/sp-paint-server.cpp
@@ -61,7 +61,7 @@ static void sp_paint_server_class_init(SPPaintServerClass *psc)
 {
     psc->pattern_new = sp_paint_server_create_dummy_pattern;
 
-    parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT);
+    parent_class = static_cast<SPObjectClass *>(g_type_class_ref(SP_TYPE_OBJECT));
 }
 
 void SPPaintServer::init(SPPaintServer * /*ps*/)
diff --git a/src/sp-pattern.h b/src/sp-pattern.h
index cb6d1dbf0..debce86fb 100644
--- a/src/sp-pattern.h
+++ b/src/sp-pattern.h
@@ -39,7 +39,7 @@ class SPPatternReference : public Inkscape::URIReference {
 public:
     SPPatternReference (SPObject *obj) : URIReference(obj) {}
     SPPattern *getObject() const {
-        return (SPPattern *)URIReference::getObject();
+        return reinterpret_cast<SPPattern *>(URIReference::getObject());
     }
 
 protected:
diff --git a/src/sp-spiral.cpp b/src/sp-spiral.cpp
index 63d7a2616..fd2672388 100644
--- a/src/sp-spiral.cpp
+++ b/src/sp-spiral.cpp
@@ -283,7 +283,7 @@ static void sp_spiral_update(SPObject *object, SPCtx *ctx, guint flags)
 
 static void sp_spiral_update_patheffect(SPLPEItem *lpeitem, bool write)
 {
-    SPShape *shape = (SPShape *) lpeitem;
+    SPShape *shape = static_cast<SPShape *>(lpeitem);
     sp_spiral_set_shape(shape);
 
     if (write) {
@@ -497,7 +497,7 @@ sp_spiral_position_set       (SPSpiral          *spiral,
     spiral->arg        = arg;
     spiral->t0         = CLAMP(t0, 0.0, 0.999);
 
-    ((SPObject *)spiral)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    (static_cast<SPObject *>(spiral))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 /**
@@ -510,8 +510,8 @@ static void sp_spiral_snappoints(SPItem const *item, std::vector<Inkscape::SnapC
     Inkscape::SnapPreferences local_snapprefs = *snapprefs;
     local_snapprefs.setTargetSnappable(Inkscape::SNAPTARGET_OBJECT_MIDPOINT, false);
 
-    if (((SPItemClass *) parent_class)->snappoints) {
-        ((SPItemClass *) parent_class)->snappoints (item, p, &local_snapprefs);
+    if ((reinterpret_cast<SPItemClass *>(parent_class))->snappoints) {
+        (reinterpret_cast<SPItemClass *>(parent_class))->snappoints (item, p, &local_snapprefs);
     }
 
     if (snapprefs->isTargetSnappable(Inkscape::SNAPTARGET_OBJECT_MIDPOINT)) {
diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 21c380477..f930bb636 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -702,7 +702,7 @@ void TextTagAttributes::writeSingleAttribute(Inkscape::XML::Node *node, gchar co
         gchar single_value_string[32];
 
         // FIXME: this has no concept of unset values because sp_svg_length_list_read() can't read them back in
-        for (std::vector<SVGLength>::const_iterator it = attr_vector.begin() ; it != attr_vector.end() ; it++) {
+        for (std::vector<SVGLength>::const_iterator it = attr_vector.begin() ; it != attr_vector.end() ; ++it) {
             g_ascii_formatd(single_value_string, sizeof (single_value_string), "%.8g", it->computed);
             if (!string.empty()) string += ' ';
             string += single_value_string;
diff --git a/src/svg-view.cpp b/src/svg-view.cpp
index 5f2208a2d..aa6666445 100644
--- a/src/svg-view.cpp
+++ b/src/svg-view.cpp
@@ -125,7 +125,7 @@ static gint arena_handler(SPCanvasArena */*arena*/, Inkscape::DrawingItem *ai, G
 	static gboolean active = FALSE;
 	SPEvent spev;
 
-	SPItem *spitem = (ai) ? (SPItem*) ai->data() : 0;
+	SPItem *spitem = (ai) ? (static_cast<SPItem*>(ai->data())) : 0;
 
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index e6ffb54de..8f005d86a 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -1973,7 +1973,7 @@ void sp_te_apply_style(SPItem *text, Inkscape::Text::Layout::iterator const &sta
     // bug #168370 (consider parent transform and viewBox)
     // snipplet copied from desktop-style.cpp sp_desktop_apply_css_recursive(...)
     SPCSSAttr *css_set = sp_repr_css_attr_new();
-    sp_repr_css_merge(css_set, (SPCSSAttr*) css);
+    sp_repr_css_merge(css_set, const_cast<SPCSSAttr*>(css));
     {
         Geom::Affine const local(SP_ITEM(common_ancestor)->i2doc_affine());
         double const ex(local.descrim());
@@ -2032,7 +2032,7 @@ bool has_visible_text(SPObject *obj)
         hasVisible = true; // maybe we should also check that it's not all whitespace?
     } else {
         for (SPObject const *child = obj->firstChild() ; child ; child = child->getNext()) {
-            if (has_visible_text((SPObject *) child)) {
+            if (has_visible_text(const_cast<SPObject *>(child))) {
                 hasVisible = true;
                 break;
             }