fixing to trunk

(bzr r12588.1.34)

1 files changed, 207 insertions, 152 deletions

diff --git a/src/object-edit.cpp b/src/ui/object-edit.cpp
index e9b183eca..ca550502d 100644
--- a/src/object-edit.cpp
+++ b/src/ui/object-edit.cpp
@@ -6,6 +6,7 @@
  *   Mitsuru Oka
  *   Maximilian Albert <maximilian.albert@gmail.com>
  *   Abhishek Sharma
+ *   Jon A. Cruz <jon@joncruz.org>
  *
  * Licensed under GNU GPL
  */
@@ -33,7 +34,7 @@
 #include "sp-pattern.h"
 #include "sp-path.h"
 #include <glibmm/i18n.h>
-#include "object-edit.h"
+#include "ui/object-edit.h"
 #include "xml/repr.h"
 #include <2geom/math-utils.h>
 #include "knot-holder-entity.h"
@@ -42,11 +43,11 @@
 
 namespace {
 
-static KnotHolder *sp_lpe_knot_holder(SPItem *item, SPDesktop *desktop)
+static KnotHolder *sp_lpe_knot_holder(SPLPEItem *item, SPDesktop *desktop)
 {
     KnotHolder *knot_holder = new KnotHolder(desktop, item, NULL);
 
-    Inkscape::LivePathEffect::Effect *effect = SP_LPE_ITEM(item)->getCurrentLPE();
+    Inkscape::LivePathEffect::Effect *effect = item->getCurrentLPE();
     effect->addHandles(knot_holder, desktop, item);
 
     return knot_holder;
@@ -55,40 +56,46 @@ static KnotHolder *sp_lpe_knot_holder(SPItem *item, SPDesktop *desktop)
 } // namespace
 
 namespace Inkscape {
+namespace UI {
 
 KnotHolder *createKnotHolder(SPItem *item, SPDesktop *desktop)
 {
     KnotHolder *knotholder = NULL;
 
-    if (SP_IS_LPE_ITEM(item) &&
-        SP_LPE_ITEM(item)->getCurrentLPE() &&
-        SP_LPE_ITEM(item)->getCurrentLPE()->isVisible() &&
-        SP_LPE_ITEM(item)->getCurrentLPE()->providesKnotholder()) {
-        knotholder = sp_lpe_knot_holder(item, desktop);
-    } else if (SP_IS_RECT(item)) {
+    SPLPEItem *lpe = dynamic_cast<SPLPEItem *>(item);
+    if (lpe &&
+        lpe->getCurrentLPE() &&
+        lpe->getCurrentLPE()->isVisible() &&
+        lpe->getCurrentLPE()->providesKnotholder()) {
+        knotholder = sp_lpe_knot_holder(lpe, desktop);
+    } else if (dynamic_cast<SPRect *>(item)) {
         knotholder = new RectKnotHolder(desktop, item, NULL);
-    } else if (SP_IS_BOX3D(item)) {
+    } else if (dynamic_cast<SPBox3D *>(item)) {
         knotholder = new Box3DKnotHolder(desktop, item, NULL);
-    } else if (SP_IS_GENERICELLIPSE(item)) {
+    } else if (dynamic_cast<SPGenericEllipse *>(item)) {
         knotholder = new ArcKnotHolder(desktop, item, NULL);
-    } else if (SP_IS_STAR(item)) {
+    } else if (dynamic_cast<SPStar *>(item)) {
         knotholder = new StarKnotHolder(desktop, item, NULL);
-    } else if (SP_IS_SPIRAL(item)) {
+    } else if (dynamic_cast<SPSpiral *>(item)) {
         knotholder = new SpiralKnotHolder(desktop, item, NULL);
-    } else if (SP_IS_OFFSET(item)) {
+    } else if (dynamic_cast<SPOffset *>(item)) {
         knotholder = new OffsetKnotHolder(desktop, item, NULL);
-    } else if (SP_IS_FLOWTEXT(item) && SP_FLOWTEXT(item)->has_internal_frame()) {
-        knotholder = new FlowtextKnotHolder(desktop, SP_FLOWTEXT(item)->get_frame(NULL), NULL);
-    } else if ((item->style->fill.isPaintserver())
-               && SP_IS_PATTERN(item->style->getFillPaintServer())) {
-        knotholder = new KnotHolder(desktop, item, NULL);
-        knotholder->add_pattern_knotholder();
+    } else {
+        SPFlowtext *flowtext = dynamic_cast<SPFlowtext *>(item);
+        if (flowtext && flowtext->has_internal_frame()) {
+            knotholder = new FlowtextKnotHolder(desktop, flowtext->get_frame(NULL), NULL);
+        } else if ((item->style->fill.isPaintserver() && dynamic_cast<SPPattern *>(item->style->getFillPaintServer())) ||
+                   (item->style->stroke.isPaintserver() && dynamic_cast<SPPattern *>(item->style->getStrokePaintServer()))) {
+            knotholder = new KnotHolder(desktop, item, NULL);
+            knotholder->add_pattern_knotholder();
+        }
     }
 
     return knotholder;
 }
 
-} // Inkscape
+}
+} // namespace Inkscape
 
 /* SPRect */
 
@@ -96,47 +103,49 @@ KnotHolder *createKnotHolder(SPItem *item, SPDesktop *desktop)
 class RectKnotHolderEntityRX : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
-    virtual void knot_click(guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    virtual void knot_click(unsigned int state);
 };
 
 /* handle for vertical rounding radius */
 class RectKnotHolderEntityRY : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
-    virtual void knot_click(guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    virtual void knot_click(unsigned int state);
 };
 
 /* handle for width/height adjustment */
 class RectKnotHolderEntityWH : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 
 protected:
-    void set_internal(Geom::Point const &p, Geom::Point const &origin, guint state);
+    void set_internal(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 /* handle for x/y adjustment */
 class RectKnotHolderEntityXY : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 Geom::Point
 RectKnotHolderEntityRX::knot_get() const
 {
-    SPRect *rect = SP_RECT(item);
+    SPRect *rect = dynamic_cast<SPRect *>(item);
+    g_assert(rect != NULL);
 
     return Geom::Point(rect->x.computed + rect->width.computed - rect->rx.computed, rect->y.computed);
 }
 
 void
-RectKnotHolderEntityRX::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state)
+RectKnotHolderEntityRX::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int state)
 {
-    SPRect *rect = SP_RECT(item);
+    SPRect *rect = dynamic_cast<SPRect *>(item);
+    g_assert(rect != NULL);
 
     //In general we cannot just snap this radius to an arbitrary point, as we have only a single
     //degree of freedom. For snapping to an arbitrary point we need two DOF. If we're going to snap
@@ -155,13 +164,14 @@ RectKnotHolderEntityRX::knot_set(Geom::Point const &p, Geom::Point const &/*orig
 
     update_knot();
 
-    (static_cast<SPObject*>(rect))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    rect->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 void
-RectKnotHolderEntityRX::knot_click(guint state)
+RectKnotHolderEntityRX::knot_click(unsigned int state)
 {
-    SPRect *rect = SP_RECT(item);
+    SPRect *rect = dynamic_cast<SPRect *>(item);
+    g_assert(rect != NULL);
 
     if (state & GDK_SHIFT_MASK) {
         /* remove rounding from rectangle */
@@ -177,15 +187,17 @@ RectKnotHolderEntityRX::knot_click(guint state)
 Geom::Point
 RectKnotHolderEntityRY::knot_get() const
 {
-    SPRect *rect = SP_RECT(item);
+    SPRect *rect = dynamic_cast<SPRect *>(item);
+    g_assert(rect != NULL);
 
     return Geom::Point(rect->x.computed + rect->width.computed, rect->y.computed + rect->ry.computed);
 }
 
 void
-RectKnotHolderEntityRY::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state)
+RectKnotHolderEntityRY::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int state)
 {
-    SPRect *rect = SP_RECT(item);
+    SPRect *rect = dynamic_cast<SPRect *>(item);
+    g_assert(rect != NULL);
 
     //In general we cannot just snap this radius to an arbitrary point, as we have only a single
     //degree of freedom. For snapping to an arbitrary point we need two DOF. If we're going to snap
@@ -213,13 +225,14 @@ RectKnotHolderEntityRY::knot_set(Geom::Point const &p, Geom::Point const &/*orig
 
     update_knot();
 
-    (static_cast<SPObject *>(rect))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    rect->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 void
-RectKnotHolderEntityRY::knot_click(guint state)
+RectKnotHolderEntityRY::knot_click(unsigned int state)
 {
-    SPRect *rect = SP_RECT(item);
+    SPRect *rect = dynamic_cast<SPRect *>(item);
+    g_assert(rect != NULL);
 
     if (state & GDK_SHIFT_MASK) {
         /* remove rounding */
@@ -249,15 +262,17 @@ static void sp_rect_clamp_radii(SPRect *rect)
 Geom::Point
 RectKnotHolderEntityWH::knot_get() const
 {
-    SPRect *rect = SP_RECT(item);
+    SPRect *rect = dynamic_cast<SPRect *>(item);
+    g_assert(rect != NULL);
 
     return Geom::Point(rect->x.computed + rect->width.computed, rect->y.computed + rect->height.computed);
 }
 
 void
-RectKnotHolderEntityWH::set_internal(Geom::Point const &p, Geom::Point const &origin, guint state)
+RectKnotHolderEntityWH::set_internal(Geom::Point const &p, Geom::Point const &origin, unsigned int state)
 {
-    SPRect *rect = SP_RECT(item);
+    SPRect *rect = dynamic_cast<SPRect *>(item);
+    g_assert(rect != NULL);
 
     Geom::Point s = p;
 
@@ -323,11 +338,11 @@ RectKnotHolderEntityWH::set_internal(Geom::Point const &p, Geom::Point const &or
 
     sp_rect_clamp_radii(rect);
 
-    (static_cast<SPObject *>(rect))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    rect->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 void
-RectKnotHolderEntityWH::knot_set(Geom::Point const &p, Geom::Point const &origin, guint state)
+RectKnotHolderEntityWH::knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state)
 {
     set_internal(p, origin, state);
     update_knot();
@@ -336,15 +351,17 @@ RectKnotHolderEntityWH::knot_set(Geom::Point const &p, Geom::Point const &origin
 Geom::Point
 RectKnotHolderEntityXY::knot_get() const
 {
-    SPRect *rect = SP_RECT(item);
+    SPRect *rect = dynamic_cast<SPRect *>(item);
+    g_assert(rect != NULL);
 
     return Geom::Point(rect->x.computed, rect->y.computed);
 }
 
 void
-RectKnotHolderEntityXY::knot_set(Geom::Point const &p, Geom::Point const &origin, guint state)
+RectKnotHolderEntityXY::knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state)
 {
-    SPRect *rect = SP_RECT(item);
+    SPRect *rect = dynamic_cast<SPRect *>(item);
+    g_assert(rect != NULL);
 
     // opposite corner (unmoved)
     gdouble opposite_x = (rect->x.computed + rect->width.computed);
@@ -424,7 +441,7 @@ RectKnotHolderEntityXY::knot_set(Geom::Point const &p, Geom::Point const &origin
 
     update_knot();
 
-    (static_cast<SPObject *>(rect))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    rect->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 RectKnotHolder::RectKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler) :
@@ -468,25 +485,31 @@ RectKnotHolder::RectKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderRel
 class Box3DKnotHolderEntity : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const = 0;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) = 0;
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state) = 0;
 
     Geom::Point knot_get_generic(SPItem *item, unsigned int knot_id) const;
-    void knot_set_generic(SPItem *item, unsigned int knot_id, Geom::Point const &p, guint state);
+    void knot_set_generic(SPItem *item, unsigned int knot_id, Geom::Point const &p, unsigned int state);
 };
 
 Geom::Point
 Box3DKnotHolderEntity::knot_get_generic(SPItem *item, unsigned int knot_id) const
 {
-    return box3d_get_corner_screen(SP_BOX3D(item), knot_id);
+    SPBox3D *box = dynamic_cast<SPBox3D *>(item);
+    if (box) {
+        return box3d_get_corner_screen(box, knot_id);
+    } else {
+        return Geom::Point(); // TODO investigate proper fallback
+    }
 }
 
 void
-Box3DKnotHolderEntity::knot_set_generic(SPItem *item, unsigned int knot_id, Geom::Point const &new_pos, guint state)
+Box3DKnotHolderEntity::knot_set_generic(SPItem *item, unsigned int knot_id, Geom::Point const &new_pos, unsigned int state)
 {
     Geom::Point const s = snap_knot_position(new_pos, state);
 
     g_assert(item != NULL);
-    SPBox3D *box = SP_BOX3D(item);
+    SPBox3D *box = dynamic_cast<SPBox3D *>(item);
+    g_assert(box != NULL);
     Geom::Affine const i2dt (item->i2dt_affine ());
 
     Box3D::Axis movement;
@@ -504,55 +527,55 @@ Box3DKnotHolderEntity::knot_set_generic(SPItem *item, unsigned int knot_id, Geom
 class Box3DKnotHolderEntity0 : public Box3DKnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 class Box3DKnotHolderEntity1 : public Box3DKnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 class Box3DKnotHolderEntity2 : public Box3DKnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 class Box3DKnotHolderEntity3 : public Box3DKnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 class Box3DKnotHolderEntity4 : public Box3DKnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 class Box3DKnotHolderEntity5 : public Box3DKnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 class Box3DKnotHolderEntity6 : public Box3DKnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 class Box3DKnotHolderEntity7 : public Box3DKnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 class Box3DKnotHolderEntityCenter : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 Geom::Point
@@ -606,66 +629,72 @@ Box3DKnotHolderEntity7::knot_get() const
 Geom::Point
 Box3DKnotHolderEntityCenter::knot_get() const
 {
-    return box3d_get_center_screen(SP_BOX3D(item));
+    SPBox3D *box = dynamic_cast<SPBox3D *>(item);
+    if (box) {
+        return box3d_get_center_screen(box);
+    } else {
+        return Geom::Point(); // TODO investigate proper fallback
+    }
 }
 
 void
-Box3DKnotHolderEntity0::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state)
+Box3DKnotHolderEntity0::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, unsigned int state)
 {
     knot_set_generic(item, 0, new_pos, state);
 }
 
 void
-Box3DKnotHolderEntity1::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state)
+Box3DKnotHolderEntity1::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, unsigned int state)
 {
     knot_set_generic(item, 1, new_pos, state);
 }
 
 void
