Cleaned up display-forward.h, including many redundant usages.

(bzr r10666)

26 files changed, 89 insertions, 79 deletions

diff --git a/src/common-context.cpp b/src/common-context.cpp
index 08bac0152..467d19f72 100644
--- a/src/common-context.cpp
+++ b/src/common-context.cpp
@@ -5,7 +5,6 @@
 
 #include "config.h"
 
-#include "forward.h"
 #include "message-context.h"
 #include "streq.h"
 #include "preferences.h"
diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp
index 34b0d7cab..9983e1c4d 100644
--- a/src/display/canvas-arena.cpp
+++ b/src/display/canvas-arena.cpp
@@ -12,7 +12,6 @@
 
 #include <gtk/gtk.h>
 
-#include "display/display-forward.h"
 #include "display/sp-canvas-util.h"
 #include "helper/sp-marshal.h"
 #include "display/canvas-arena.h"
diff --git a/src/display/canvas-arena.h b/src/display/canvas-arena.h
index daab19d8e..26f19732d 100644
--- a/src/display/canvas-arena.h
+++ b/src/display/canvas-arena.h
@@ -15,7 +15,6 @@
 
 #include <cairo.h>
 #include <2geom/rect.h>
-#include "display/display-forward.h"
 #include "display/drawing.h"
 #include "display/drawing-item.h"
 #include "display/sp-canvas.h"
@@ -33,6 +32,14 @@ typedef struct _SPCanvasArena      SPCanvasArena;
 typedef struct _SPCanvasArenaClass SPCanvasArenaClass;
 struct CachePrefObserver;
 
