More NR ==> Geom changes

(bzr r7032)

1 files changed, 29 insertions, 29 deletions

diff --git a/src/livarot/path-description.h b/src/livarot/path-description.h
index ccb4506f0..27521e4b8 100644
--- a/src/livarot/path-description.h
+++ b/src/livarot/path-description.h
@@ -35,9 +35,9 @@ struct PathDescr
     flags |= t;
   }
 
-    virtual void dumpSVG(Inkscape::SVGOStringStream &/*s*/, NR::Point const &/*last*/) const {}
+    virtual void dumpSVG(Inkscape::SVGOStringStream &/*s*/, Geom::Point const &/*last*/) const {}
     virtual PathDescr *clone() const = 0;
-    virtual void transform(NR::Matrix const &/*t*/) {}
+    virtual void transform(Geom::Matrix const &/*t*/) {}
     virtual void dump(std::ostream &/*s*/) const {}
 
   int    flags;         // most notably contains the path command no
@@ -48,41 +48,41 @@ struct PathDescr
 
 struct PathDescrMoveTo : public PathDescr
 {
-  PathDescrMoveTo(NR::Point const &pp)
+  PathDescrMoveTo(Geom::Point const &pp)
       : PathDescr(descr_moveto), p(pp) {}
 
-  void dumpSVG(Inkscape::SVGOStringStream &s, NR::Point const &last) const;
+  void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const;
   PathDescr *clone() const;
-  void transform(NR::Matrix const &t);
+  void transform(Geom::Matrix const &t);
   void dump(std::ostream &s) const;
 
-  NR::Point p;
+  Geom::Point p;
 };
 
 struct PathDescrLineTo : public PathDescr
 {
-  PathDescrLineTo(NR::Point const &pp)
+  PathDescrLineTo(Geom::Point const &pp)
     : PathDescr(descr_lineto), p(pp) {}
 
-  void dumpSVG(Inkscape::SVGOStringStream &s, NR::Point const &last) const;
+  void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const;
   PathDescr *clone() const;
-  void transform(NR::Matrix const &t);
+  void transform(Geom::Matrix const &t);
   void dump(std::ostream &s) const;
 
-  NR::Point p;
+  Geom::Point p;
 };
 
 // quadratic bezier curves: a set of control points, and an endpoint
 struct PathDescrBezierTo : public PathDescr
 {
-  PathDescrBezierTo(NR::Point const &pp, int n)
+  PathDescrBezierTo(Geom::Point const &pp, int n)
     : PathDescr(descr_bezierto), p(pp), nb(n) {}
 
   PathDescr *clone() const;
-  void transform(NR::Matrix const &t);
+  void transform(Geom::Matrix const &t);
   void dump(std::ostream &s) const;
 
-  NR::Point p;        // the endpoint's coordinates
+  Geom::Point p;        // the endpoint's coordinates
   int nb;             // number of control points, stored in the next path description commands
 };
 
@@ -91,44 +91,44 @@ struct PathDescrIntermBezierTo : public PathDescr
 {
   PathDescrIntermBezierTo()
     : PathDescr(descr_interm_bezier) , p(0, 0) {}
-  PathDescrIntermBezierTo(NR::Point const &pp)
+  PathDescrIntermBezierTo(Geom::Point const &pp)
     : PathDescr(descr_interm_bezier), p(pp) {}
 
   PathDescr *clone() const;
-  void transform(NR::Matrix const &t);
+  void transform(Geom::Matrix const &t);
   void dump(std::ostream &s) const;
 
-  NR::Point p;                  // control point coordinates
+  Geom::Point p;                  // control point coordinates
 };
 
 // cubic spline curve: 2 tangents and one endpoint
 struct PathDescrCubicTo : public PathDescr
 {
-  PathDescrCubicTo(NR::Point const &pp, NR::Point const &s, NR::Point const& e)
+  PathDescrCubicTo(Geom::Point const &pp, Geom::Point const &s, Geom::Point const& e)
     : PathDescr(descr_cubicto), p(pp), start(s), end(e) {}
 
-  void dumpSVG(Inkscape::SVGOStringStream &s, NR::Point const &last) const;
+  void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const;
   PathDescr *clone() const;
-  void transform(NR::Matrix const &t);
+  void transform(Geom::Matrix const &t);
   void dump(std::ostream &s) const;
 
-  NR::Point p;
-  NR::Point start;
-  NR::Point end;
+  Geom::Point p;
+  Geom::Point start;
+  Geom::Point end;
 };
 
 // arc: endpoint, 2 radii and one angle, plus 2 booleans to choose the arc (svg style)
 struct PathDescrArcTo : public PathDescr
 {
-  PathDescrArcTo(NR::Point const &pp, double x, double y, double a, bool l, bool c)
+  PathDescrArcTo(Geom::Point const &pp, double x, double y, double a, bool l, bool c)
     : PathDescr(descr_arcto), p(pp), rx(x), ry(y), angle(a), large(l), clockwise(c) {}
 
-  void dumpSVG(Inkscape::SVGOStringStream &s, NR::Point const &last) const;
+  void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const;
   PathDescr *clone() const;
-  void transform(NR::Matrix const &t);
+  void transform(Geom::Matrix const &t);
   void dump(std::ostream &s) const;
 
-  NR::Point p;
+  Geom::Point p;
   double rx;
   double ry;
   double angle;
@@ -145,20 +145,20 @@ struct PathDescrForced : public PathDescr
   /* FIXME: not sure whether _forced should have a point associated with it;
   ** Path::ConvertForcedToMoveTo suggests that maybe it should.
   */
-  NR::Point p;
+  Geom::Point p;
 };
 
 struct PathDescrClose : public PathDescr
 {
   PathDescrClose() : PathDescr(descr_close) {}
 
-  void dumpSVG(Inkscape::SVGOStringStream &s, NR::Point const &last) const;
+  void dumpSVG(Inkscape::SVGOStringStream &s, Geom::Point const &last) const;
   PathDescr *clone() const;
 
   /* FIXME: not sure whether _forced should have a point associated with it;
   ** Path::ConvertForcedToMoveTo suggests that maybe it should.
   */
-  NR::Point p;
+  Geom::Point p;
 };
 
 #endif