Fix another tonne of forward declaration tags

(bzr r12204)

43 files changed, 42 insertions, 61 deletions

diff --git a/src/arc-context.h b/src/arc-context.h
index 46a6e1dce..3e4f5412d 100644
--- a/src/arc-context.h
+++ b/src/arc-context.h
@@ -27,9 +27,6 @@
 #define SP_IS_ARC_CONTEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_ARC_CONTEXT))
 #define SP_IS_ARC_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_ARC_CONTEXT))
 
-class SPArcContext;
-class SPArcContextClass;
-
 struct SPArcContext : public SPEventContext {
     SPItem *item;
     Geom::Point center;
diff --git a/src/box3d-context.h b/src/box3d-context.h
index ccf0ef712..70ff87ad1 100644
--- a/src/box3d-context.h
+++ b/src/box3d-context.h
@@ -27,9 +27,6 @@
 #define SP_IS_BOX3D_CONTEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_BOX3D_CONTEXT))
 #define SP_IS_BOX3D_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_BOX3D_CONTEXT))
 
-class Box3DContext;
-class Box3DContextClass;
-
 struct Box3DContext : public SPEventContext {
     SPItem *item;
     Geom::Point center;
diff --git a/src/desktop-events.h b/src/desktop-events.h
index cac7e089f..7123ce91b 100644
--- a/src/desktop-events.h
+++ b/src/desktop-events.h
@@ -17,7 +17,7 @@
 #include <gtk/gtk.h>
 
 class  SPDesktop;
-class  SPDesktopWidget;
+struct SPDesktopWidget;
 struct SPCanvasItem;
 
 /* Item handlers */
diff --git a/src/desktop-handles.h b/src/desktop-handles.h
index de0d45273..cca929369 100644
--- a/src/desktop-handles.h
+++ b/src/desktop-handles.h
@@ -16,7 +16,7 @@
 
 class SPDesktop;
 class SPDocument;
-class SPEventContext;
+struct SPEventContext;
 struct SPNamedView;
 struct SPCanvas;
 struct SPCanvasGroup;
diff --git a/src/desktop-style.h b/src/desktop-style.h
index 81485420b..47575de75 100644
--- a/src/desktop-style.h
+++ b/src/desktop-style.h
@@ -16,13 +16,13 @@
 #include <glib.h>
 
 class ColorRGBA;
-struct SPCSSAttr;
+class  SPCSSAttr;
 class  SPDesktop;
 class  SPObject;
 struct SPStyle;
 namespace Inkscape {
 namespace XML {
-struct Node;
+class Node;
 }
 }
 namespace Glib { class ustring; }
diff --git a/src/desktop.h b/src/desktop.h
index 27176868f..d8d4e151d 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -61,7 +61,7 @@ struct _GdkEventWindowState;
 typedef struct _GdkEventWindowState GdkEventWindowState;
 
 namespace Inkscape {
-  class Application;
+  struct Application;
   class MessageContext;
   class Selection;
   class ObjectHierarchy;
diff --git a/src/dialogs/dialog-events.h b/src/dialogs/dialog-events.h
index 5ba2d62c9..623058282 100644
--- a/src/dialogs/dialog-events.h
+++ b/src/dialogs/dialog-events.h
@@ -30,7 +30,7 @@ class Entry;
 class SPDesktop;
 
 namespace Inkscape {
-class Application;
+struct Application;
 } // namespace Inkscape
  
 typedef struct { 
diff --git a/src/display/drawing-group.h b/src/display/drawing-group.h
index 974b3c977..775fec8c4 100644
--- a/src/display/drawing-group.h
+++ b/src/display/drawing-group.h
@@ -14,7 +14,7 @@
 
 #include "display/drawing-item.h"
 
-class SPStyle;
+struct SPStyle;
 
 namespace Inkscape {
 
diff --git a/src/display/drawing-item.h b/src/display/drawing-item.h
index 810a61d9d..4a516512b 100644
--- a/src/display/drawing-item.h
+++ b/src/display/drawing-item.h
@@ -20,7 +20,7 @@
 #include <2geom/rect.h>
 #include <2geom/affine.h>
 
-class SPStyle;
+struct SPStyle;
 
 namespace Inkscape {
 
diff --git a/src/display/drawing-shape.h b/src/display/drawing-shape.h
index ce9bed2eb..52496d86e 100644
--- a/src/display/drawing-shape.h
+++ b/src/display/drawing-shape.h
@@ -15,7 +15,7 @@
 #include "display/drawing-item.h"
 #include "display/nr-style.h"
 
-class SPStyle;
+struct SPStyle;
 class SPCurve;
 
 namespace Inkscape {
diff --git a/src/display/drawing-text.h b/src/display/drawing-text.h
index 929d2bf2d..79b1b097c 100644
--- a/src/display/drawing-text.h
+++ b/src/display/drawing-text.h
@@ -15,7 +15,7 @@
 #include "display/drawing-group.h"
 #include "display/nr-style.h"
 
-class SPStyle;
+struct SPStyle;
 class font_instance;
 
 namespace Inkscape {
diff --git a/src/display/nr-filter-primitive.h b/src/display/nr-filter-primitive.h
index 214b2cfc5..94bd6abb0 100644
--- a/src/display/nr-filter-primitive.h
+++ b/src/display/nr-filter-primitive.h
@@ -16,7 +16,7 @@
 #include "display/nr-filter-types.h"
 #include "svg/svg-length.h"
 
-class SPStyle;
+struct SPStyle;
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-style.h b/src/display/nr-style.h
index ce154cec0..597ae7a2c 100644
--- a/src/display/nr-style.h
+++ b/src/display/nr-style.h
@@ -18,7 +18,8 @@
 
 class SPColor;
 class SPPaintServer;
-class SPStyle;
+struct SPStyle;
+
 namespace Inkscape {
 class DrawingContext;
 }
diff --git a/src/document.h b/src/document.h
index 1255edcb0..606a83be8 100644
--- a/src/document.h
+++ b/src/document.h
@@ -59,7 +59,7 @@ namespace Proj {
     class TransfMat3x4;
 }
 
-class SPDocumentPrivate;
+struct SPDocumentPrivate;
 
 /// Typed SVG document implementation.
 class SPDocument : public Inkscape::GC::Managed<>,
diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h
index fb323cd78..9d679982a 100644
--- a/src/extension/implementation/implementation.h
+++ b/src/extension/implementation/implementation.h
@@ -29,7 +29,7 @@ namespace Gtk {
 }
 
 class SPDocument;
-class SPStyle;
+struct SPStyle;
 
 namespace Inkscape {
 
diff --git a/src/filter-chemistry.h b/src/filter-chemistry.h
index 2ac3ebe8f..751885ad2 100644
--- a/src/filter-chemistry.h
+++ b/src/filter-chemistry.h
@@ -19,7 +19,7 @@
 #include "display/nr-filter-types.h"
 
 class SPDocument;
-class SPFilter;
+struct SPFilter;
 class SPFilterPrimitive;
 class SPItem;
 class SPObject;
diff --git a/src/gradient-chemistry.h b/src/gradient-chemistry.h
index 66a8e5281..728874f88 100644
--- a/src/gradient-chemistry.h
+++ b/src/gradient-chemistry.h
@@ -20,6 +20,7 @@
 
 #include "sp-gradient.h"
 
+class SPCSSAttr;
 class SPItem;
 
 /**
@@ -96,8 +97,6 @@ Geom::Point getGradientCoords(SPItem *item, GrPointType point_type, guint point_
 SPGradient *sp_item_gradient_get_vector(SPItem *item, Inkscape::PaintTarget fill_or_stroke);
 SPGradientSpread sp_item_gradient_get_spread(SPItem *item, Inkscape::PaintTarget fill_or_stroke);
 
-struct SPCSSAttr;
-
 void sp_item_gradient_stop_set_style(SPItem *item, GrPointType point_type, guint point_i, Inkscape::PaintTarget fill_or_stroke, SPCSSAttr *stop);
 guint32 sp_item_gradient_stop_query_style(SPItem *item, GrPointType point_type, guint point_i, Inkscape::PaintTarget fill_or_stroke);
 void sp_item_gradient_edit_stop(SPItem *item, GrPointType point_type, guint point_i, Inkscape::PaintTarget fill_or_stroke);
diff --git a/src/gradient-drag.h b/src/gradient-drag.h
index c92a5c22f..cd76d8a3c 100644
--- a/src/gradient-drag.h
+++ b/src/gradient-drag.h
@@ -34,7 +34,7 @@ struct SPKnot;
 class SPDesktop;
 class SPCSSAttr;
 class SPLinearGradient;
-class SPMeshGradient;
+struct SPMeshGradient;
 class SPItem;
 class SPObject;
 class SPRadialGradient;
diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h
index f4a09f25b..488a974ea 100644
--- a/src/libnrtype/Layout-TNG.h
+++ b/src/libnrtype/Layout-TNG.h
@@ -34,7 +34,7 @@ namespace Inkscape {
 using Inkscape::Extension::Internal::CairoRenderContext;
 #endif
 
-class SPStyle;
+struct SPStyle;
 class Shape;
 class SPPrintContext;
 class SVGLength;
diff --git a/src/libnrtype/font-style-to-pos.h b/src/libnrtype/font-style-to-pos.h
index 41ba6cf72..56eb391c2 100644
--- a/src/libnrtype/font-style-to-pos.h
+++ b/src/libnrtype/font-style-to-pos.h
@@ -3,7 +3,7 @@
 
 #include <libnrtype/nr-type-pos-def.h>
 
-class SPStyle;
+struct SPStyle;
 
 NRTypePosDef font_style_to_pos(SPStyle const &style);
 
diff --git a/src/live_effects/lpeobject-reference.h b/src/live_effects/lpeobject-reference.h
index 571c3b1f1..b1ba1ee4e 100644
--- a/src/live_effects/lpeobject-reference.h
+++ b/src/live_effects/lpeobject-reference.h
@@ -15,11 +15,11 @@
 
 namespace Inkscape {
 namespace XML {
-struct Node;
+class Node;
 }
 }
 
-struct LivePathEffectObject;
+class LivePathEffectObject;
 
 namespace Inkscape {
 
diff --git a/src/persp3d-reference.h b/src/persp3d-reference.h
index 28744b2fa..fa9eca5c9 100644
--- a/src/persp3d-reference.h
+++ b/src/persp3d-reference.h
@@ -19,7 +19,7 @@ class SPObject;
 
 namespace Inkscape {
 namespace XML {
-struct Node;
+class Node;
 }
 }
 
diff --git a/src/persp3d.h b/src/persp3d.h
index db4971635..25db4787c 100644
--- a/src/persp3d.h
+++ b/src/persp3d.h
@@ -27,7 +27,7 @@
 #include "inkscape.h"
 
 class SPBox3D;
-class Box3DContext;
+struct Box3DContext;
 
 class Persp3DImpl {
 public:
diff --git a/src/print.h b/src/print.h
index bbf95b833..80d0446fd 100644
--- a/src/print.h
+++ b/src/print.h
@@ -18,7 +18,7 @@ class Window;
 }
 
 class SPDocument;
-class SPStyle;
+struct SPStyle;
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/sp-filter-reference.h b/src/sp-filter-reference.h
index 5901dca07..7a335aed4 100644
--- a/src/sp-filter-reference.h
+++ b/src/sp-filter-reference.h
@@ -5,7 +5,7 @@
 
 class SPObject;
 class SPDocument;
-class SPFilter;
+struct SPFilter;
 
 class SPFilterReference : public Inkscape::URIReference {
 public:
diff --git a/src/sp-filter.h b/src/sp-filter.h
index d0529e542..a3e7cd35c 100644
--- a/src/sp-filter.h
+++ b/src/sp-filter.h
@@ -35,7 +35,7 @@ namespace Filters {
 class Filter;
 } }
 
-struct SPFilterReference;
+class SPFilterReference;
 class SPFilterPrimitive;
 
 struct ltstr {
diff --git a/src/sp-gradient-fns.h b/src/sp-gradient-fns.h
index e57877256..165fd3ed8 100644
--- a/src/sp-gradient-fns.h
+++ b/src/sp-gradient-fns.h
@@ -12,7 +12,7 @@
 #include "sp-gradient-units.h"
 
 class SPGradient;
-class SPMeshGradient;
+struct SPMeshGradient;
 
 SPGradientSpread sp_gradient_get_spread (SPGradient *gradient);
 
diff --git a/src/sp-lpe-item.h b/src/sp-lpe-item.h
index 2ed073dc3..5ff1dee26 100644
--- a/src/sp-lpe-item.h
+++ b/src/sp-lpe-item.h
@@ -24,7 +24,7 @@
 #define SP_IS_LPE_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_LPE_ITEM))
 #define SP_IS_LPE_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_LPE_ITEM))
 
-struct LivePathEffectObject;
+class LivePathEffectObject;
 class SPCurve;
 class SPDesktop;
 
diff --git a/src/sp-mesh-gradient-fns.h b/src/sp-mesh-gradient-fns.h
index 18f66128a..4196a6de2 100644
--- a/src/sp-mesh-gradient-fns.h
+++ b/src/sp-mesh-gradient-fns.h
@@ -14,7 +14,7 @@ class Node;
 }
 }
 
-class SPMeshGradient;
+struct SPMeshGradient;
 
 #define SP_TYPE_MESHGRADIENT (sp_meshgradient_get_type())
 #define SP_MESHGRADIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_MESHGRADIENT, SPMeshGradient))
diff --git a/src/sp-use-reference.h b/src/sp-use-reference.h
index f40dbb6e5..d99b425f1 100644
--- a/src/sp-use-reference.h
+++ b/src/sp-use-reference.h
@@ -18,7 +18,7 @@ class Path;
 
 namespace Inkscape {
 namespace XML {
-    struct Node;
+class Node;
 }
 }
 
diff --git a/src/style.h b/src/style.h
index 7c64ea3d8..1c8cb4774 100644
--- a/src/style.h
+++ b/src/style.h
@@ -34,17 +34,6 @@ class Node;
 
 class SPCSSAttr;
 
-class SPIFloat;
-class SPIScale24;
-class SPIInt;
-class SPIShort;
-class SPIEnum;
-class SPIString;
-class SPILength;
-class SPIPaint;
-class SPIFontSize;
-class SPIBaselineShift;
-
 /// Float type internal to SPStyle.
 struct SPIFloat {
     unsigned set : 1;
diff --git a/src/ui/dialog/desktop-tracker.h b/src/ui/dialog/desktop-tracker.h
index 0c8af66bf..c219e8d98 100644
--- a/src/ui/dialog/desktop-tracker.h
+++ b/src/ui/dialog/desktop-tracker.h
@@ -16,7 +16,7 @@ class SPDesktop;
 
 namespace Inkscape {
 
-class Application;
+struct Application;
 
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/dialog.h b/src/ui/dialog/dialog.h
index 025e9eb58..ec5d203bc 100644
--- a/src/ui/dialog/dialog.h
+++ b/src/ui/dialog/dialog.h
@@ -21,7 +21,7 @@ class SPDesktop;
 
 namespace Inkscape {
 class Selection;
-class Application;
+struct Application;
 }
 
 namespace Inkscape {
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 7ecb6d5cd..e6bb9b43d 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -48,8 +48,6 @@
 #include "livepatheffect-add.h"
 
 namespace Inkscape {
-class Application;
-
 namespace UI {
 namespace Dialog {
 
diff --git a/src/ui/tool/control-point.h b/src/ui/tool/control-point.h
index 30efe8a27..27a0f8074 100644
--- a/src/ui/tool/control-point.h
+++ b/src/ui/tool/control-point.h
@@ -23,7 +23,7 @@
 #include "enums.h"
 
 class SPDesktop;
-class SPEventContext;
+struct SPEventContext;
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h
index c7c09a816..bee9f09b9 100644
--- a/src/ui/widget/object-composite-settings.h
+++ b/src/ui/widget/object-composite-settings.h
@@ -24,7 +24,7 @@
 class SPDesktop;
 
 namespace Inkscape {
-class Application;
+struct Application;
 
 namespace UI {
 namespace Widget {
diff --git a/src/ui/widget/style-subject.h b/src/ui/widget/style-subject.h
index 47da91732..c2941d995 100644
--- a/src/ui/widget/style-subject.h
+++ b/src/ui/widget/style-subject.h
@@ -20,7 +20,7 @@
 class SPDesktop;
 class SPObject;
 class SPCSSAttr;
-class SPStyle;
+struct SPStyle;
 
 namespace Inkscape {
 class Selection;
diff --git a/src/ui/widget/style-swatch.h b/src/ui/widget/style-swatch.h
index 7e385e3df..2b9c32b2e 100644
--- a/src/ui/widget/style-swatch.h
+++ b/src/ui/widget/style-swatch.h
@@ -27,7 +27,7 @@
 #include "preferences.h"
 
 class SPUnit;
-class SPStyle;
+struct SPStyle;
 class SPCSSAttr;
 
 namespace Gtk {
diff --git a/src/vanishing-point.h b/src/vanishing-point.h
index d55dc13a1..17e3a4aa9 100644
--- a/src/vanishing-point.h
+++ b/src/vanishing-point.h
@@ -113,7 +113,7 @@ private:
     Proj::Axis _axis;
 };
 
-class VPDrag;
+struct VPDrag;
 
 struct less_ptr : public std::binary_function<VanishingPoint *, VanishingPoint *, bool> {
     bool operator()(VanishingPoint *vp1, VanishingPoint *vp2) {
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 0ffedd112..9188838b3 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -25,7 +25,7 @@
 typedef struct _EgeColorProfTracker EgeColorProfTracker;
 struct SPCanvas;
 class SPDesktop;
-class SPDesktopWidget;
+struct SPDesktopWidget;
 class SPObject;
 
 
diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h
index d6ad3f50c..d3b3f4116 100644
--- a/src/widgets/paint-selector.h
+++ b/src/widgets/paint-selector.h
@@ -23,7 +23,7 @@
 class SPGradient;
 class SPDesktop;
 class SPPattern;
-class SPStyle;
+struct SPStyle;
 
 #define SP_TYPE_PAINT_SELECTOR (sp_paint_selector_get_type ())
 #define SP_PAINT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_PAINT_SELECTOR, SPPaintSelector))
diff --git a/src/widgets/sp-widget.h b/src/widgets/sp-widget.h
index d2177f486..3a23a92c5 100644
--- a/src/widgets/sp-widget.h
+++ b/src/widgets/sp-widget.h
@@ -27,7 +27,7 @@
 
 namespace Inkscape {
 
-class Application;
+struct Application;
 class Selection;
 class SPWidgetImpl;
 
diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h
index d520d393d..9c839a8fe 100644
--- a/src/widgets/toolbox.h
+++ b/src/widgets/toolbox.h
@@ -23,7 +23,7 @@
 #define TOOLBAR_SLIDER_HINT "full"
 
 class SPDesktop;
-class SPEventContext;
+struct SPEventContext;
 
 namespace Inkscape {
 namespace UI {