-Box3DKnotHolderEntity2::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state)
+Box3DKnotHolderEntity2::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, unsigned int state)
 {
     knot_set_generic(item, 2, new_pos, state);
 }
 
 void
-Box3DKnotHolderEntity3::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state)
+Box3DKnotHolderEntity3::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, unsigned int state)
 {
     knot_set_generic(item, 3, new_pos, state);
 }
 
 void
-Box3DKnotHolderEntity4::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state)
+Box3DKnotHolderEntity4::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, unsigned int state)
 {
     knot_set_generic(item, 4, new_pos, state);
 }
 
 void
-Box3DKnotHolderEntity5::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state)
+Box3DKnotHolderEntity5::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, unsigned int state)
 {
     knot_set_generic(item, 5, new_pos, state);
 }
 
 void
-Box3DKnotHolderEntity6::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state)
+Box3DKnotHolderEntity6::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, unsigned int state)
 {
     knot_set_generic(item, 6, new_pos, state);
 }
 
 void
-Box3DKnotHolderEntity7::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state)
+Box3DKnotHolderEntity7::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, unsigned int state)
 {
     knot_set_generic(item, 7, new_pos, state);
 }
 
 void
-Box3DKnotHolderEntityCenter::knot_set(Geom::Point const &new_pos, Geom::Point const &origin, guint state)
+Box3DKnotHolderEntityCenter::knot_set(Geom::Point const &new_pos, Geom::Point const &origin, unsigned int state)
 {
     Geom::Point const s = snap_knot_position(new_pos, state);
 
-    SPBox3D *box = SP_BOX3D(item);
+    SPBox3D *box = dynamic_cast<SPBox3D *>(item);
+    g_assert(box != NULL);
     Geom::Affine const i2dt (item->i2dt_affine ());
 
-    box3d_set_center (SP_BOX3D(item), s * i2dt, origin * i2dt, !(state & GDK_SHIFT_MASK) ? Box3D::XY : Box3D::Z,
+    box3d_set_center(box, s * i2dt, origin * i2dt, !(state & GDK_SHIFT_MASK) ? Box3D::XY : Box3D::Z,
                       state & GDK_CONTROL_MASK);
 
     box3d_set_z_orders(box);
@@ -739,29 +768,29 @@ Box3DKnotHolder::Box3DKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderR
 class ArcKnotHolderEntityStart : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
-    virtual void knot_click(guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    virtual void knot_click(unsigned int state);
 };
 
 class ArcKnotHolderEntityEnd : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
-    virtual void knot_click(guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    virtual void knot_click(unsigned int state);
 };
 
 class ArcKnotHolderEntityRX : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
-    virtual void knot_click(guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    virtual void knot_click(unsigned int state);
 };
 
 class ArcKnotHolderEntityRY : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
-    virtual void knot_click(guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    virtual void knot_click(unsigned int state);
 };
 
 /*
@@ -783,11 +812,12 @@ sp_genericellipse_side(SPGenericEllipse *ellipse, Geom::Point const &p)
 }
 
 void
-ArcKnotHolderEntityStart::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state)
+ArcKnotHolderEntityStart::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int state)
 {
     int snaps = Inkscape::Preferences::get()->getInt("/options/rotationsnapsperpi/value", 12);
 
-    SPGenericEllipse *arc = SP_GENERICELLIPSE(item);
+    SPGenericEllipse *arc = dynamic_cast<SPGenericEllipse *>(item);
+    g_assert(arc != NULL);
 
     arc->setClosed(sp_genericellipse_side(arc, p) == -1);
 
@@ -807,28 +837,31 @@ ArcKnotHolderEntityStart::knot_set(Geom::Point const &p, Geom::Point const &/*or
 Geom::Point
 ArcKnotHolderEntityStart::knot_get() const
 {
-    SPGenericEllipse const *ge = SP_GENERICELLIPSE(item);
+    SPGenericEllipse const *ge = dynamic_cast<SPGenericEllipse const *>(item);
+    g_assert(ge != NULL);
 
     return ge->getPointAtAngle(ge->start);
 }
 
 void
-ArcKnotHolderEntityStart::knot_click(guint state)
+ArcKnotHolderEntityStart::knot_click(unsigned int state)
 {
-    SPGenericEllipse *ge = SP_GENERICELLIPSE(item);
+    SPGenericEllipse *ge = dynamic_cast<SPGenericEllipse *>(item);
+    g_assert(ge != NULL);
 
     if (state & GDK_SHIFT_MASK) {
         ge->end = ge->start = 0;
-        (static_cast<SPObject *>(ge))->updateRepr();
+        ge->updateRepr();
     }
 }
 
 void
-ArcKnotHolderEntityEnd::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state)
+ArcKnotHolderEntityEnd::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int state)
 {
     int snaps = Inkscape::Preferences::get()->getInt("/options/rotationsnapsperpi/value", 12);
 
-    SPGenericEllipse *arc = SP_GENERICELLIPSE(item);
+    SPGenericEllipse *arc = dynamic_cast<SPGenericEllipse *>(item);
+    g_assert(arc != NULL);
 
     arc->setClosed(sp_genericellipse_side(arc, p) == -1);
 
@@ -848,28 +881,31 @@ ArcKnotHolderEntityEnd::knot_set(Geom::Point const &p, Geom::Point const &/*orig
 Geom::Point
 ArcKnotHolderEntityEnd::knot_get() const
 {
-    SPGenericEllipse const *ge = SP_GENERICELLIPSE(item);
+    SPGenericEllipse const *ge = dynamic_cast<SPGenericEllipse const *>(item);
+    g_assert(ge != NULL);
 
     return ge->getPointAtAngle(ge->end);
 }
 
 
 void
-ArcKnotHolderEntityEnd::knot_click(guint state)
+ArcKnotHolderEntityEnd::knot_click(unsigned int state)
 {
-    SPGenericEllipse *ge = SP_GENERICELLIPSE(item);
+    SPGenericEllipse *ge = dynamic_cast<SPGenericEllipse *>(item);
+    g_assert(ge != NULL);
 
     if (state & GDK_SHIFT_MASK) {
         ge->end = ge->start = 0;
-        (static_cast<SPObject *>(ge))->updateRepr();
+        ge->updateRepr();
     }
 }
 
 
 void
-ArcKnotHolderEntityRX::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state)
+ArcKnotHolderEntityRX::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int state)
 {
-    SPGenericEllipse *ge = SP_GENERICELLIPSE(item);
+    SPGenericEllipse *ge = dynamic_cast<SPGenericEllipse *>(item);
+    g_assert(ge != NULL);
 
     Geom::Point const s = snap_knot_position(p, state);
 
@@ -879,32 +915,35 @@ ArcKnotHolderEntityRX::knot_set(Geom::Point const &p, Geom::Point const &/*origi
         ge->ry.computed = ge->rx.computed;
     }
 
-    (static_cast<SPObject *>(item))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 Geom::Point
 ArcKnotHolderEntityRX::knot_get() const
 {
-    SPGenericEllipse const *ge = SP_GENERICELLIPSE(item);
+    SPGenericEllipse const *ge = dynamic_cast<SPGenericEllipse const *>(item);
+    g_assert(ge != NULL);
 
     return (Geom::Point(ge->cx.computed, ge->cy.computed) -  Geom::Point(ge->rx.computed, 0));
 }
 
 void
-ArcKnotHolderEntityRX::knot_click(guint state)
+ArcKnotHolderEntityRX::knot_click(unsigned int state)
 {
-    SPGenericEllipse *ge = SP_GENERICELLIPSE(item);
+    SPGenericEllipse *ge = dynamic_cast<SPGenericEllipse *>(item);
+    g_assert(ge != NULL);
 
     if (state & GDK_CONTROL_MASK) {
         ge->ry.computed = ge->rx.computed;
-        (static_cast<SPObject *>(ge))->updateRepr();
+        ge->updateRepr();
     }
 }
 
 void
-ArcKnotHolderEntityRY::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state)
+ArcKnotHolderEntityRY::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int state)
 {
-    SPGenericEllipse *ge = SP_GENERICELLIPSE(item);
+    SPGenericEllipse *ge = dynamic_cast<SPGenericEllipse *>(item);
+    g_assert(ge != NULL);
 
     Geom::Point const s = snap_knot_position(p, state);
 
@@ -914,25 +953,27 @@ ArcKnotHolderEntityRY::knot_set(Geom::Point const &p, Geom::Point const &/*origi
         ge->rx.computed = ge->ry.computed;
     }
 
-    (static_cast<SPObject *>(item))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 Geom::Point
 ArcKnotHolderEntityRY::knot_get() const
 {
-    SPGenericEllipse const *ge = SP_GENERICELLIPSE(item);
+    SPGenericEllipse const *ge = dynamic_cast<SPGenericEllipse *>(item);
+    g_assert(ge != NULL);
 
     return (Geom::Point(ge->cx.computed, ge->cy.computed) -  Geom::Point(0, ge->ry.computed));
 }
 
 void
-ArcKnotHolderEntityRY::knot_click(guint state)
+ArcKnotHolderEntityRY::knot_click(unsigned int state)
 {
-    SPGenericEllipse *ge = SP_GENERICELLIPSE(item);
+    SPGenericEllipse *ge = dynamic_cast<SPGenericEllipse *>(item);
+    g_assert(ge != NULL);
 
     if (state & GDK_CONTROL_MASK) {
         ge->rx.computed = ge->ry.computed;
-        (static_cast<SPObject *>(ge))->updateRepr();
+        ge->updateRepr();
     }
 }
 
@@ -975,21 +1016,22 @@ ArcKnotHolder::ArcKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderRelea
 class StarKnotHolderEntity1 : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
-    virtual void knot_click(guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    virtual void knot_click(unsigned int state);
 };
 
 class StarKnotHolderEntity2 : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
-    virtual void knot_click(guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    virtual void knot_click(unsigned int state);
 };
 
 void
-StarKnotHolderEntity1::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state)
+StarKnotHolderEntity1::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int state)
 {
-    SPStar *star = SP_STAR(item);
+    SPStar *star = dynamic_cast<SPStar *>(item);
+    g_assert(star != NULL);
 
     Geom::Point const s = snap_knot_position(p, state);
 
@@ -1009,13 +1051,14 @@ StarKnotHolderEntity1::knot_set(Geom::Point const &p, Geom::Point const &/*origi
         star->arg[0]  = arg1;
         star->arg[1] += darg1;
     }
-    (static_cast<SPObject *>(star))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    star->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 void
-StarKnotHolderEntity2::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state)
+StarKnotHolderEntity2::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int state)
 {
-    SPStar *star = SP_STAR(item);
+    SPStar *star = dynamic_cast<SPStar *>(item);
+    g_assert(star != NULL);
 
     Geom::Point const s = snap_knot_position(p, state);
 
@@ -1037,7 +1080,7 @@ StarKnotHolderEntity2::knot_set(Geom::Point const &p, Geom::Point const &/*origi
             star->r[1]   = L2(d);
             star->arg[1] = atan2(d);
         }
-        (static_cast<SPObject *>(star))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+        star->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
     }
 }
 
@@ -1046,7 +1089,8 @@ StarKnotHolderEntity1::knot_get() const
 {
     g_assert(item != NULL);
 
-    SPStar const *star = SP_STAR(item);
+    SPStar const *star = dynamic_cast<SPStar const *>(item);
+    g_assert(star != NULL);
 
     return sp_star_get_xy(star, SP_STAR_POINT_KNOT1, 0);
 
@@ -1057,36 +1101,38 @@ StarKnotHolderEntity2::knot_get() const
 {
     g_assert(item != NULL);
 
-    SPStar const *star = SP_STAR(item);
+    SPStar const *star = dynamic_cast<SPStar const *>(item);
+    g_assert(star != NULL);
 
     return sp_star_get_xy(star, SP_STAR_POINT_KNOT2, 0);
 }
 
 static void
-sp_star_knot_click(SPItem *item, guint state)
+sp_star_knot_click(SPItem *item, unsigned int state)
 {
-    SPStar *star = SP_STAR(item);
+    SPStar *star = dynamic_cast<SPStar *>(item);
+    g_assert(star != NULL);
 
     if (state & GDK_MOD1_MASK) {
         star->randomized = 0;
-        (static_cast<SPObject *>(star))->updateRepr();
+        star->updateRepr();
     } else if (state & GDK_SHIFT_MASK) {
         star->rounded = 0;
-        (static_cast<SPObject *>(star))->updateRepr();
+        star->updateRepr();
     } else if (state & GDK_CONTROL_MASK) {
         star->arg[1] = star->arg[0] + M_PI / star->sides;
-        (static_cast<SPObject *>(star))->updateRepr();
+        star->updateRepr();
     }
 }
 
 void
-StarKnotHolderEntity1::knot_click(guint state)
+StarKnotHolderEntity1::knot_click(unsigned int state)
 {
     sp_star_knot_click(item, state);
 }
 
 void
-StarKnotHolderEntity2::knot_click(guint state)
+StarKnotHolderEntity2::knot_click(unsigned int state)
 {
     sp_star_knot_click(item, state);
 }
@@ -1094,7 +1140,8 @@ StarKnotHolderEntity2::knot_click(guint state)
 StarKnotHolder::StarKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderReleasedFunc relhandler) :
     KnotHolder(desktop, item, relhandler)
 {
-    SPStar *star = SP_STAR(item);
+    SPStar *star = dynamic_cast<SPStar *>(item);
+    g_assert(item != NULL);
 
     StarKnotHolderEntity1 *entity1 = new StarKnotHolderEntity1();
     entity1->create(desktop, item, this, Inkscape::CTRL_TYPE_SHAPER,
@@ -1119,14 +1166,14 @@ StarKnotHolder::StarKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderRel
 class SpiralKnotHolderEntityInner : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
-    virtual void knot_click(guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
+    virtual void knot_click(unsigned int state);
 };
 
 class SpiralKnotHolderEntityOuter : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 
@@ -1137,12 +1184,13 @@ public:
  *   [control] constrain inner arg to round per PI/4
  */
 void
-SpiralKnotHolderEntityInner::knot_set(Geom::Point const &p, Geom::Point const &origin, guint state)
+SpiralKnotHolderEntityInner::knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     int snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12);
 
-    SPSpiral *spiral = SP_SPIRAL(item);
+    SPSpiral *spiral = dynamic_cast<SPSpiral *>(item);
+    g_assert(spiral != NULL);
 
     gdouble   dx = p[Geom::X] - spiral->cx;
     gdouble   dy = p[Geom::Y] - spiral->cy;
@@ -1177,7 +1225,7 @@ SpiralKnotHolderEntityInner::knot_set(Geom::Point const &p, Geom::Point const &o
         spiral->t0 = CLAMP(spiral->t0, 0.0, 0.999);
     }
 
-    (static_cast<SPObject *>(spiral))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    spiral->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 /*
@@ -1186,12 +1234,13 @@ SpiralKnotHolderEntityInner::knot_set(Geom::Point const &p, Geom::Point const &o
  *   [control] constrain inner arg to round per PI/4
  */
 void
-SpiralKnotHolderEntityOuter::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state)
+SpiralKnotHolderEntityOuter::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int state)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     int snaps = prefs->getInt("/options/rotationsnapsperpi/value", 12);
 
