Move classes derived from SPObject to own directory.

A lot of header clean-up.

15 files changed, 29 insertions, 30 deletions

diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp
index c94cb45ae..c640de13b 100644
--- a/src/display/cairo-utils.cpp
+++ b/src/display/cairo-utils.cpp
@@ -32,7 +32,6 @@
 #include <boost/optional/optional.hpp>
 
 #include "color.h"
-#include "style.h"
 #include "cairo-templates.h"
 
 /**
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index 187597794..bc094ff5a 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -35,9 +35,9 @@
 #include "document.h"
 #include "inkscape.h"
 #include "preferences.h"
-#include "sp-namedview.h"
-#include "sp-object.h"
-#include "sp-root.h"
+#include "object/sp-namedview.h"
+#include "object/sp-object.h"
+#include "object/sp-root.h"
 #include "svg/svg-color.h"
 #include "2geom/line.h"
 #include "2geom/angle.h"
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 01bfc2fc0..c00fa8283 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -37,9 +37,9 @@
 #include "util/units.h"
 #include "inkscape.h"
 #include "preferences.h"
-#include "sp-namedview.h"
-#include "sp-object.h"
-#include "sp-root.h"
+#include "object/sp-namedview.h"
+#include "object/sp-object.h"
+#include "object/sp-root.h"
 #include "svg/svg-color.h"
 #include "svg/stringstream.h"
 #include "helper/mathfns.h"
diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp
index 508fcc503..4be3099bf 100644
--- a/src/display/drawing-image.cpp
+++ b/src/display/drawing-image.cpp
@@ -15,7 +15,6 @@
 #include "display/drawing-context.h"
 #include "display/drawing-image.h"
 #include "preferences.h"
-#include "style.h"
 
 #include "display/cairo-utils.h"
 
diff --git a/src/display/nr-filter-composite.h b/src/display/nr-filter-composite.h
index 74806ad5e..820c64da0 100644
--- a/src/display/nr-filter-composite.h
+++ b/src/display/nr-filter-composite.h
@@ -12,7 +12,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "filters/composite.h"
+#include "object/filters/composite.h"
 #include "display/nr-filter-primitive.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
diff --git a/src/display/nr-filter-displacement-map.h b/src/display/nr-filter-displacement-map.h
index c469f4ced..00c8d8264 100644
--- a/src/display/nr-filter-displacement-map.h
+++ b/src/display/nr-filter-displacement-map.h
@@ -12,7 +12,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "filters/displacementmap.h"
+#include "object/filters/displacementmap.h"
 #include "display/nr-filter-primitive.h"
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index 86ebb49cb..551a86cbf 100644
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -12,7 +12,7 @@
  */
 #include "display/nr-filter-image.h"
 #include "document.h"
-#include "sp-item.h"
+#include "object/sp-item.h"
 #include "display/cairo-utils.h"
 #include "display/drawing-context.h"
 #include "display/drawing.h"
diff --git a/src/display/nr-filter-primitive.cpp b/src/display/nr-filter-primitive.cpp
index ea72efff0..ec392ea06 100644
--- a/src/display/nr-filter-primitive.cpp
+++ b/src/display/nr-filter-primitive.cpp
@@ -19,7 +19,6 @@
 #include "desktop.h"
 
 #include "document.h"
-#include "sp-root.h"
 #include "style.h"
 
 namespace Inkscape {
diff --git a/src/display/nr-filter-units.cpp b/src/display/nr-filter-units.cpp
index e242e3963..a0cbe80ef 100644
--- a/src/display/nr-filter-units.cpp
+++ b/src/display/nr-filter-units.cpp
@@ -12,7 +12,7 @@
 #include <glib.h>
 
 #include "display/nr-filter-units.h"
-#include "sp-filter-units.h"
+#include "object/sp-filter-units.h"
 #include <2geom/transforms.h>
 
 using Geom::X;
diff --git a/src/display/nr-filter-units.h b/src/display/nr-filter-units.h
index 0ee6c3707..474d1e787 100644
--- a/src/display/nr-filter-units.h
+++ b/src/display/nr-filter-units.h
@@ -12,7 +12,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "sp-filter-units.h"
+#include "object/sp-filter-units.h"
 #include <2geom/affine.h>
 #include <2geom/rect.h>
 
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index a1bea4fce..4782f3f54 100644
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -46,7 +46,7 @@
 #include <2geom/affine.h>
 #include <2geom/rect.h>
 #include "svg/svg-length.h"
-#include "sp-filter-units.h"
+//#include "sp-filter-units.h"
 #include "preferences.h"
 
 namespace Inkscape {
diff --git a/src/display/nr-filter.h b/src/display/nr-filter.h
index b48d4c938..573e6ca93 100644
--- a/src/display/nr-filter.h
+++ b/src/display/nr-filter.h
@@ -17,7 +17,7 @@
 #include "display/nr-filter-primitive.h"
 #include "display/nr-filter-types.h"
 #include "svg/svg-length.h"
-#include "sp-filter-units.h"
+#include "object/sp-filter-units.h"
 #include "inkgc/gc-managed.h"
 
 namespace Inkscape {
diff --git a/src/display/nr-light.cpp b/src/display/nr-light.cpp
index 791ae53da..47938f00c 100644
--- a/src/display/nr-light.cpp
+++ b/src/display/nr-light.cpp
@@ -13,9 +13,9 @@
 
 #include "display/nr-light.h"
 #include "display/nr-3dutils.h"
-#include "filters/distantlight.h"
-#include "filters/pointlight.h"
-#include "filters/spotlight.h"
+#include "object/filters/distantlight.h"
+#include "object/filters/pointlight.h"
+#include "object/filters/spotlight.h"
 #include "color.h"
 
 namespace Inkscape {
diff --git a/src/display/nr-style.cpp b/src/display/nr-style.cpp
index 8b82a1dff..31bb27755 100644
--- a/src/display/nr-style.cpp
+++ b/src/display/nr-style.cpp
@@ -11,7 +11,7 @@
 
 #include "display/nr-style.h"
 #include "style.h"
-#include "sp-paint-server.h"
+#include "object/sp-paint-server.h"
 #include "display/canvas-bpath.h" // contains SPStrokeJoinType, SPStrokeCapType etc. (WTF!)
 #include "display/drawing-context.h"
 #include "display/drawing-pattern.h"
diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp
index aeed761b3..c3354bc0b 100644
--- a/src/display/nr-svgfonts.cpp
+++ b/src/display/nr-svgfonts.cpp
@@ -16,22 +16,24 @@
 #include <2geom/transforms.h>
 #include <cairo.h>
 #include <vector>
-#include "sp-object.h"
+
 #include "svg/svg.h"
 #include "display/cairo-utils.h"
 #include "display/nr-svgfonts.h"
 #include "display/nr-svgfonts.h"
-#include "sp-path.h"
-#include "sp-object-group.h"
-#include "sp-use.h"
-#include "sp-use-reference.h"
 #include "display/curve.h"
+
 #include "xml/repr.h"
-#include "sp-font-face.h"
-#include "sp-glyph.h"
-#include "sp-missing-glyph.h"
-#include "sp-font.h"
-#include "sp-glyph-kerning.h"
+
+#include "object/sp-path.h"
+#include "object/sp-object-group.h"
+#include "object/sp-use.h"
+#include "object/sp-use-reference.h"
+#include "object/sp-font-face.h"
+#include "object/sp-glyph.h"
+#include "object/sp-missing-glyph.h"
+#include "object/sp-font.h"
+#include "object/sp-glyph-kerning.h"
 
 // ************************//
 // UserFont Implementation //