Remove obsolete includes of libnr files in the snapping code

diff --git a/src/guide-snapper.cpp b/src/guide-snapper.cpp
index 7ee35255f85137ed00c1de4ec48b8b05375e950d..3a9a861e53de4e674458217143c03e299f061196 100644 (file)
--- a/src/guide-snapper.cpp
+++ b/src/guide-snapper.cpp
@@ -12,8 +12,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "libnr/nr-values.h"
-#include "libnr/nr-point-fns.h"
 #include "sp-namedview.h"
 #include "desktop.h"
 #include "sp-guide.h"

diff --git a/src/guide-snapper.h b/src/guide-snapper.h
index 239e8b050ed69977f6d9880bf61d56ccb409519a..f9f433bf45419ce7d0d49a1f421ef9fd85cb9e6a 100644 (file)
--- a/src/guide-snapper.h
+++ b/src/guide-snapper.h
@@ -15,8 +15,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "libnr/nr-forward.h"
-#include "libnr/nr-coord.h"
 #include "line-snapper.h"
 
 struct SPNamedView;

diff --git a/src/line-snapper.cpp b/src/line-snapper.cpp
index dee944afdf91f2b20d1a5532ce00997fbab59ec5..a18fb8518bb7a0c82b299c040f43af45f0a005a1 100644 (file)
--- a/src/line-snapper.cpp
+++ b/src/line-snapper.cpp
@@ -11,8 +11,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "libnr/nr-values.h"
-#include "libnr/nr-point-fns.h"
 #include <2geom/geom.h>
 #include "line-snapper.h"
 #include "snapped-line.h"

diff --git a/src/object-snapper.cpp b/src/object-snapper.cpp
index 9a7053c4ce44b8a82da388908a3e8b01da0c099f..b02b9786af7d12e00c4bc060febbdc55b7527daa 100644 (file)
--- a/src/object-snapper.cpp
+++ b/src/object-snapper.cpp
@@ -12,8 +12,6 @@
  */
 
 #include "svg/svg.h"
-#include "libnr/nr-rect-ops.h"
-#include "libnr/nr-point-fns.h"
 #include <2geom/path-intersection.h>
 #include <2geom/point.h>
 #include <2geom/rect.h>

diff --git a/src/snap.cpp b/src/snap.cpp
index 130742483313d09eb4c2148ef98cdcf2a9708231..a22f25ab0afe01bfd85c2961dae0d5a39f77fff0 100644 (file)
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -25,10 +25,6 @@
 #include "snapped-line.h"
 #include "snapped-curve.h"
 
-#include <libnr/nr-point-fns.h>
-#include <libnr/nr-scale-ops.h>
-#include <libnr/nr-values.h>
-
 #include "display/canvas-grid.h"
 #include "display/snap-indicator.h"
 

diff --git a/src/snap.h b/src/snap.h
index eba18f5deae5ce6e926672d85c76b43b860be3b4..ac314c66d2d4da16483529c731ba1fa2a7e951af 100644 (file)
--- a/src/snap.h
+++ b/src/snap.h
@@ -20,11 +20,6 @@
 
 #include <vector>
 
-#include <libnr/nr-coord.h>
-#include <libnr/nr-dim2.h>
-#include <libnr/nr-forward.h>
-#include <libnr/nr-scale.h>
-
 #include "guide-snapper.h"
 #include "object-snapper.h"
 #include "snap-preferences.h"

diff --git a/src/snapped-curve.cpp b/src/snapped-curve.cpp
index e66b44401fca7d8717d61d4e0e1e3a68077e17e6..4da2d4c7d5601aaf8699bcb23249f8b5a58501ca 100644 (file)
--- a/src/snapped-curve.cpp
+++ b/src/snapped-curve.cpp
@@ -9,10 +9,8 @@
  */
 
 #include "snapped-curve.h"
-#include "libnr/nr-values.h"
 #include <2geom/crossing.h>
 #include <2geom/path-intersection.h>
