Completely remove NRRect, NRRectL, in-svg-plane.h

(bzr r10582.1.6)

21 files changed, 10 insertions, 27 deletions

diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index c0dabcc07..9ea06ec2d 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -744,13 +744,13 @@ CanvasAxonomGridSnapper::_getSnapLines(Geom::Point const &p) const
     if (use_left_half) {
         s.push_back(std::make_pair(norm_z, Geom::Point(grid->origin[Geom::X], y_proj_along_z_max)));
         s.push_back(std::make_pair(norm_x, Geom::Point(grid->origin[Geom::X], y_proj_along_x_min)));
-        s.push_back(std::make_pair(component_vectors[Geom::X], Geom::Point(x_max, 0)));
+        s.push_back(std::make_pair(Geom::Point(1, 0), Geom::Point(x_max, 0)));
     }
 
     if (use_right_half) {
         s.push_back(std::make_pair(norm_z, Geom::Point(grid->origin[Geom::X], y_proj_along_z_min)));
         s.push_back(std::make_pair(norm_x, Geom::Point(grid->origin[Geom::X], y_proj_along_x_max)));
-        s.push_back(std::make_pair(component_vectors[Geom::X], Geom::Point(x_min, 0)));
+        s.push_back(std::make_pair(Geom::Point(1, 0), Geom::Point(x_min, 0)));
     }
 
     return s;
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 38fe69628..bdf0d6fb0 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -993,14 +993,16 @@ CanvasXYGridSnapper::_getSnapLines(Geom::Point const &p) const
 
         Geom::Coord rounded;
         Geom::Point point_on_line;
+        Geom::Point cvec(0.,0.);
+        cvec[i] = 1.;
 
         rounded = Inkscape::Util::round_to_upper_multiple_plus(p[i], spacing, grid->origin[i]);
         point_on_line = i ? Geom::Point(0, rounded) : Geom::Point(rounded, 0);
-        s.push_back(std::make_pair(component_vectors[i], point_on_line));
+        s.push_back(std::make_pair(cvec, point_on_line));
 
         rounded = Inkscape::Util::round_to_lower_multiple_plus(p[i], spacing, grid->origin[i]);
         point_on_line = i ? Geom::Point(0, rounded) : Geom::Point(rounded, 0);
-        s.push_back(std::make_pair(component_vectors[i], point_on_line));
+        s.push_back(std::make_pair(cvec, point_on_line));
     }
 
     return s;
diff --git a/src/display/drawing-group.cpp b/src/display/drawing-group.cpp
index a678c3feb..998c4b6e4 100644
--- a/src/display/drawing-group.cpp
+++ b/src/display/drawing-group.cpp
@@ -14,7 +14,6 @@
 #include "display/drawing-context.h"
 #include "display/drawing-item.h"
 #include "display/drawing-group.h"
-#include "libnr/nr-values.h"
 #include "style.h"
 
 namespace Inkscape {
@@ -58,7 +57,7 @@ DrawingGroup::setChildTransform(Geom::Affine const &new_trans)
         current = *_child_transform;
     }
 
