Merging from trunk

[inkscape.git] / src / satisfied-guide-cns.h

diff --git a/src/satisfied-guide-cns.h b/src/satisfied-guide-cns.h
index eeadf48cd11adec979c13477be5fb877645321dc..1952bef448402906bfa0eddd2002a5c1d12a3f25 100644 (file)
--- a/src/satisfied-guide-cns.h
+++ b/src/satisfied-guide-cns.h
@@ -2,12 +2,12 @@
 #define __SATISFIED_GUIDE_CNS_H__
 
 #include <forward.h>
-#include <libnr/nr-forward.h>
+#include <2geom/forward.h>
 #include <vector>
 class SPGuideConstraint;
 
 void satisfied_guide_cns(SPDesktop const &desktop,
-                         std::vector<NR::Point> const &snappoints,
+                         std::vector<Geom::Point> const &snappoints,
                          std::vector<SPGuideConstraint> &cns);