+namespace Inkscape {
+
+class Drawing;
+class DrawingItem;
+
+} // namespace Inkscape
+
+
 struct _SPCanvasArena {
     SPCanvasItem item;
 
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index 089fe88d1..3598c4e4e 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -22,7 +22,6 @@
 #include "display/cairo-utils.h"
 #include "display/canvas-axonomgrid.h"
 #include "display/canvas-grid.h"
-#include "display/display-forward.h"
 #include "display/sp-canvas-util.h"
 #include "document.h"
 #include "helper/units.h"
diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index e015655a6..14f120600 100644
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -21,7 +21,6 @@
 #include "display/sp-canvas-group.h"
 #include "display/sp-canvas-util.h"
 #include "display/canvas-bpath.h"
-#include "display/display-forward.h"
 #include "display/curve.h"
 #include "display/cairo-utils.h"
 #include "helper/geom.h"
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index dbf78f561..d9f6ddcf2 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -15,12 +15,10 @@
 #include "desktop.h"
 #include "sp-canvas-util.h"
 #include "util/mathfns.h"
-#include "display-forward.h"
 #include "desktop-handles.h"
 #include "display/cairo-utils.h"
 #include "display/canvas-axonomgrid.h"
 #include "display/canvas-grid.h"
-#include "display/display-forward.h"
 #include "display/sp-canvas-util.h"
 #include "display/sp-canvas-group.h"
 #include "document.h"
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp
index 185d10b15..809bb4eeb 100644
--- a/src/display/canvas-text.cpp
+++ b/src/display/canvas-text.cpp
@@ -20,7 +20,6 @@
 #include <sstream>
 #include <string.h>
 
-#include "display-forward.h"
 #include "sp-canvas-util.h"
 #include "canvas-text.h"
 #include "display/cairo-utils.h"
diff --git a/src/display/display-forward.h b/src/display/display-forward.h
deleted file mode 100644
index 7dccb76ef..000000000
--- a/src/display/display-forward.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#ifndef SEEN_DISPLAY_DISPLAY_FORWARD_H
-#define SEEN_DISPLAY_DISPLAY_FORWARD_H
-
-#include <glib-object.h>
-
-struct SPCanvas;
-struct SPCanvasClass;
-struct SPCanvasItem;
-typedef struct _SPCanvasItemClass SPCanvasItemClass;
-struct SPCanvasGroup;
-struct SPCanvasGroupClass;
-class SPCurve;
-typedef struct _SPCanvasArena SPCanvasArena;
-
-namespace Inkscape {
-class Drawing;
-class DrawingItem;
-class DrawingGroup;
-class DrawingImage;
-class DrawingShape;
-class DrawingGlyphs;
-class DrawingText;
-class UpdateContext;
-
-class DrawingContext;
-class DrawingSurface;
-class DrawingCache;
-
-namespace Display {
-    class TemporaryItem;
-    class TemporaryItemList;
-}
-
-namespace Filters {
-    class Filter;
-}
-}
-
-#endif /* !SEEN_DISPLAY_DISPLAY_FORWARD_H */
-
-/*
-  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 :
diff --git a/src/display/drawing-item.h b/src/display/drawing-item.h
index cd8f128d8..810a61d9d 100644
--- a/src/display/drawing-item.h
+++ b/src/display/drawing-item.h
@@ -19,12 +19,24 @@
 #include <boost/intrusive/list.hpp>
 #include <2geom/rect.h>
 #include <2geom/affine.h>
-#include "display/display-forward.h"
 
 class SPStyle;
 
 namespace Inkscape {
 
+class Drawing;
+class DrawingCache;
+class DrawingContext;
+class DrawingItem;
+
+namespace Filters {
+
+class Filter;
+
+} // namespace Filters
+
+
+
 struct UpdateContext {
     Geom::Affine ctm;
 };
diff --git a/src/display/drawing.h b/src/display/drawing.h
index bf3c4bbe8..8154f0783 100644
--- a/src/display/drawing.h
+++ b/src/display/drawing.h
@@ -13,16 +13,22 @@
 #define SEEN_INKSCAPE_DISPLAY_DRAWING_H
 
 #include <set>
+#include <glib.h>
 #include <boost/operators.hpp>
 #include <boost/utility.hpp>
 #include <sigc++/sigc++.h>
 #include <2geom/rect.h>
-#include "display/display-forward.h"
 #include "display/drawing-item.h"
 #include "display/rendermode.h"
 
+
+typedef struct _SPCanvasArena SPCanvasArena;
+
+
 namespace Inkscape {
 
+class DrawingItem;
+
 class Drawing
     : boost::noncopyable
 {
diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp
index e6f973faf..9e942ec35 100644
--- a/src/display/sp-canvas.cpp
+++ b/src/display/sp-canvas.cpp
@@ -23,7 +23,6 @@
 
 #include "helper/sp-marshal.h"
 #include <helper/recthull.h>
-#include "display-forward.h"
 #include <2geom/affine.h>
 #include "display/sp-canvas.h"
 #include "display/sp-canvas-group.h"
diff --git a/src/display/sp-ctrlline.cpp b/src/display/sp-ctrlline.cpp
index cf70f324e..77f5c1d15 100644
--- a/src/display/sp-ctrlline.cpp
+++ b/src/display/sp-ctrlline.cpp
@@ -24,7 +24,6 @@
 #endif
 
 #include "display/sp-ctrlline.h"
-#include "display/display-forward.h"
 #include "display/sp-canvas-util.h"
 #include "display/cairo-utils.h"
 #include "color.h"
diff --git a/src/display/sp-ctrlquadr.cpp b/src/display/sp-ctrlquadr.cpp
index 8cdd8170b..af761864c 100644
--- a/src/display/sp-ctrlquadr.cpp
+++ b/src/display/sp-ctrlquadr.cpp
@@ -13,7 +13,6 @@
 # include "config.h"
 #endif
 
-#include "display-forward.h"
 #include "sp-canvas-item.h"
 #include "sp-canvas.h"
 #include "sp-canvas-util.h"
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 9bafa9432..584942c4f 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -33,7 +33,6 @@
 
 #include <glibmm/i18n.h>
 #include "display/drawing.h"
-#include "display/display-forward.h"
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "display/cairo-utils.h"
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index 3b6c26113..6c77005fe 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -35,7 +35,6 @@
 #include <glib/gmem.h>
 
 #include <glibmm/i18n.h>
-#include "display/display-forward.h"
 #include "display/curve.h"
 #include "display/canvas-bpath.h"
 #include "display/cairo-utils.h"
diff --git a/src/extension/internal/latex-pstricks-out.cpp b/src/extension/internal/latex-pstricks-out.cpp
index 3a16268e6..faac9ce44 100644
--- a/src/extension/internal/latex-pstricks-out.cpp
+++ b/src/extension/internal/latex-pstricks-out.cpp
@@ -18,7 +18,6 @@
 #include "extension/system.h"
 #include "extension/print.h"
 #include "extension/db.h"
-#include "display/display-forward.h"
 #include "display/drawing.h"
 #include "sp-root.h"
 
diff --git a/src/extension/print.h b/src/extension/print.h
index 9c0920499..8d401d646 100644
--- a/src/extension/print.h
+++ b/src/extension/print.h
@@ -13,10 +13,14 @@
 
 #include "extension.h"
 
-#include "display/display-forward.h"
 #include "forward.h"
 #include "sp-item.h"
+
 namespace Inkscape {
+
+class Drawing;
+class DrawingItem;
+
 namespace Extension {
 
 class Print : public Extension {
diff --git a/src/lpe-tool-context.cpp b/src/lpe-tool-context.cpp
index f49d082b6..c164dfbd1 100644
--- a/src/lpe-tool-context.cpp
+++ b/src/lpe-tool-context.cpp
@@ -22,7 +22,6 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "macros.h"
-#include "forward.h"
 #include "pixmaps/cursor-crosshairs.xpm"
 #include <gtk/gtk.h>
 #include "desktop.h"
diff --git a/src/sp-clippath.h b/src/sp-clippath.h
index 4084b89d8..6cab3f053 100644
--- a/src/sp-clippath.h
+++ b/src/sp-clippath.h
@@ -23,11 +23,18 @@
 
 class SPClipPathView;
 
-#include "display/display-forward.h"
 #include "sp-object-group.h"
 #include "uri-references.h"
 #include "xml/node.h"
 
+
+namespace Inkscape {
+
+class Drawing;
+class DrawingItem;
+
+} // namespace Inkscape
+
 class SPClipPath : public SPObjectGroup {
 public:
     class Reference;
diff --git a/src/sp-flowtext.h b/src/sp-flowtext.h
index de41ba47f..944503a1e 100644
--- a/src/sp-flowtext.h
+++ b/src/sp-flowtext.h
@@ -1,12 +1,11 @@
-#ifndef __SP_ITEM_FLOWTEXT_H__
-#define __SP_ITEM_FLOWTEXT_H__
+#ifndef SEEN_SP_ITEM_FLOWTEXT_H
+#define SEEN_SP_ITEM_FLOWTEXT_H
 
 /*
  */
 
 #include "sp-item.h"
 
-#include "display/display-forward.h"
 #include <2geom/forward.h>
 #include "libnrtype/Layout-TNG.h"
 
@@ -16,6 +15,14 @@
 #define SP_IS_FLOWTEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_FLOWTEXT))
 #define SP_IS_FLOWTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_FLOWTEXT))
 
+
+namespace Inkscape {
+
+class DrawingGroup;
+
+} // namespace Inkscape
+
+
 struct SPFlowtext : public SPItem {
     /** Completely recalculates the layout. */
     void rebuildLayout();
@@ -54,7 +61,7 @@ GType sp_flowtext_get_type (void);
 
 SPItem *create_flowtext_with_internal_frame (SPDesktop *desktop, Geom::Point p1, Geom::Point p2);
 
-#endif
+#endif // SEEN_SP_ITEM_FLOWTEXT_H
 
 /*
   Local Variables:
diff --git a/src/sp-item-group.h b/src/sp-item-group.h
index f56192925..c13fa2b75 100644
--- a/src/sp-item-group.h
+++ b/src/sp-item-group.h
@@ -26,6 +26,13 @@
 
 class CGroup;
 
+namespace Inkscape {
+
+class Drawing;
+class DrawingItem;
+
+} // namespace Inkscape
+
 struct SPGroup : public SPLPEItem {
     enum LayerMode { GROUP, LAYER, MASK_HELPER };
 
diff --git a/src/sp-item.h b/src/sp-item.h
index 1765089a3..5cfd49446 100644
--- a/src/sp-item.h
+++ b/src/sp-item.h
@@ -23,7 +23,6 @@
 #include <2geom/affine.h>
 #include <2geom/rect.h>
 
-#include "display/display-forward.h"
 #include "sp-object.h"
 #include "snap-preferences.h"
 #include "snap-candidate.h"
@@ -33,7 +32,14 @@ struct SPClipPathReference;
 struct SPMaskReference;
 struct SPAvoidRef;
 struct SPPrintContext;
-namespace Inkscape { class URIReference;}
+
+namespace Inkscape {
+
+class Drawing;
+class DrawingItem;
+class URIReference;
+
+}
 
 enum {
     SP_EVENT_INVALID,
diff --git a/src/sp-mask.h b/src/sp-mask.h
index 10b42ca1e..6155131ff 100644
--- a/src/sp-mask.h
+++ b/src/sp-mask.h
@@ -14,7 +14,6 @@
  */
 
 #include <2geom/rect.h>
-#include "display/display-forward.h"
 #include "sp-object-group.h"
 #include "uri-references.h"
 #include "xml/node.h"
@@ -29,6 +28,14 @@ class SPMask;
 class SPMaskClass;
 class SPMaskView;
 
+namespace Inkscape {
+
+class Drawing;
+class DrawingItem;
+
+} // namespace Inkscape
+
+
 struct SPMask : public SPObjectGroup {
 	unsigned int maskUnits_set : 1;
 	unsigned int maskUnits : 1;
diff --git a/src/sp-shape.h b/src/sp-shape.h
index 06bd704ad..014158b21 100644
--- a/src/sp-shape.h
+++ b/src/sp-shape.h
@@ -33,6 +33,12 @@
 
 struct SPDesktop;
 
+namespace Inkscape {
+
+class DrawingItem;
+
+} // namespace Inkscape
+
 class SPShape : public SPLPEItem {
 public:
     SPCurve *curve;
diff --git a/src/ui/cache/svg_preview_cache.h b/src/ui/cache/svg_preview_cache.h
index 2318307e2..11d26fe22 100644
--- a/src/ui/cache/svg_preview_cache.h
+++ b/src/ui/cache/svg_preview_cache.h
@@ -14,7 +14,13 @@
 #include <glibmm/ustring.h>
 #include <2geom/rect.h>
 
-#include "display/display-forward.h"
+namespace Inkscape {
+
+class Drawing;
+class DrawingItem;
+
+} // namespace Inkscape
+
 
 GdkPixbuf* render_pixbuf(Inkscape::Drawing &drawing, double scale_factor, const Geom::Rect& dbox, unsigned psize);
 
@@ -42,7 +48,7 @@ class SvgPreview {
 
 
 
-#endif // __SVG_PREVIEW_CACHE_H__
+#endif // SEEN_INKSCAPE_UI_SVG_PREVIEW_CACHE_H
 /*
   Local Variables:
   mode:c++
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index b4a5b5694..3594e2049 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -29,7 +29,6 @@
 #include "desktop-style.h"
 #include "dialogs/dialog-events.h"
 #include "display/canvas-bpath.h" // for SP_STROKE_LINEJOIN_*
-#include "display/display-forward.h"
 #include "display/drawing.h"
 #include "document-private.h"
 #include "gradient-chemistry.h"