-    if (!Geom::are_near(current, new_trans, NR_EPSILON)) {
+    if (!Geom::are_near(current, new_trans, 1e-18)) {
         // mark the area where the object was for redraw.
         _markForRendering();
         if (new_trans.isIdentity()) {
diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp
index a5496e999..3fe56b6de 100644
--- a/src/display/drawing-item.cpp
+++ b/src/display/drawing-item.cpp
@@ -176,7 +176,7 @@ DrawingItem::setTransform(Geom::Affine const &new_trans)
         current = *_transform;
     }
     
-    if (!Geom::are_near(current, new_trans, NR_EPSILON)) {
+    if (!Geom::are_near(current, new_trans, 1e-18)) {
         // mark the area where the object was for redraw.
         _markForRendering();
         if (new_trans.isIdentity()) {
@@ -456,7 +456,7 @@ DrawingItem::render(DrawingContext &ct, Geom::IntRect const &area, unsigned flag
 
     // If we are invisible, return immediately
     if (!_visible) return RENDER_OK;
-    if (_ctm.isSingular(NR_EPSILON)) return RENDER_OK;
+    if (_ctm.isSingular(1e-18)) return RENDER_OK;
 
     // TODO convert outline rendering to a separate virtual function
     if (outline) {
diff --git a/src/display/drawing-shape.cpp b/src/display/drawing-shape.cpp
index ac0ff2ccb..6e28c0184 100644
--- a/src/display/drawing-shape.cpp
+++ b/src/display/drawing-shape.cpp
@@ -25,7 +25,6 @@
 #include "display/drawing-shape.h"
 #include "helper/geom-curves.h"
 #include "helper/geom.h"
-#include "libnr/nr-convert2geom.h"
 #include "preferences.h"
 #include "style.h"
 #include "svg/svg.h"
diff --git a/src/display/nr-filter-convolve-matrix.h b/src/display/nr-filter-convolve-matrix.h
index c37fe721f..4041ff96f 100644
--- a/src/display/nr-filter-convolve-matrix.h
+++ b/src/display/nr-filter-convolve-matrix.h
@@ -13,7 +13,6 @@
  */
 
 #include "display/nr-filter-primitive.h"
-#include "libnr/nr-rect-l.h"
 #include <vector>
 
 namespace Inkscape {
diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp
index c94df2d70..9df771879 100644
--- a/src/display/nr-filter-diffuselighting.cpp
+++ b/src/display/nr-filter-diffuselighting.cpp
@@ -21,7 +21,6 @@
 #include "display/nr-filter-units.h"
 #include "display/nr-filter-utils.h"
 #include "display/nr-light.h"
-#include "libnr/nr-rect-l.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-displacement-map.h b/src/display/nr-filter-displacement-map.h
index e4228323a..a01930045 100644
--- a/src/display/nr-filter-displacement-map.h
+++ b/src/display/nr-filter-displacement-map.h
@@ -16,7 +16,6 @@
 #include "display/nr-filter-primitive.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
-#include "libnr/nr-rect-l.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index 5911f5908..8b2161425 100644
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -19,7 +19,6 @@
 #include "display/nr-filter.h"
 #include "display/nr-filter-image.h"
 #include "display/nr-filter-units.h"
-#include "libnr/nr-rect-l.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-offset.cpp b/src/display/nr-filter-offset.cpp
index da46095ef..833f6ecc9 100644
--- a/src/display/nr-filter-offset.cpp
+++ b/src/display/nr-filter-offset.cpp
@@ -13,7 +13,6 @@
 #include "display/nr-filter-offset.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
-#include "libnr/nr-rect-l.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-offset.h b/src/display/nr-filter-offset.h
index 5551131f0..1ecc1621e 100644
--- a/src/display/nr-filter-offset.h
+++ b/src/display/nr-filter-offset.h
@@ -15,7 +15,6 @@
 #include "display/nr-filter-primitive.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
-#include "libnr/nr-rect-l.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp
index ddb0c06eb..0530e38cb 100644
--- a/src/display/nr-filter-specularlighting.cpp
+++ b/src/display/nr-filter-specularlighting.cpp
@@ -21,7 +21,6 @@
 #include "display/nr-filter-units.h"
 #include "display/nr-filter-utils.h"
 #include "display/nr-light.h"
-#include "libnr/nr-rect-l.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-tile.cpp b/src/display/nr-filter-tile.cpp
index 6680e7a46..93ca50210 100644
--- a/src/display/nr-filter-tile.cpp
+++ b/src/display/nr-filter-tile.cpp
@@ -9,6 +9,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <glib.h>
 #include "display/nr-filter-tile.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp
index f065ded11..7e47c3bd9 100644
--- a/src/display/nr-filter-turbulence.cpp
+++ b/src/display/nr-filter-turbulence.cpp
@@ -23,7 +23,6 @@
 #include "display/nr-filter-turbulence.h"
 #include "display/nr-filter-units.h"
 #include "display/nr-filter-utils.h"
-#include "libnr/nr-rect-l.h"
 #include <math.h>
 
 namespace Inkscape {
diff --git a/src/display/nr-filter-turbulence.h b/src/display/nr-filter-turbulence.h
index 0b451d355..360853364 100644
--- a/src/display/nr-filter-turbulence.h
+++ b/src/display/nr-filter-turbulence.h
@@ -25,7 +25,6 @@
 #include "display/nr-filter-primitive.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
-#include "libnr/nr-rect-l.h"
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-units.cpp b/src/display/nr-filter-units.cpp
index baf4af45d..369deeb00 100644
--- a/src/display/nr-filter-units.cpp
+++ b/src/display/nr-filter-units.cpp
@@ -12,7 +12,6 @@
 #include <glib.h>
 
 #include "display/nr-filter-units.h"
-#include "libnr/nr-rect-l.h"
 #include "sp-filter-units.h"
 #include <2geom/transforms.h>
 
diff --git a/src/display/nr-filter-units.h b/src/display/nr-filter-units.h
index 1cb4fdbce..f918cf12e 100644
--- a/src/display/nr-filter-units.h
+++ b/src/display/nr-filter-units.h
@@ -13,7 +13,6 @@
  */
 
 #include "sp-filter-units.h"
-#include "libnr/nr-rect-l.h"
 #include <2geom/affine.h>
 #include <2geom/rect.h>
 
diff --git a/src/display/nr-filter.h b/src/display/nr-filter.h
index 32e1df60b..d53005c5d 100644
--- a/src/display/nr-filter.h
+++ b/src/display/nr-filter.h
@@ -16,7 +16,6 @@
 #include <cairo.h>
 #include "display/nr-filter-primitive.h"
 #include "display/nr-filter-types.h"
-#include "libnr/nr-rect.h"
 #include "svg/svg-length.h"
 #include "sp-filter-units.h"
 #include "gc-managed.h"
diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp
index 9db52ea7e..6e8ccb030 100644
--- a/src/display/nr-style.cpp
+++ b/src/display/nr-style.cpp
@@ -14,7 +14,6 @@
 #include "sp-paint-server.h"
 #include "display/canvas-bpath.h" // contains SPStrokeJoinType, SPStrokeCapType etc. (WTF!)
 #include "display/drawing-context.h"
-#include "libnr/nr-rect.h"
 
 void NRStyle::Paint::clear()
 {
diff --git a/src/display/sodipodi-ctrl.h b/src/display/sodipodi-ctrl.h
index 88cae28fd..2617e7db2 100644
--- a/src/display/sodipodi-ctrl.h
+++ b/src/display/sodipodi-ctrl.h
@@ -9,7 +9,6 @@
 
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libnr/nr-rect-l.h>
 #include "sp-canvas-item.h"
 
 
diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h
index 9e716b69c..bffa5e4e9 100644
--- a/src/display/sp-canvas.h
+++ b/src/display/sp-canvas.h
@@ -30,12 +30,8 @@
 #include <glib/gtypes.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-
 #include <glibmm/ustring.h>
-
 #include <2geom/affine.h>
-#include <libnr/nr-rect-l.h>
-
 #include <2geom/rect.h>
 
 G_BEGIN_DECLS