Warning cleanup.

[inkscape.git] / src / sp-guide.h

diff --git a/src/sp-guide.h b/src/sp-guide.h
index a9b04dfaa99b10195df611e4b76f19798905d1a9..593e4583f57af9041bd4f9f012974626892be068 100644 (file)
--- 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;
@@ -46,13 +46,14 @@ struct SPGuideClass {
 GType sp_guide_get_type();
 
 SPGuide *sp_guide_create(SPDesktop *desktop, Geom::Point const &pt1, Geom::Point const &pt2);
-void sp_guide_pt_pairs_to_guides(SPDocument *doc, std::list<std::pair<Geom::Point, Geom::Point> > &pts);
+void sp_guide_pt_pairs_to_guides(SPDesktop *dt, std::list<std::pair<Geom::Point, Geom::Point> > &pts);
+void sp_guide_create_guides_around_page(SPDesktop *dt);
 
 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);