-#include <libnr/nr-convert2geom.h>
 
 Inkscape::SnappedCurve::SnappedCurve(Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, Geom::Coord const &snapped_tolerance, bool const &always_snap, bool const &fully_constrained, Geom::Curve const *curve, SnapSourceType source, SnapTargetType target)
 {

diff --git a/src/snapped-curve.h b/src/snapped-curve.h
index 60f5fa0d98329fdad3566616425bb57df310bc4e..0a1fe243134760a08997b7ea21416a8b91a94ce1 100644 (file)
--- a/src/snapped-curve.h
+++ b/src/snapped-curve.h
@@ -13,9 +13,6 @@
 
 #include <vector>
 #include <list>
-#include "libnr/nr-coord.h"
-#include "libnr/nr-point.h"
-#include <libnr/nr-point-fns.h>
 #include "snapped-point.h"
 #include <2geom/forward.h>
 

diff --git a/src/snapped-line.cpp b/src/snapped-line.cpp
index 70689367339c4e141e846fd65a1349a1ab7f89b0..27e024821e418ddbdcaf9dfc6c66b4a656a722e7 100644 (file)
--- a/src/snapped-line.cpp
+++ b/src/snapped-line.cpp
@@ -10,7 +10,6 @@
 
 #include "snapped-line.h"
 #include <2geom/geom.h>
-#include "libnr/nr-values.h"
 
 Inkscape::SnappedLineSegment::SnappedLineSegment(Geom::Point const &snapped_point, Geom::Coord const &snapped_distance, SnapSourceType const &source, SnapTargetType const &target, Geom::Coord const &snapped_tolerance, bool const &always_snap, Geom::Point const &start_point_of_line, Geom::Point const &end_point_of_line)
     : _start_point_of_line(start_point_of_line), _end_point_of_line(end_point_of_line)

diff --git a/src/snapped-line.h b/src/snapped-line.h
index 3d666831107f311e9367aa47e1989bed2c809fb9..85bbf1caa58b283057a1c90244fcae585ede9be6 100644 (file)
--- a/src/snapped-line.h
+++ b/src/snapped-line.h
@@ -13,9 +13,6 @@
 
 #include <vector>
 #include <list>
-#include "libnr/nr-coord.h"
-#include "libnr/nr-point.h"
-#include <libnr/nr-point-fns.h>
 #include "snapped-point.h"
 
 namespace Inkscape

diff --git a/src/snapped-point.h b/src/snapped-point.h
index 4f27c3be09a9766e4569d372665ffb4608cb4314..cc224452de756a092bbe7f4a5d30625c61b2f7b7 100644 (file)
--- a/src/snapped-point.h
+++ b/src/snapped-point.h
@@ -14,9 +14,8 @@
 
 #include <vector>
 #include <list>
-#include "libnr/nr-coord.h"
-#include "libnr/nr-point.h"
-#include <libnr/nr-values.h>
+#include <libnr/nr-values.h> //Because of NR_HUGE
+#include <2geom/geom.h>
 
 namespace Inkscape
 {

diff --git a/src/snapper.cpp b/src/snapper.cpp
index 7e08c22ef7a71d8d2c77b154252da9068548c039..2c646f4d64751bddf93023b6a303af95c9d05a8d 100644 (file)
--- a/src/snapper.cpp
+++ b/src/snapper.cpp
@@ -9,7 +9,6 @@
  *  Released under GNU GPL, read the file 'COPYING' for more information.
  */
 
-#include "libnr/nr-values.h"
 #include "sp-namedview.h"
 #include "inkscape.h"
 #include "desktop.h"

diff --git a/src/snapper.h b/src/snapper.h
index 08b10e41b30676f6ca390bd57ae898cab09902e6..0110a9154a92d399d2f8c689e96c594373ed49c3 100644 (file)
--- a/src/snapper.h
+++ b/src/snapper.h
@@ -14,8 +14,6 @@
 
 #include <map>
 #include <list>
-#include "libnr/nr-coord.h"
-#include "libnr/nr-point.h"
 #include <boost/optional.hpp>
 
 #include "snapped-point.h"