Split SPCanvasItem and SPCanvasGroup to individual .h files. Removed forward header.

(bzr r9978.1.1)

12 files changed, 14 insertions, 12 deletions

diff --git a/src/ui/dialog/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp
index 8db5e7c0b..61851c56c 100644
--- a/src/ui/dialog/aboutbox.cpp
+++ b/src/ui/dialog/aboutbox.cpp
@@ -165,7 +165,7 @@ Gtk::Widget *build_splash_widget() {
     
     doc->doUnref();
 
-    sp_svg_view_widget_set_resize(SP_SVG_VIEW_WIDGET(v), FALSE, (int)width, (int)height);
+    SP_SVG_VIEW_WIDGET(v)->setResize(false, static_cast<int>(width), static_cast<int>(height));
 
     Gtk::AspectFrame *frame=new Gtk::AspectFrame();
     frame->unset_label();
diff --git a/src/ui/tool/control-point-selection.h b/src/ui/tool/control-point-selection.h
index 3aed6ae93..6a5b05e85 100644
--- a/src/ui/tool/control-point-selection.h
+++ b/src/ui/tool/control-point-selection.h
@@ -18,13 +18,13 @@
 #include <2geom/forward.h>
 #include <2geom/point.h>
 #include <2geom/rect.h>
-#include "display/display-forward.h"
 #include "util/accumulators.h"
 #include "util/unordered-containers.h"
 #include "ui/tool/commit-events.h"
 #include "ui/tool/manipulator.h"
 
 class SPDesktop;
+struct SPCanvasGroup;
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/tool/control-point.cpp b/src/ui/tool/control-point.cpp
index d5e5b7dfe..38b421553 100644
--- a/src/ui/tool/control-point.cpp
+++ b/src/ui/tool/control-point.cpp
@@ -14,6 +14,7 @@
 #include <2geom/point.h>
 #include "desktop.h"
 #include "desktop-handles.h"
+#include "display/sp-canvas.h"
 #include "display/snap-indicator.h"
 #include "event-context.h"
 #include "message-context.h"
diff --git a/src/ui/tool/control-point.h b/src/ui/tool/control-point.h
index 4de5e5847..3f5fe668d 100644
--- a/src/ui/tool/control-point.h
+++ b/src/ui/tool/control-point.h
@@ -17,7 +17,6 @@
 #include <gtkmm.h>
 #include <2geom/point.h>
 
-#include "display/display-forward.h"
 #include "forward.h"
 #include "util/accumulators.h"
 #include "display/sodipodi-ctrl.h"
diff --git a/src/ui/tool/multi-path-manipulator.h b/src/ui/tool/multi-path-manipulator.h
index ddb74c1bc..aef9c1ac9 100644
--- a/src/ui/tool/multi-path-manipulator.h
+++ b/src/ui/tool/multi-path-manipulator.h
@@ -12,7 +12,6 @@
 #define SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
 
 #include <sigc++/connection.h>
-#include "display/display-forward.h"
 #include "forward.h"
 #include "ui/tool/commit-events.h"
 #include "ui/tool/manipulator.h"
diff --git a/src/ui/tool/node-tool.cpp b/src/ui/tool/node-tool.cpp
index 8661e7946..e75f31370 100644
--- a/src/ui/tool/node-tool.cpp
+++ b/src/ui/tool/node-tool.cpp
@@ -13,6 +13,7 @@
 #include <glib/gi18n.h>
 #include "desktop.h"
 #include "desktop-handles.h"
+#include "display/sp-canvas-group.h"
 #include "display/canvas-bpath.h"
 #include "display/curve.h"
 #include "display/sp-canvas.h"
diff --git a/src/ui/tool/node-tool.h b/src/ui/tool/node-tool.h
index 4d38e69e2..bcf6a8d5e 100644
--- a/src/ui/tool/node-tool.h
+++ b/src/ui/tool/node-tool.h
@@ -17,7 +17,6 @@
 #include <sigc++/sigc++.h>
 #include "event-context.h"
 #include "forward.h"
-#include "display/display-forward.h"
 #include "ui/tool/node-types.h"
 
 #define INK_TYPE_NODE_TOOL               (ink_node_tool_get_type ())
@@ -30,13 +29,17 @@ class InkNodeTool;
 class InkNodeToolClass;
 
 namespace Inkscape {
+
+namespace Display {
+class TemporaryItem;
+} // namespace Display
 namespace UI {
 class MultiPathManipulator;
 class ControlPointSelection;
 class Selector;
 struct PathSharedData;
-}
-}
+} // namespace UI
+} // namespace Inkscape
 
 typedef std::auto_ptr<Inkscape::UI::MultiPathManipulator> MultiPathPtr;
 typedef std::auto_ptr<Inkscape::UI::ControlPointSelection> CSelPtr;
diff --git a/src/ui/tool/path-manipulator.h b/src/ui/tool/path-manipulator.h
index 8a0167e59..58907ea96 100644
--- a/src/ui/tool/path-manipulator.h
+++ b/src/ui/tool/path-manipulator.h
@@ -17,12 +17,12 @@
 #include <2geom/matrix.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
-#include "display/display-forward.h"
 #include "forward.h"
 #include "ui/tool/node.h"
 #include "ui/tool/manipulator.h"
 
 struct SPCanvasItem;
+struct SPCurve;
 
 namespace Inkscape {
 namespace XML { class Node; }
diff --git a/src/ui/tool/selector.h b/src/ui/tool/selector.h
index e61668d9e..05d72c208 100644
--- a/src/ui/tool/selector.h
+++ b/src/ui/tool/selector.h
@@ -14,7 +14,6 @@
 #include <memory>
 #include <gdk/gdk.h>
 #include <2geom/rect.h>
-#include "display/display-forward.h"
 #include "ui/tool/manipulator.h"
 
 class SPDesktop;
diff --git a/src/ui/tool/transform-handle-set.h b/src/ui/tool/transform-handle-set.h
index 2a4df8751..b18c598ee 100644
--- a/src/ui/tool/transform-handle-set.h
+++ b/src/ui/tool/transform-handle-set.h
@@ -14,12 +14,11 @@
 #include <memory>
 #include <gdk/gdk.h>
 #include <2geom/forward.h>
-#include "display/display-forward.h"
 #include "ui/tool/commit-events.h"
 #include "ui/tool/manipulator.h"
 
 class SPDesktop;
-class CtrlRect; // this is not present in display-forward.h!
+class CtrlRect;
 namespace Inkscape {
 namespace UI {
 
diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp
index 107f4e8c6..1a6455ca0 100644
--- a/src/ui/widget/ruler.cpp
+++ b/src/ui/widget/ruler.cpp
@@ -26,6 +26,7 @@
 #include "ui/widget/ruler.h"
 
 #include "xml/repr.h"
+#include "display/sp-canvas.h"
 #include "display/guideline.h"
 #include "desktop.h"
 #include "desktop-handles.h"
diff --git a/src/ui/widget/svg-canvas.cpp b/src/ui/widget/svg-canvas.cpp
index 64657296d..7d37ec355 100644
--- a/src/ui/widget/svg-canvas.cpp
+++ b/src/ui/widget/svg-canvas.cpp
@@ -12,8 +12,8 @@
 #include <gtkmm/widget.h>
 #include "desktop.h"
 #include "desktop-events.h"
+#include "display/sp-canvas.h"
 #include "display/canvas-arena.h"
-#include "display/display-forward.h"
 #include "ui/widget/svg-canvas.h"
 
 namespace Inkscape {