From a45a0820bec31c1611da0c8de6ecfec218d2419a Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Fri, 1 Aug 2008 19:15:16 +0000 Subject: 2geomify a lot of NR::Points to Geom::Point (bzr r6513) --- src/object-edit.cpp | 242 ++++++++++++++++++++++++++-------------------------- 1 file changed, 121 insertions(+), 121 deletions(-) (limited to 'src/object-edit.cpp') diff --git a/src/object-edit.cpp b/src/object-edit.cpp index 1d72b9b29..3b513fe88 100644 --- a/src/object-edit.cpp +++ b/src/object-edit.cpp @@ -96,46 +96,46 @@ sp_item_knot_holder(SPItem *item, SPDesktop *desktop) /* handle for horizontal rounding radius */ class RectKnotHolderEntityRX : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); virtual void knot_click(guint state); }; /* handle for vertical rounding radius */ class RectKnotHolderEntityRY : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); virtual void knot_click(guint state); }; /* handle for width/height adjustment */ class RectKnotHolderEntityWH : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); protected: - void set_internal(NR::Point const &p, NR::Point const &origin, guint state); + void set_internal(Geom::Point const &p, Geom::Point const &origin, guint state); }; /* handle for x/y adjustment */ class RectKnotHolderEntityXY : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; -NR::Point +Geom::Point RectKnotHolderEntityRX::knot_get() { SPRect *rect = SP_RECT(item); - return NR::Point(rect->x.computed + rect->width.computed - rect->rx.computed, rect->y.computed); + return Geom::Point(rect->x.computed + rect->width.computed - rect->rx.computed, rect->y.computed); } void -RectKnotHolderEntityRX::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint state) +RectKnotHolderEntityRX::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { SPRect *rect = SP_RECT(item); @@ -175,16 +175,16 @@ RectKnotHolderEntityRX::knot_click(guint state) update_knot(); } -NR::Point +Geom::Point RectKnotHolderEntityRY::knot_get() { SPRect *rect = SP_RECT(item); - return NR::Point(rect->x.computed + rect->width.computed, rect->y.computed + rect->ry.computed); + return Geom::Point(rect->x.computed + rect->width.computed, rect->y.computed + rect->ry.computed); } void -RectKnotHolderEntityRY::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint state) +RectKnotHolderEntityRY::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { SPRect *rect = SP_RECT(item); @@ -245,19 +245,19 @@ static void sp_rect_clamp_radii(SPRect *rect) } } -NR::Point +Geom::Point RectKnotHolderEntityWH::knot_get() { SPRect *rect = SP_RECT(item); - return NR::Point(rect->x.computed + rect->width.computed, rect->y.computed + rect->height.computed); + return Geom::Point(rect->x.computed + rect->width.computed, rect->y.computed + rect->height.computed); } void -RectKnotHolderEntityWH::set_internal(NR::Point const &p, NR::Point const &origin, guint state) +RectKnotHolderEntityWH::set_internal(Geom::Point const &p, Geom::Point const &origin, guint state) { SPRect *rect = SP_RECT(item); - NR::Point const s = snap_knot_position(p); + Geom::Point const s = snap_knot_position(p); if (state & GDK_CONTROL_MASK) { // original width/height when drag started @@ -310,22 +310,22 @@ RectKnotHolderEntityWH::set_internal(NR::Point const &p, NR::Point const &origin } void -RectKnotHolderEntityWH::knot_set(NR::Point const &p, NR::Point const &origin, guint state) +RectKnotHolderEntityWH::knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) { set_internal(p, origin, state); update_knot(); } -NR::Point +Geom::Point RectKnotHolderEntityXY::knot_get() { SPRect *rect = SP_RECT(item); - return NR::Point(rect->x.computed, rect->y.computed); + return Geom::Point(rect->x.computed, rect->y.computed); } void -RectKnotHolderEntityXY::knot_set(NR::Point const &p, NR::Point const &origin, guint state) +RectKnotHolderEntityXY::knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) { SPRect *rect = SP_RECT(item); @@ -337,7 +337,7 @@ RectKnotHolderEntityXY::knot_set(NR::Point const &p, NR::Point const &origin, gu gdouble w_orig = opposite_x - origin[NR::X]; gdouble h_orig = opposite_y - origin[NR::Y]; - NR::Point const s = snap_knot_position(p); + Geom::Point const s = snap_knot_position(p); // mouse displacement since drag started gdouble minx = s[NR::X] - origin[NR::X]; @@ -432,23 +432,23 @@ RectKnotHolder::RectKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderRel class Box3DKnotHolderEntity : public KnotHolderEntity { public: - virtual NR::Point knot_get() = 0; - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state) = 0; + virtual Geom::Point knot_get() = 0; + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) = 0; - NR::Point knot_get_generic(SPItem *item, unsigned int knot_id); - void knot_set_generic(SPItem *item, unsigned int knot_id, NR::Point const &p, guint state); + Geom::Point knot_get_generic(SPItem *item, unsigned int knot_id); + void knot_set_generic(SPItem *item, unsigned int knot_id, Geom::Point const &p, guint state); }; -NR::Point +Geom::Point Box3DKnotHolderEntity::knot_get_generic(SPItem *item, unsigned int knot_id) { return box3d_get_corner_screen(SP_BOX3D(item), knot_id); } void -Box3DKnotHolderEntity::knot_set_generic(SPItem *item, unsigned int knot_id, NR::Point const &new_pos, guint state) +Box3DKnotHolderEntity::knot_set_generic(SPItem *item, unsigned int knot_id, Geom::Point const &new_pos, guint state) { - NR::Point const s = snap_knot_position(new_pos); + Geom::Point const s = snap_knot_position(new_pos); g_assert(item != NULL); SPBox3D *box = SP_BOX3D(item); @@ -468,164 +468,164 @@ Box3DKnotHolderEntity::knot_set_generic(SPItem *item, unsigned int knot_id, NR:: class Box3DKnotHolderEntity0 : public Box3DKnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; class Box3DKnotHolderEntity1 : public Box3DKnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; class Box3DKnotHolderEntity2 : public Box3DKnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; class Box3DKnotHolderEntity3 : public Box3DKnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; class Box3DKnotHolderEntity4 : public Box3DKnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; class Box3DKnotHolderEntity5 : public Box3DKnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; class Box3DKnotHolderEntity6 : public Box3DKnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; class Box3DKnotHolderEntity7 : public Box3DKnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; class Box3DKnotHolderEntityCenter : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; -NR::Point +Geom::Point Box3DKnotHolderEntity0::knot_get() { return knot_get_generic(item, 0); } -NR::Point +Geom::Point Box3DKnotHolderEntity1::knot_get() { return knot_get_generic(item, 1); } -NR::Point +Geom::Point Box3DKnotHolderEntity2::knot_get() { return knot_get_generic(item, 2); } -NR::Point +Geom::Point Box3DKnotHolderEntity3::knot_get() { return knot_get_generic(item, 3); } -NR::Point +Geom::Point Box3DKnotHolderEntity4::knot_get() { return knot_get_generic(item, 4); } -NR::Point +Geom::Point Box3DKnotHolderEntity5::knot_get() { return knot_get_generic(item, 5); } -NR::Point +Geom::Point Box3DKnotHolderEntity6::knot_get() { return knot_get_generic(item, 6); } -NR::Point +Geom::Point Box3DKnotHolderEntity7::knot_get() { return knot_get_generic(item, 7); } -NR::Point +Geom::Point Box3DKnotHolderEntityCenter::knot_get() { return box3d_get_center_screen(SP_BOX3D(item)); } void -Box3DKnotHolderEntity0::knot_set(NR::Point const &new_pos, NR::Point const &/*origin*/, guint state) +Box3DKnotHolderEntity0::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state) { knot_set_generic(item, 0, new_pos, state); } void -Box3DKnotHolderEntity1::knot_set(NR::Point const &new_pos, NR::Point const &/*origin*/, guint state) +Box3DKnotHolderEntity1::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state) { knot_set_generic(item, 1, new_pos, state); } void -Box3DKnotHolderEntity2::knot_set(NR::Point const &new_pos, NR::Point const &/*origin*/, guint state) +Box3DKnotHolderEntity2::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state) { knot_set_generic(item, 2, new_pos, state); } void -Box3DKnotHolderEntity3::knot_set(NR::Point const &new_pos, NR::Point const &/*origin*/, guint state) +Box3DKnotHolderEntity3::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state) { knot_set_generic(item, 3, new_pos, state); } void -Box3DKnotHolderEntity4::knot_set(NR::Point const &new_pos, NR::Point const &/*origin*/, guint state) +Box3DKnotHolderEntity4::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state) { knot_set_generic(item, 4, new_pos, state); } void -Box3DKnotHolderEntity5::knot_set(NR::Point const &new_pos, NR::Point const &/*origin*/, guint state) +Box3DKnotHolderEntity5::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state) { knot_set_generic(item, 5, new_pos, state); } void -Box3DKnotHolderEntity6::knot_set(NR::Point const &new_pos, NR::Point const &/*origin*/, guint state) +Box3DKnotHolderEntity6::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state) { knot_set_generic(item, 6, new_pos, state); } void -Box3DKnotHolderEntity7::knot_set(NR::Point const &new_pos, NR::Point const &/*origin*/, guint state) +Box3DKnotHolderEntity7::knot_set(Geom::Point const &new_pos, Geom::Point const &/*origin*/, guint state) { knot_set_generic(item, 7, new_pos, state); } void -Box3DKnotHolderEntityCenter::knot_set(NR::Point const &new_pos, NR::Point const &origin, guint state) +Box3DKnotHolderEntityCenter::knot_set(Geom::Point const &new_pos, Geom::Point const &origin, guint state) { - NR::Point const s = snap_knot_position(new_pos); + Geom::Point const s = snap_knot_position(new_pos); SPBox3D *box = SP_BOX3D(item); NR::Matrix const i2d (from_2geom(sp_item_i2d_affine (item))); @@ -695,28 +695,28 @@ Box3DKnotHolder::Box3DKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderR class ArcKnotHolderEntityStart : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; class ArcKnotHolderEntityEnd : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); virtual void knot_click(guint state); }; class ArcKnotHolderEntityRX : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); virtual void knot_click(guint state); }; class ArcKnotHolderEntityRY : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); virtual void knot_click(guint state); }; @@ -727,7 +727,7 @@ public: * -1 : outside */ static gint -sp_genericellipse_side(SPGenericEllipse *ellipse, NR::Point const &p) +sp_genericellipse_side(SPGenericEllipse *ellipse, Geom::Point const &p) { gdouble dx = (p[NR::X] - ellipse->cx.computed) / ellipse->rx.computed; gdouble dy = (p[NR::Y] - ellipse->cy.computed) / ellipse->ry.computed; @@ -739,7 +739,7 @@ sp_genericellipse_side(SPGenericEllipse *ellipse, NR::Point const &p) } void -ArcKnotHolderEntityStart::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint state) +ArcKnotHolderEntityStart::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { int snaps = prefs_get_int_attribute("options.rotationsnapsperpi", "value", 12); @@ -748,7 +748,7 @@ ArcKnotHolderEntityStart::knot_set(NR::Point const &p, NR::Point const &/*origin ge->closed = (sp_genericellipse_side(ge, p) == -1) ? TRUE : FALSE; - NR::Point delta = p - NR::Point(ge->cx.computed, ge->cy.computed); + Geom::Point delta = p - Geom::Point(ge->cx.computed, ge->cy.computed); NR::scale sc(ge->rx.computed, ge->ry.computed); ge->start = atan2(delta * sc.inverse()); if ( ( state & GDK_CONTROL_MASK ) @@ -760,7 +760,7 @@ ArcKnotHolderEntityStart::knot_set(NR::Point const &p, NR::Point const &/*origin ((SPObject *)arc)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } -NR::Point +Geom::Point ArcKnotHolderEntityStart::knot_get() { SPGenericEllipse *ge = SP_GENERICELLIPSE(item); @@ -770,7 +770,7 @@ ArcKnotHolderEntityStart::knot_get() } void -ArcKnotHolderEntityEnd::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint state) +ArcKnotHolderEntityEnd::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { int snaps = prefs_get_int_attribute("options.rotationsnapsperpi", "value", 12); @@ -779,7 +779,7 @@ ArcKnotHolderEntityEnd::knot_set(NR::Point const &p, NR::Point const &/*origin*/ ge->closed = (sp_genericellipse_side(ge, p) == -1) ? TRUE : FALSE; - NR::Point delta = p - NR::Point(ge->cx.computed, ge->cy.computed); + Geom::Point delta = p - Geom::Point(ge->cx.computed, ge->cy.computed); NR::scale sc(ge->rx.computed, ge->ry.computed); ge->end = atan2(delta * sc.inverse()); if ( ( state & GDK_CONTROL_MASK ) @@ -791,7 +791,7 @@ ArcKnotHolderEntityEnd::knot_set(NR::Point const &p, NR::Point const &/*origin*/ ((SPObject *)arc)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } -NR::Point +Geom::Point ArcKnotHolderEntityEnd::knot_get() { SPGenericEllipse *ge = SP_GENERICELLIPSE(item); @@ -814,11 +814,11 @@ ArcKnotHolderEntityEnd::knot_click(guint state) void -ArcKnotHolderEntityRX::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint state) +ArcKnotHolderEntityRX::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { SPGenericEllipse *ge = SP_GENERICELLIPSE(item); - NR::Point const s = snap_knot_position(p); + Geom::Point const s = snap_knot_position(p); ge->rx.computed = fabs( ge->cx.computed - s[NR::X] ); @@ -829,12 +829,12 @@ ArcKnotHolderEntityRX::knot_set(NR::Point const &p, NR::Point const &/*origin*/, ((SPObject *)item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } -NR::Point +Geom::Point ArcKnotHolderEntityRX::knot_get() { SPGenericEllipse *ge = SP_GENERICELLIPSE(item); - return (NR::Point(ge->cx.computed, ge->cy.computed) - NR::Point(ge->rx.computed, 0)); + return (Geom::Point(ge->cx.computed, ge->cy.computed) - Geom::Point(ge->rx.computed, 0)); } void @@ -849,11 +849,11 @@ ArcKnotHolderEntityRX::knot_click(guint state) } void -ArcKnotHolderEntityRY::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint state) +ArcKnotHolderEntityRY::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { SPGenericEllipse *ge = SP_GENERICELLIPSE(item); - NR::Point const s = snap_knot_position(p); + Geom::Point const s = snap_knot_position(p); ge->ry.computed = fabs( ge->cy.computed - s[NR::Y] ); @@ -864,12 +864,12 @@ ArcKnotHolderEntityRY::knot_set(NR::Point const &p, NR::Point const &/*origin*/, ((SPObject *)item)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } -NR::Point +Geom::Point ArcKnotHolderEntityRY::knot_get() { SPGenericEllipse *ge = SP_GENERICELLIPSE(item); - return (NR::Point(ge->cx.computed, ge->cy.computed) - NR::Point(0, ge->ry.computed)); + return (Geom::Point(ge->cx.computed, ge->cy.computed) - Geom::Point(0, ge->ry.computed)); } void @@ -916,26 +916,26 @@ ArcKnotHolder::ArcKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderRelea class StarKnotHolderEntity1 : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); virtual void knot_click(guint state); }; class StarKnotHolderEntity2 : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); virtual void knot_click(guint state); }; void -StarKnotHolderEntity1::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint state) +StarKnotHolderEntity1::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { SPStar *star = SP_STAR(item); - NR::Point const s = snap_knot_position(p); + Geom::Point const s = snap_knot_position(p); - NR::Point d = s - star->center; + Geom::Point d = s - to_2geom(star->center); double arg1 = atan2(d); double darg1 = arg1 - star->arg[0]; @@ -955,14 +955,14 @@ StarKnotHolderEntity1::knot_set(NR::Point const &p, NR::Point const &/*origin*/, } void -StarKnotHolderEntity2::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint state) +StarKnotHolderEntity2::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { SPStar *star = SP_STAR(item); - NR::Point const s = snap_knot_position(p); + Geom::Point const s = snap_knot_position(p); if (star->flatsided == false) { - NR::Point d = s - star->center; + Geom::Point d = s - to_2geom(star->center); double arg1 = atan2(d); double darg1 = arg1 - star->arg[1]; @@ -983,7 +983,7 @@ StarKnotHolderEntity2::knot_set(NR::Point const &p, NR::Point const &/*origin*/, } } -NR::Point +Geom::Point StarKnotHolderEntity1::knot_get() { g_assert(item != NULL); @@ -994,7 +994,7 @@ StarKnotHolderEntity1::knot_get() } -NR::Point +Geom::Point StarKnotHolderEntity2::knot_get() { g_assert(item != NULL); @@ -1059,15 +1059,15 @@ StarKnotHolder::StarKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolderRel class SpiralKnotHolderEntityInner : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); virtual void knot_click(guint state); }; class SpiralKnotHolderEntityOuter : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; @@ -1078,7 +1078,7 @@ public: * [control] constrain inner arg to round per PI/4 */ void -SpiralKnotHolderEntityInner::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint state) +SpiralKnotHolderEntityInner::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { int snaps = prefs_get_int_attribute("options.rotationsnapsperpi", "value", 12); @@ -1120,7 +1120,7 @@ SpiralKnotHolderEntityInner::knot_set(NR::Point const &p, NR::Point const &/*ori * [control] constrain inner arg to round per PI/4 */ void -SpiralKnotHolderEntityOuter::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint state) +SpiralKnotHolderEntityOuter::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) { int snaps = prefs_get_int_attribute("options.rotationsnapsperpi", "value", 12); @@ -1192,7 +1192,7 @@ SpiralKnotHolderEntityOuter::knot_set(NR::Point const &p, NR::Point const &/*ori ((SPObject *)spiral)->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); } -NR::Point +Geom::Point SpiralKnotHolderEntityInner::knot_get() { SPSpiral *spiral = SP_SPIRAL(item); @@ -1200,7 +1200,7 @@ SpiralKnotHolderEntityInner::knot_get() return sp_spiral_get_xy(spiral, spiral->t0); } -NR::Point +Geom::Point SpiralKnotHolderEntityOuter::knot_get() { SPSpiral *spiral = SP_SPIRAL(item); @@ -1243,12 +1243,12 @@ SpiralKnotHolder::SpiralKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolde class OffsetKnotHolderEntity : public KnotHolderEntity { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; void -OffsetKnotHolderEntity::knot_set(NR::Point const &p, NR::Point const &/*origin*/, guint /*state*/) +OffsetKnotHolderEntity::knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) { SPOffset *offset = SP_OFFSET(item); @@ -1260,12 +1260,12 @@ OffsetKnotHolderEntity::knot_set(NR::Point const &p, NR::Point const &/*origin*/ } -NR::Point +Geom::Point OffsetKnotHolderEntity::knot_get() { SPOffset *offset = SP_OFFSET(item); - NR::Point np; + Geom::Point np; sp_offset_top_point(offset,&np); return np; } @@ -1286,20 +1286,20 @@ OffsetKnotHolder::OffsetKnotHolder(SPDesktop *desktop, SPItem *item, SPKnotHolde // sense logically. class FlowtextKnotHolderEntity : public RectKnotHolderEntityWH { public: - virtual NR::Point knot_get(); - virtual void knot_set(NR::Point const &p, NR::Point const &origin, guint state); + virtual Geom::Point knot_get(); + virtual void knot_set(Geom::Point const &p, Geom::Point const &origin, guint state); }; -NR::Point +Geom::Point FlowtextKnotHolderEntity::knot_get() { SPRect *rect = SP_RECT(item); - return NR::Point(rect->x.computed + rect->width.computed, rect->y.computed + rect->height.computed); + return Geom::Point(rect->x.computed + rect->width.computed, rect->y.computed + rect->height.computed); } void -FlowtextKnotHolderEntity::knot_set(NR::Point const &p, NR::Point const &origin, guint state) +FlowtextKnotHolderEntity::knot_set(Geom::Point const &p, Geom::Point const &origin, guint state) { set_internal(p, origin, state); } -- cgit v1.2.3