remove more NR:: from live_effects code

diff --git a/src/live_effects/lpe-perp_bisector.h b/src/live_effects/lpe-perp_bisector.h
index 1544eb4ffa1d03613da5df6d8c9b0680985b51be..baa44082214f0649b653f944f45936cf882769a7 100644 (file)
--- a/src/live_effects/lpe-perp_bisector.h
+++ b/src/live_effects/lpe-perp_bisector.h
@@ -27,7 +27,7 @@ namespace PB {
   class KnotHolderEntityEnd;
   class KnotHolderEntityLeftEnd;
   class KnotHolderEntityRightEnd;
-  void bisector_end_set(SPItem *item, NR::Point const &p, bool left);
+  void bisector_end_set(SPItem *item, Geom::Point const &p, bool left);
 }
 
 class LPEPerpBisector : public Effect {
@@ -46,7 +46,7 @@ public:
     friend class PB::KnotHolderEntityEnd;
     friend class PB::KnotHolderEntityLeftEnd;
     friend class PB::KnotHolderEntityRightEnd;
-    friend void PB::bisector_end_set(SPItem *item, NR::Point const &p, bool left = true);
+    friend void PB::bisector_end_set(SPItem *item, Geom::Point const &p, bool left = true);
 
 private:
     ScalarParam length_left;

diff --git a/src/live_effects/lpe-perspective_path.cpp b/src/live_effects/lpe-perspective_path.cpp
index ff487f235a33054f4ccb5466fa809e10960c0a64..2eef0cd5b21b5cecb855150ec4424ae363865667 100644 (file)
--- a/src/live_effects/lpe-perspective_path.cpp
+++ b/src/live_effects/lpe-perspective_path.cpp
@@ -170,8 +170,8 @@ KnotHolderEntityOffset::knot_set(Geom::Point const &p, Geom::Point const &origin
 
     Geom::Point const s = snap_knot_position(p);
 
-    lpe->offsetx.param_set_value((s - origin)[NR::X]);
-    lpe->offsety.param_set_value(-(s - origin)[NR::Y]); // additional minus sign is due to coordinate system flipping
+    lpe->offsetx.param_set_value((s - origin)[Geom::X]);
+    lpe->offsety.param_set_value(-(s - origin)[Geom::Y]); // additional minus sign is due to coordinate system flipping
 
     // FIXME: this should not directly ask for updating the item. It should write to SVG, which triggers updating.
     sp_lpe_item_update_patheffect (SP_LPE_ITEM(item), false, true);

diff --git a/src/live_effects/lpe-spiro.cpp b/src/live_effects/lpe-spiro.cpp
index 276ed7b0b7ae1117da63b12b5030dc50ffde66ff..afa5dbc4d3f89d3ee469ff99f8c45d194a2bc6d3 100644 (file)
--- a/src/live_effects/lpe-spiro.cpp
+++ b/src/live_effects/lpe-spiro.cpp
@@ -50,9 +50,9 @@ void bezctx_ink_quadto(bezctx *bc, double xm, double ym, double x3, double y3)
     double x1, y1;
     double x2, y2;
 
-    NR::Point last = bi->curve->last_point();
-    x0 = last[NR::X];
-    y0 = last[NR::Y];
+    Geom::Point last = bi->curve->last_point();
+    x0 = last[Geom::X];
+    y0 = last[Geom::Y];
     x1 = xm + (1./3) * (x0 - xm);
     y1 = ym + (1./3) * (y0 - ym);
     x2 = xm + (1./3) * (x3 - xm);

diff --git a/src/live_effects/lpegroupbbox.cpp b/src/live_effects/lpegroupbbox.cpp
index e9cf050994ebec03c81d29d923adc241ac72acfc..2ea839892c0673c5209da7d13db22cf8112a490b 100644 (file)
--- a/src/live_effects/lpegroupbbox.cpp
+++ b/src/live_effects/lpegroupbbox.cpp
@@ -21,15 +21,15 @@ GroupBBoxEffect::original_bbox(SPLPEItem *lpeitem, bool absolute)
     // Get item bounding box
     SPItem* item = SP_ITEM(lpeitem);
     
-    NR::Matrix transform;
+    Geom::Matrix transform;
     if (absolute) {
-        transform = from_2geom(sp_item_i2doc_affine(item));
+        transform = sp_item_i2doc_affine(item);
     }
     else {
-        transform = NR::identity();
+        transform = Geom::identity();
     }
     
-    NR::Maybe<NR::Rect> itemBBox = item->getBounds(transform, SPItem::GEOMETRIC_BBOX);
+    NR::Maybe<NR::Rect> itemBBox = item->getBounds(from_2geom(transform), SPItem::GEOMETRIC_BBOX);
 
     // NR to Geom glue
     Geom::Rect geomBBox = Geom::Rect(itemBBox->min(), itemBBox->max());

diff --git a/src/live_effects/parameter/pointparam-knotholder.h b/src/live_effects/parameter/pointparam-knotholder.h
index cb5be0d8d683048ad9270a1e742b9843b93b9b8a..f6dfdead5207c9589bfc4ba5b336675cbf19034e 100644 (file)
--- a/src/live_effects/parameter/pointparam-knotholder.h
+++ b/src/live_effects/parameter/pointparam-knotholder.h
@@ -28,8 +28,8 @@ class Node;
 
 
 
-typedef void (* PointParamKnotHolderSetFunc) (SPItem *item, NR::Point const &p, NR::Point const &origin, guint state);
-typedef NR::Point (* PointParamKnotHolderGetFunc) (SPItem *item);
+typedef void (* PointParamKnotHolderSetFunc) (SPItem *item, Geom::Point const &p, Geom::Point const &origin, guint state);
+typedef Geom::Point (* PointParamKnotHolderGetFunc) (SPItem *item);
 typedef void (* PointParamKnotHolderClickedFunc) (SPItem *item, guint state);
 
 class PointParamKnotHolder : public KnotHolder {