-    SPSpiral *spiral = SP_SPIRAL(item);
+    SPSpiral *spiral = dynamic_cast<SPSpiral *>(item);
+    g_assert(spiral != NULL);
 
     gdouble  dx = p[Geom::X] - spiral->cx;
     gdouble  dy = p[Geom::Y] - spiral->cy;
@@ -1256,13 +1305,14 @@ SpiralKnotHolderEntityOuter::knot_set(Geom::Point const &p, Geom::Point const &/
         spiral->t0 = CLAMP(spiral->t0, 0.0, 0.999);
     }
 
-    (static_cast<SPObject *>(spiral))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    spiral->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 Geom::Point
 SpiralKnotHolderEntityInner::knot_get() const
 {
-    SPSpiral const *spiral = SP_SPIRAL(item);
+    SPSpiral const *spiral = dynamic_cast<SPSpiral const *>(item);
+    g_assert(spiral != NULL);
 
     return spiral->getXY(spiral->t0);
 }
@@ -1270,22 +1320,24 @@ SpiralKnotHolderEntityInner::knot_get() const
 Geom::Point
 SpiralKnotHolderEntityOuter::knot_get() const
 {
-    SPSpiral const *spiral = SP_SPIRAL(item);
+    SPSpiral const *spiral = dynamic_cast<SPSpiral const *>(item);
+    g_assert(spiral != NULL);
 
     return spiral->getXY(1.0);
 }
 
 void
