diff options
| author | Ted Gould <ted@gould.cx> | 2008-10-27 18:03:09 +0000 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2008-10-27 18:03:09 +0000 |
| commit | 7dbe11bc23efa5f51a9b84e7d0f6dd16e63e0902 (patch) | |
| tree | 7d3a2b95b84a03a19cb132cdf88bea0ab6dc4773 /src/sp-guide.h | |
| parent | Merging from trunk (diff) | |
| download | inkscape-7dbe11bc23efa5f51a9b84e7d0f6dd16e63e0902.tar.gz inkscape-7dbe11bc23efa5f51a9b84e7d0f6dd16e63e0902.zip | |
From trunk
(bzr r6885)
Diffstat (limited to 'src/sp-guide.h')
| -rw-r--r-- | src/sp-guide.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sp-guide.h b/src/sp-guide.h index 78c795f83..593e4583f 100644 --- a/src/sp-guide.h +++ b/src/sp-guide.h @@ -14,7 +14,7 @@ #include <vector> #include "display/display-forward.h" -#include "libnr/nr-point.h" +#include <2geom/point.h> #include "sp-object.h" #include "sp-guide-attachment.h" @@ -26,7 +26,7 @@ /* Represents the constraint on p that dot(g.direction, p) == g.position. */ struct SPGuide : public SPObject { - NR::Point normal_to_line; + Geom::Point normal_to_line; Geom::Point point_on_line; guint32 color; @@ -53,7 +53,7 @@ void sp_guide_show(SPGuide *guide, SPCanvasGroup *group, GCallback handler); void sp_guide_hide(SPGuide *guide, SPCanvas *canvas); void sp_guide_sensitize(SPGuide *guide, SPCanvas *canvas, gboolean sensitive); -Geom::Point sp_guide_position_from_pt(SPGuide const *guide, NR::Point const &pt); +Geom::Point sp_guide_position_from_pt(SPGuide const *guide, Geom::Point const &pt); double sp_guide_distance_from_pt(SPGuide const *guide, Geom::Point const &pt); void sp_guide_moveto(SPGuide const &guide, Geom::Point const point_on_line, bool const commit); void sp_guide_set_normal(SPGuide const &guide, Geom::Point const normal_to_line, bool const commit); |