Remove nr-forward.h

(bzr r10582.1.8)

12 files changed, 3 insertions, 62 deletions

diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h
index 4a01a3e84..a09f7c863 100644
--- a/src/extension/implementation/implementation.h
+++ b/src/extension/implementation/implementation.h
@@ -18,7 +18,6 @@
 
 #include "forward.h"
 #include "extension/extension-forward.h"
-#include "libnr/nr-forward.h"
 #include "xml/node.h"
 #include <2geom/forward.h>
 #include <2geom/point.h>
diff --git a/src/gradient-drag.h b/src/gradient-drag.h
index 40ab065ca..4ad9a1e16 100644
--- a/src/gradient-drag.h
+++ b/src/gradient-drag.h
@@ -20,7 +20,6 @@
 #include <vector>
 
 #include <forward.h>
-#include <libnr/nr-forward.h>
 #include <2geom/point.h>
 #include <knot-enums.h>
 
diff --git a/src/knotholder.h b/src/knotholder.h
index 76142ed98..0dd3bba1e 100644
--- a/src/knotholder.h
+++ b/src/knotholder.h
@@ -20,7 +20,6 @@
 #include <glib/gtypes.h>
 #include "knot-enums.h"
 #include "forward.h"
-#include "libnr/nr-forward.h"
 #include <2geom/forward.h>
 #include "knot-holder-entity.h"
 #include <list>
diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt
index 8a31e20db..0adea96f0 100644
--- a/src/libnr/CMakeLists.txt
+++ b/src/libnr/CMakeLists.txt
@@ -1,32 +1,14 @@
 
 set(nr_SRC
-	# in-svg-plane-test.cpp
 	nr-object.cpp
 	nr-point-fns.cpp
-	# nr-point-fns-test.cpp
-	nr-rect.cpp
-	nr-rect-l.cpp
-	# nr-rotate-fns-test.cpp
-	#nr-translate-test.cpp
-	# nr-types-test.cpp
 	nr-values.cpp
-	# testnr.cpp
-
 
 	# -------
 	# Headers
-	# in-svg-plane-test.h
-	in-svg-plane.h
-	nr-convert2geom.h
-	nr-forward.h
 	nr-macros.h
 	nr-object.h
-	# nr-point-fns-test.h
 	nr-point-fns.h
-	nr-rect-l.h
-	nr-rect.h
-	# nr-translate-test.h
-	# nr-types-test.h
 	nr-values.h
 )
 
diff --git a/src/libnr/Makefile_insert b/src/libnr/Makefile_insert
index 6156a45e3..c4b6daa12 100644
--- a/src/libnr/Makefile_insert
+++ b/src/libnr/Makefile_insert
@@ -1,7 +1,6 @@
 ## Makefile.am fragment sourced by src/Makefile.am.
 
 ink_common_sources +=	\
-	libnr/nr-forward.h	\
 	libnr/nr-macros.h	\
 	libnr/nr-object.cpp	\
 	libnr/nr-object.h	\
diff --git a/src/libnr/nr-forward.h b/src/libnr/nr-forward.h
deleted file mode 100644
index 4895ad407..000000000
--- a/src/libnr/nr-forward.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __NR_FORWARD_H__
-#define __NR_FORWARD_H__
-
-/*
- * Pixel buffer rendering library
- *
- * Authors:
- *   Lauris Kaplinski <lauris@kaplinski.com>
- *
- * This code is in public domain
- */
-
-struct NRPixBlock;
-struct NRRect;
-struct NRRectL;
-
-#endif
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/sp-clippath.h b/src/sp-clippath.h
index c151851d3..4084b89d8 100644
--- a/src/sp-clippath.h
+++ b/src/sp-clippath.h
@@ -24,7 +24,6 @@
 class SPClipPathView;
 
 #include "display/display-forward.h"
-#include "libnr/nr-forward.h"
 #include "sp-object-group.h"
 #include "uri-references.h"
 #include "xml/node.h"
diff --git a/src/sp-mask.h b/src/sp-mask.h
index d493c2dc7..10b42ca1e 100644
--- a/src/sp-mask.h
+++ b/src/sp-mask.h
@@ -15,7 +15,6 @@
 
 #include <2geom/rect.h>
 #include "display/display-forward.h"
-#include "libnr/nr-forward.h"
 #include "sp-object-group.h"
 #include "uri-references.h"
 #include "xml/node.h"
diff --git a/src/svg/svg.h b/src/svg/svg.h
index d5335e1b4..de1d7d872 100644
--- a/src/svg/svg.h
+++ b/src/svg/svg.h
@@ -17,7 +17,6 @@
 #include <string>
 
 #include "svg/svg-length.h"
-#include "libnr/nr-forward.h"
 #include <2geom/forward.h>
 
 /* Generic */
diff --git a/src/text-editing.h b/src/text-editing.h
index 529b25ff5..300d0b76f 100644
--- a/src/text-editing.h
+++ b/src/text-editing.h
@@ -16,7 +16,6 @@
 #include <glib/gtypes.h>
 #include <utility>   // std::pair
 #include "libnrtype/Layout-TNG.h"
-#include <libnr/nr-forward.h>
 #include "text-tag-attributes.h"
 
 class SPCSSAttr;
diff --git a/src/ui/view/view.h b/src/ui/view/view.h
index db6061434..c56d79147 100644
--- a/src/ui/view/view.h
+++ b/src/ui/view/view.h
@@ -21,7 +21,6 @@
 #include "gc-managed.h"
 #include "gc-finalized.h"
 #include "gc-anchored.h"
-#include <libnr/nr-forward.h>
 #include <2geom/forward.h>
 
 /**
diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h
index ebcac380f..f32c2c83d 100644
--- a/src/widgets/paint-selector.h
+++ b/src/widgets/paint-selector.h
@@ -14,8 +14,11 @@
  */
 
 #include <glib.h>
+#include <gtk/gtk.h>
 
+#include "color.h"
 #include "fill-or-stroke.h"
+#include "forward.h"
 #include "sp-gradient-spread.h"
 #include "sp-gradient-units.h"
 
@@ -27,13 +30,6 @@ class SPGradient;
 #define SP_IS_PAINT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_PAINT_SELECTOR))
 #define SP_IS_PAINT_SELECTOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), SP_TYPE_PAINT_SELECTOR))
 
-#include <gtk/gtk.h>
-
-#include "../forward.h"
-#include <color.h>
-#include <libnr/nr-forward.h>
-
-
 /// Generic paint selector widget
 struct SPPaintSelector {
     GtkVBox vbox;