-SpiralKnotHolderEntityInner::knot_click(guint state)
+SpiralKnotHolderEntityInner::knot_click(unsigned int state)
 {
-    SPSpiral *spiral = SP_SPIRAL(item);
+    SPSpiral *spiral = dynamic_cast<SPSpiral *>(item);
+    g_assert(spiral != NULL);
 
     if (state & GDK_MOD1_MASK) {
         spiral->exp = 1;
-        (static_cast<SPObject *>(spiral))->updateRepr();
+        spiral->updateRepr();
     } else if (state & GDK_SHIFT_MASK) {
         spiral->t0 = 0;
-        (static_cast<SPObject *>(spiral))->updateRepr();
+        spiral->updateRepr();
     }
 }
 
@@ -1314,26 +1366,28 @@ SpiralKnotHolder::SpiralKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolde
 class OffsetKnotHolderEntity : public KnotHolderEntity {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 void
-OffsetKnotHolderEntity::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/)
+OffsetKnotHolderEntity::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, unsigned int /*state*/)
 {
-    SPOffset *offset = SP_OFFSET(item);
+    SPOffset *offset = dynamic_cast<SPOffset *>(item);
+    g_assert(offset != NULL);
 
     offset->rad = sp_offset_distance_to_original(offset, p);
     offset->knot = p;
     offset->knotSet = true;
 
-    (static_cast<SPObject *>(offset))->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+    offset->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
 }
 
 
 Geom::Point
 OffsetKnotHolderEntity::knot_get() const
 {
-    SPOffset const *offset = SP_OFFSET(item);
+    SPOffset const *offset = dynamic_cast<SPOffset const *>(item);
+    g_assert(offset != NULL);
 
     Geom::Point np;
     sp_offset_top_point(offset,&np);
@@ -1357,19 +1411,20 @@ OffsetKnotHolder::OffsetKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolde
 class FlowtextKnotHolderEntity : public RectKnotHolderEntityWH {
 public:
     virtual Geom::Point knot_get() const;
-    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state);
+    virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state);
 };
 
 Geom::Point
 FlowtextKnotHolderEntity::knot_get() const
 {
-    SPRect const *rect = SP_RECT(item);
+    SPRect const *rect = dynamic_cast<SPRect const *>(item);
+    g_assert(rect != NULL);
 
     return Geom::Point(rect->x.computed + rect->width.computed, rect->y.computed + rect->height.computed);
 }
 
 void
-FlowtextKnotHolderEntity::knot_set(Geom::Point const &p, Geom::Point const &origin, guint state)
+FlowtextKnotHolderEntity::knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned int state)
 {
     set_internal(p, origin, state);
 }