From 4c75974f2ac6bfe751e583fca37ffdd8b14ea84d Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 14 Mar 2013 23:24:17 +0000 Subject: Fix another load of forward declaration tags (bzr r12205) --- src/common-context.h | 4 ---- src/composite-undo-stack-observer.h | 2 +- src/desktop.h | 2 +- src/display/canvas-axonomgrid.h | 2 +- src/display/nr-filter-diffuselighting.h | 2 +- src/display/nr-filter-flood.h | 2 +- src/display/nr-filter-specularlighting.h | 2 +- src/display/nr-style.h | 1 - src/display/sp-ctrlcurve.h | 2 +- src/dom/events.h | 1 - src/dropper-context.h | 3 --- src/dyna-draw-context.h | 3 --- src/eraser-context.h | 3 --- src/event-context.h | 2 +- src/file.h | 2 +- src/filter-chemistry.h | 2 +- src/filters/blend.h | 2 -- src/filters/composite.h | 2 -- src/filters/diffuselighting.h | 2 +- src/filters/displacementmap.h | 2 -- src/filters/gaussian-blur.h | 4 +--- src/filters/specularlighting.h | 2 +- src/flood-context.h | 3 --- src/gradient-context.h | 3 --- src/gradient-drag.h | 6 +++--- src/inkscape-private.h | 2 +- src/inkscape.cpp | 2 +- src/libnrtype/Layout-TNG.h | 2 +- src/livarot/Shape.h | 4 ++-- src/lpe-tool-context.h | 3 --- src/marker.h | 4 +--- src/rect-context.h | 3 --- src/select-context.h | 2 -- src/sp-desc.h | 3 --- src/sp-filter-primitive.h | 2 -- src/sp-filter.h | 2 +- src/sp-gradient.h | 4 ++-- src/sp-image.h | 3 --- src/sp-item.h | 4 ++-- src/sp-linear-gradient-fns.h | 2 +- src/sp-mask.h | 2 -- src/sp-offset.h | 2 -- src/sp-pattern.h | 3 +-- src/sp-radial-gradient-fns.h | 2 +- src/sp-rect.h | 3 --- src/sp-spiral.h | 3 --- src/sp-star.h | 5 ----- src/sp-stop.h | 1 - src/sp-symbol.h | 3 --- src/sp-title.h | 3 --- src/sp-tref.h | 3 --- src/sp-use.h | 2 -- src/spiral-context.h | 3 --- src/star-context.h | 3 --- src/style.h | 4 +--- src/svg-view-widget.h | 2 -- src/svg/svg-color.h | 2 +- src/text-context.h | 2 -- src/ui/dialog/layer-properties.h | 6 +++--- src/ui/dialog/xml-tree.h | 2 +- src/ui/tool/node-tool.h | 3 --- src/ui/widget/registered-widget.h | 2 +- src/ui/widget/selected-style.h | 2 +- src/ui/widget/style-swatch.h | 2 +- src/undo-stack-observer.h | 2 +- src/widgets/gradient-vector.h | 2 +- src/xml/composite-node-observer.h | 2 +- 67 files changed, 42 insertions(+), 132 deletions(-) diff --git a/src/common-context.h b/src/common-context.h index ae0f398b2..8903be391 100644 --- a/src/common-context.h +++ b/src/common-context.h @@ -29,12 +29,8 @@ #define SP_IS_COMMON_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_COMMON_CONTEXT)) #define SP_IS_COMMON_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), SP_TYPE_COMMON_CONTEXT)) -class SPCommonContext; -class SPCommonContextClass; - #define SAMPLING_SIZE 8 /* fixme: ?? */ - struct SPCommonContext : public SPEventContext { /** accumulated shape which ultimately goes in svg:path */ SPCurve *accumulated; diff --git a/src/composite-undo-stack-observer.h b/src/composite-undo-stack-observer.h index c34ab7234..669c39a86 100644 --- a/src/composite-undo-stack-observer.h +++ b/src/composite-undo-stack-observer.h @@ -18,7 +18,7 @@ namespace Inkscape { -class Event; +struct Event; /** * Aggregates UndoStackObservers for management and triggering in an SPDocument's undo/redo diff --git a/src/desktop.h b/src/desktop.h index d8d4e151d..56de56c65 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -77,7 +77,7 @@ namespace Inkscape { } namespace View { - class EditWidgetInterface; + struct EditWidgetInterface; } } namespace Whiteboard { diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h index 0e24d3f56..f58ea3aca 100644 --- a/src/display/canvas-axonomgrid.h +++ b/src/display/canvas-axonomgrid.h @@ -12,7 +12,7 @@ #include "line-snapper.h" #include "canvas-grid.h" -class SPCanvasBuf; +struct SPCanvasBuf; class SPDesktop; struct SPNamedView; diff --git a/src/display/nr-filter-diffuselighting.h b/src/display/nr-filter-diffuselighting.h index 315bf9f48..043a5eb39 100644 --- a/src/display/nr-filter-diffuselighting.h +++ b/src/display/nr-filter-diffuselighting.h @@ -22,7 +22,7 @@ class SPFeDistantLight; class SPFePointLight; class SPFeSpotLight; -class SVGICCColor; +struct SVGICCColor; namespace Inkscape { namespace Filters { diff --git a/src/display/nr-filter-flood.h b/src/display/nr-filter-flood.h index 8568502ff..9a968047d 100644 --- a/src/display/nr-filter-flood.h +++ b/src/display/nr-filter-flood.h @@ -14,7 +14,7 @@ #include "display/nr-filter-primitive.h" -class SVGICCColor; +struct SVGICCColor; namespace Inkscape { namespace Filters { diff --git a/src/display/nr-filter-specularlighting.h b/src/display/nr-filter-specularlighting.h index 4f8c2d112..c57e3a9ff 100644 --- a/src/display/nr-filter-specularlighting.h +++ b/src/display/nr-filter-specularlighting.h @@ -20,7 +20,7 @@ class SPFeDistantLight; class SPFePointLight; class SPFeSpotLight; -class SVGICCColor; +struct SVGICCColor; namespace Inkscape { namespace Filters { diff --git a/src/display/nr-style.h b/src/display/nr-style.h index 597ae7a2c..725828089 100644 --- a/src/display/nr-style.h +++ b/src/display/nr-style.h @@ -16,7 +16,6 @@ #include <2geom/rect.h> #include "color.h" -class SPColor; class SPPaintServer; struct SPStyle; diff --git a/src/display/sp-ctrlcurve.h b/src/display/sp-ctrlcurve.h index 15de20161..90936185c 100644 --- a/src/display/sp-ctrlcurve.h +++ b/src/display/sp-ctrlcurve.h @@ -17,7 +17,7 @@ #include "display/sp-ctrlline.h" -struct SPItem; +class SPItem; #define SP_TYPE_CTRLCURVE (SPCtrlCurve::getType()) #define SP_CTRLCURVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CTRLCURVE, SPCtrlCurve)) diff --git a/src/dom/events.h b/src/dom/events.h index 59d83afcf..e62c5d420 100644 --- a/src/dom/events.h +++ b/src/dom/events.h @@ -66,7 +66,6 @@ typedef dom::NodePtr NodePtr ; //forward declarations -class Event; class EventTarget; class EventListener; class DocumentEvent; diff --git a/src/dropper-context.h b/src/dropper-context.h index 68ae3df07..be4b543ae 100644 --- a/src/dropper-context.h +++ b/src/dropper-context.h @@ -20,9 +20,6 @@ G_BEGIN_DECLS #define SP_DROPPER_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_DROPPER_CONTEXT, SPDropperContext)) #define SP_IS_DROPPER_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_DROPPER_CONTEXT)) -class SPDropperContext; -class SPDropperContextClass; - enum { SP_DROPPER_PICK_VISIBLE, SP_DROPPER_PICK_ACTUAL diff --git a/src/dyna-draw-context.h b/src/dyna-draw-context.h index af63bf653..8509e450b 100644 --- a/src/dyna-draw-context.h +++ b/src/dyna-draw-context.h @@ -27,9 +27,6 @@ #define SP_IS_DYNA_DRAW_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_DYNA_DRAW_CONTEXT)) #define SP_IS_DYNA_DRAW_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), SP_TYPE_DYNA_DRAW_CONTEXT)) -class SPDynaDrawContext; -class SPDynaDrawContextClass; - #define DDC_MIN_PRESSURE 0.0 #define DDC_MAX_PRESSURE 1.0 #define DDC_DEFAULT_PRESSURE 1.0 diff --git a/src/eraser-context.h b/src/eraser-context.h index 7c147c32f..bc4268aef 100644 --- a/src/eraser-context.h +++ b/src/eraser-context.h @@ -29,9 +29,6 @@ G_BEGIN_DECLS #define SP_IS_ERASER_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_ERASER_CONTEXT)) #define SP_IS_ERASER_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), SP_TYPE_ERASER_CONTEXT)) -class SPEraserContext; -class SPEraserContextClass; - #define ERC_MIN_PRESSURE 0.0 #define ERC_MAX_PRESSURE 1.0 #define ERC_DEFAULT_PRESSURE 1.0 diff --git a/src/event-context.h b/src/event-context.h index 9936aa668..e97a8ad8f 100644 --- a/src/event-context.h +++ b/src/event-context.h @@ -19,7 +19,7 @@ #include "2geom/forward.h" #include "preferences.h" -struct GrDrag; +class GrDrag; class SPDesktop; class SPItem; class ShapeEditor; diff --git a/src/file.h b/src/file.h index b8e15bf3e..b173ca58c 100644 --- a/src/file.h +++ b/src/file.h @@ -24,7 +24,7 @@ class SPObject; namespace Inkscape { namespace Extension { - struct Extension; + class Extension; } } diff --git a/src/filter-chemistry.h b/src/filter-chemistry.h index 751885ad2..b00e33bcc 100644 --- a/src/filter-chemistry.h +++ b/src/filter-chemistry.h @@ -20,7 +20,7 @@ class SPDocument; struct SPFilter; -class SPFilterPrimitive; +struct SPFilterPrimitive; class SPItem; class SPObject; diff --git a/src/filters/blend.h b/src/filters/blend.h index e7fc410e7..5d65c92fc 100644 --- a/src/filters/blend.h +++ b/src/filters/blend.h @@ -22,8 +22,6 @@ #define SP_IS_FEBLEND(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FEBLEND)) #define SP_IS_FEBLEND_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FEBLEND)) -class SPFeBlendClass; - struct SPFeBlend : public SPFilterPrimitive { Inkscape::Filters::FilterBlendMode blend_mode; int in2; diff --git a/src/filters/composite.h b/src/filters/composite.h index 3eb62716f..4f2d1ff69 100644 --- a/src/filters/composite.h +++ b/src/filters/composite.h @@ -32,8 +32,6 @@ enum FeCompositeOperator { COMPOSITE_ENDOPERATOR }; -class SPFeCompositeClass; - struct SPFeComposite : public SPFilterPrimitive { FeCompositeOperator composite_operator; double k1, k2, k3, k4; diff --git a/src/filters/diffuselighting.h b/src/filters/diffuselighting.h index 99dccb394..2be58d864 100644 --- a/src/filters/diffuselighting.h +++ b/src/filters/diffuselighting.h @@ -21,7 +21,7 @@ #define SP_IS_FEDIFFUSELIGHTING(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FEDIFFUSELIGHTING)) #define SP_IS_FEDIFFUSELIGHTING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FEDIFFUSELIGHTING)) -class SVGICCColor; +struct SVGICCColor; namespace Inkscape { namespace Filters { diff --git a/src/filters/displacementmap.h b/src/filters/displacementmap.h index 6232f0937..93dc86d27 100644 --- a/src/filters/displacementmap.h +++ b/src/filters/displacementmap.h @@ -28,8 +28,6 @@ enum FilterDisplacementMapChannelSelector { DISPLACEMENTMAP_CHANNEL_ENDTYPE }; -class SPFeDisplacementMapClass; - struct SPFeDisplacementMap : public SPFilterPrimitive { int in2; double scale; diff --git a/src/filters/gaussian-blur.h b/src/filters/gaussian-blur.h index 417f8a6f4..8929627ba 100644 --- a/src/filters/gaussian-blur.h +++ b/src/filters/gaussian-blur.h @@ -21,14 +21,12 @@ #define SP_IS_GAUSSIANBLUR(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_GAUSSIANBLUR)) #define SP_IS_GAUSSIANBLUR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_GAUSSIANBLUR)) -/* GaussianBlur base class */ -class SPGaussianBlurClass; - struct SPGaussianBlur : public SPFilterPrimitive { /** stdDeviation attribute */ NumberOptNumber stdDeviation; }; +/* GaussianBlur base class */ struct SPGaussianBlurClass { SPFilterPrimitiveClass parent_class; }; diff --git a/src/filters/specularlighting.h b/src/filters/specularlighting.h index 44bd98c6c..5cfbcb07c 100644 --- a/src/filters/specularlighting.h +++ b/src/filters/specularlighting.h @@ -23,7 +23,7 @@ #define SP_IS_FESPECULARLIGHTING(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_FESPECULARLIGHTING)) #define SP_IS_FESPECULARLIGHTING_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_FESPECULARLIGHTING)) -class SVGICCColor; +struct SVGICCColor; namespace Inkscape { namespace Filters { diff --git a/src/flood-context.h b/src/flood-context.h index 0cab0f7c5..3e81cd01e 100644 --- a/src/flood-context.h +++ b/src/flood-context.h @@ -29,9 +29,6 @@ #define FLOOD_COLOR_CHANNEL_B 4 #define FLOOD_COLOR_CHANNEL_A 8 -class SPFloodContext; -class SPFloodContextClass; - struct SPFloodContext : public SPEventContext { SPItem *item; diff --git a/src/gradient-context.h b/src/gradient-context.h index 9c08677ae..464b95ad4 100644 --- a/src/gradient-context.h +++ b/src/gradient-context.h @@ -25,9 +25,6 @@ #define SP_IS_GRADIENT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_GRADIENT_CONTEXT)) #define SP_IS_GRADIENT_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_GRADIENT_CONTEXT)) -class SPGradientContext; -class SPGradientContextClass; - struct SPGradientContext : public SPEventContext { Geom::Point origin; diff --git a/src/gradient-drag.h b/src/gradient-drag.h index cd76d8a3c..2a2465590 100644 --- a/src/gradient-drag.h +++ b/src/gradient-drag.h @@ -33,12 +33,12 @@ struct SPKnot; class SPDesktop; class SPCSSAttr; -class SPLinearGradient; +struct SPLinearGradient; struct SPMeshGradient; class SPItem; class SPObject; -class SPRadialGradient; -class SPStop; +struct SPRadialGradient; +struct SPStop; namespace Inkscape { class Selection; diff --git a/src/inkscape-private.h b/src/inkscape-private.h index 470a1f5bd..09bcef12b 100644 --- a/src/inkscape-private.h +++ b/src/inkscape-private.h @@ -22,7 +22,7 @@ #include "inkscape.h" -class SPColor; +struct SPColor; namespace Inkscape { class Selection; } GType inkscape_get_type (void); diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 449220357..491acd73e 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -91,7 +91,7 @@ enum { ################################*/ namespace Inkscape { -class ApplicationClass; +struct ApplicationClass; } static void inkscape_class_init (Inkscape::ApplicationClass *klass); diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h index 488a974ea..0f5f08a53 100644 --- a/src/libnrtype/Layout-TNG.h +++ b/src/libnrtype/Layout-TNG.h @@ -36,7 +36,7 @@ using Inkscape::Extension::Internal::CairoRenderContext; struct SPStyle; class Shape; -class SPPrintContext; +struct SPPrintContext; class SVGLength; class Path; class SPCurve; diff --git a/src/livarot/Shape.h b/src/livarot/Shape.h index 1a804a48c..9d1de74e9 100644 --- a/src/livarot/Shape.h +++ b/src/livarot/Shape.h @@ -21,9 +21,9 @@ class Path; class FloatLigne; -struct SweepTree; +class SweepTree; struct SweepTreeList; -struct SweepEventQueue; +class SweepEventQueue; enum { tweak_mode_grow, diff --git a/src/lpe-tool-context.h b/src/lpe-tool-context.h index 12e4b3838..fb3a5d4e2 100644 --- a/src/lpe-tool-context.h +++ b/src/lpe-tool-context.h @@ -24,9 +24,6 @@ #define SP_IS_LPETOOL_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_LPETOOL_CONTEXT)) #define SP_IS_LPETOOL_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), SP_TYPE_LPETOOL_CONTEXT)) -class SPLPEToolContext; -class SPLPEToolContextClass; - /* This is the list of subtools from which the toolbar of the LPETool is built automatically */ extern const int num_subtools; diff --git a/src/marker.h b/src/marker.h index e8d2dd9a1..147fafeb8 100644 --- a/src/marker.h +++ b/src/marker.h @@ -22,9 +22,7 @@ #define SP_MARKER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_MARKER, SPMarker)) #define SP_IS_MARKER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_MARKER)) -class SPMarker; -class SPMarkerClass; -class SPMarkerView; +struct SPMarkerView; #include <2geom/rect.h> #include <2geom/affine.h> diff --git a/src/rect-context.h b/src/rect-context.h index b6fbb6854..5b6c5373e 100644 --- a/src/rect-context.h +++ b/src/rect-context.h @@ -25,9 +25,6 @@ #define SP_IS_RECT_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_RECT_CONTEXT)) #define SP_IS_RECT_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_RECT_CONTEXT)) -class SPRectContext; -class SPRectContextClass; - struct SPRectContext : public SPEventContext { SPItem *item; Geom::Point center; diff --git a/src/select-context.h b/src/select-context.h index ce2039a2d..a6877f802 100644 --- a/src/select-context.h +++ b/src/select-context.h @@ -22,8 +22,6 @@ #define SP_IS_SELECT_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_SELECT_CONTEXT)) struct SPCanvasItem; -class SPSelectContext; -class SPSelectContextClass; namespace Inkscape { class MessageContext; diff --git a/src/sp-desc.h b/src/sp-desc.h index 8c5a8a663..41ef08020 100644 --- a/src/sp-desc.h +++ b/src/sp-desc.h @@ -17,9 +17,6 @@ #define SP_TYPE_DESC (sp_desc_get_type ()) #define SP_IS_DESC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_DESC)) -class SPDesc; -class SPDescClass; - struct SPDesc : public SPObject { }; diff --git a/src/sp-filter-primitive.h b/src/sp-filter-primitive.h index 60104047e..f06df5611 100644 --- a/src/sp-filter-primitive.h +++ b/src/sp-filter-primitive.h @@ -23,8 +23,6 @@ #define SP_IS_FILTER_PRIMITIVE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_FILTER_PRIMITIVE)) #define SP_IS_FILTER_PRIMITIVE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_FILTER_PRIMITIVE)) -class SPFilterPrimitive; -class SPFilterPrimitiveClass; namespace Inkscape { namespace Filters { class Filter; diff --git a/src/sp-filter.h b/src/sp-filter.h index a3e7cd35c..5afe47438 100644 --- a/src/sp-filter.h +++ b/src/sp-filter.h @@ -36,7 +36,7 @@ class Filter; } } class SPFilterReference; -class SPFilterPrimitive; +struct SPFilterPrimitive; struct ltstr { bool operator()(const char* s1, const char* s2) const; diff --git a/src/sp-gradient.h b/src/sp-gradient.h index a21a413f4..57ffa5570 100644 --- a/src/sp-gradient.h +++ b/src/sp-gradient.h @@ -27,8 +27,8 @@ #include #include -struct SPGradientReference; -class SPStop; +class SPGradientReference; +struct SPStop; #define SP_TYPE_GRADIENT (SPGradient::getType()) #define SP_GRADIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_GRADIENT, SPGradient)) diff --git a/src/sp-image.h b/src/sp-image.h index c657d0a2f..d6fc82a59 100644 --- a/src/sp-image.h +++ b/src/sp-image.h @@ -20,9 +20,6 @@ #define SP_IS_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_IMAGE)) #define SP_IS_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_IMAGE)) -class SPImage; -class SPImageClass; - /* SPImage */ #include diff --git a/src/sp-item.h b/src/sp-item.h index a3ba1dbe2..e65ffc829 100644 --- a/src/sp-item.h +++ b/src/sp-item.h @@ -28,8 +28,8 @@ #include "snap-candidate.h" class SPGuideConstraint; -struct SPClipPathReference; -struct SPMaskReference; +class SPClipPathReference; +class SPMaskReference; class SPAvoidRef; struct SPPrintContext; diff --git a/src/sp-linear-gradient-fns.h b/src/sp-linear-gradient-fns.h index 1bdf0b89e..14e575ebe 100644 --- a/src/sp-linear-gradient-fns.h +++ b/src/sp-linear-gradient-fns.h @@ -14,7 +14,7 @@ class Node; } } -class SPLinearGradient; +struct SPLinearGradient; #define SP_TYPE_LINEARGRADIENT (sp_lineargradient_get_type()) #define SP_LINEARGRADIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_LINEARGRADIENT, SPLinearGradient)) diff --git a/src/sp-mask.h b/src/sp-mask.h index e249e0c76..6f1653133 100644 --- a/src/sp-mask.h +++ b/src/sp-mask.h @@ -24,8 +24,6 @@ #define SP_IS_MASK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_MASK)) #define SP_IS_MASK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_MASK)) -class SPMask; -class SPMaskClass; class SPMaskView; namespace Inkscape { diff --git a/src/sp-offset.h b/src/sp-offset.h index 4e245f952..904f8607c 100644 --- a/src/sp-offset.h +++ b/src/sp-offset.h @@ -22,8 +22,6 @@ #define SP_IS_OFFSET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_OFFSET)) #define SP_IS_OFFSET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_OFFSET)) -class SPOffset; -class SPOffsetClass; class SPUseReference; /** diff --git a/src/sp-pattern.h b/src/sp-pattern.h index e0a7dce54..bcf8dd520 100644 --- a/src/sp-pattern.h +++ b/src/sp-pattern.h @@ -24,8 +24,7 @@ GType sp_pattern_get_type (void); -class SPPattern; -class SPPatternClass; +struct SPPattern; #include "svg/svg-length.h" #include "sp-paint-server.h" diff --git a/src/sp-radial-gradient-fns.h b/src/sp-radial-gradient-fns.h index 912508a33..43ed7bf03 100644 --- a/src/sp-radial-gradient-fns.h +++ b/src/sp-radial-gradient-fns.h @@ -13,7 +13,7 @@ class Node; } } -class SPRadialGradient; +struct SPRadialGradient; #define SP_TYPE_RADIALGRADIENT (sp_radialgradient_get_type()) #define SP_RADIALGRADIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_RADIALGRADIENT, SPRadialGradient)) diff --git a/src/sp-rect.h b/src/sp-rect.h index 5e518dcd7..1127889c1 100644 --- a/src/sp-rect.h +++ b/src/sp-rect.h @@ -26,9 +26,6 @@ G_BEGIN_DECLS #define SP_IS_RECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_RECT)) #define SP_IS_RECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_RECT)) -class SPRect; -class SPRectClass; - struct SPRect : public SPShape { SVGLength x; SVGLength y; diff --git a/src/sp-spiral.h b/src/sp-spiral.h index 6da7c38a4..64cb8521b 100644 --- a/src/sp-spiral.h +++ b/src/sp-spiral.h @@ -29,9 +29,6 @@ #define SP_IS_SPIRAL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_SPIRAL)) #define SP_IS_SPIRAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_SPIRAL)) -class SPSpiral; -class SPSpiralClass; - /** * A spiral Shape. * diff --git a/src/sp-star.h b/src/sp-star.h index bd271ccc0..888eeb8d2 100644 --- a/src/sp-star.h +++ b/src/sp-star.h @@ -16,17 +16,12 @@ #include "sp-polygon.h" - - #define SP_TYPE_STAR (sp_star_get_type ()) #define SP_STAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_STAR, SPStar)) #define SP_STAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_STAR, SPStarClass)) #define SP_IS_STAR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_STAR)) #define SP_IS_STAR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_STAR)) -class SPStar; -class SPStarClass; - typedef enum { SP_STAR_POINT_KNOT1, SP_STAR_POINT_KNOT2 diff --git a/src/sp-stop.h b/src/sp-stop.h index c3b1e2753..b82dd0b13 100644 --- a/src/sp-stop.h +++ b/src/sp-stop.h @@ -14,7 +14,6 @@ #include "color.h" class SPObjectClass; -class SPColor; struct SPStop; struct SPStopClass; diff --git a/src/sp-symbol.h b/src/sp-symbol.h index 59f343285..10d642e8b 100644 --- a/src/sp-symbol.h +++ b/src/sp-symbol.h @@ -21,9 +21,6 @@ #define SP_SYMBOL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_SYMBOL, SPSymbol)) #define SP_IS_SYMBOL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_SYMBOL)) -class SPSymbol; -class SPSymbolClass; - #include <2geom/affine.h> #include "svg/svg-length.h" #include "enums.h" diff --git a/src/sp-title.h b/src/sp-title.h index a5f0a2fea..d10d58188 100644 --- a/src/sp-title.h +++ b/src/sp-title.h @@ -17,9 +17,6 @@ #define SP_TYPE_TITLE (sp_title_get_type ()) #define SP_IS_TITLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_TITLE)) -class SPTitle; -class SPTitleClass; - struct SPTitle : public SPObject { }; diff --git a/src/sp-tref.h b/src/sp-tref.h index cc80e48a8..33a8138d1 100644 --- a/src/sp-tref.h +++ b/src/sp-tref.h @@ -28,9 +28,6 @@ #define SP_IS_TREF(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_TREF)) #define SP_IS_TREF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_TREF)) -class SPTRef; -class SPTRef; - struct SPTRef : public SPItem { // Attributes that are used in the same way they would be in a tspan TextTagAttributes attributes; diff --git a/src/sp-use.h b/src/sp-use.h index 399f30a4c..3dd0726aa 100644 --- a/src/sp-use.h +++ b/src/sp-use.h @@ -25,8 +25,6 @@ #define SP_IS_USE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_USE)) #define SP_IS_USE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_USE)) -class SPUse; -class SPUseClass; class SPUseReference; struct SPUse : public SPItem { diff --git a/src/spiral-context.h b/src/spiral-context.h index 12c0b5d68..7f696dfa2 100644 --- a/src/spiral-context.h +++ b/src/spiral-context.h @@ -27,9 +27,6 @@ #define SP_IS_SPIRAL_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_SPIRAL_CONTEXT)) #define SP_IS_SPIRAL_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_SPIRAL_CONTEXT)) -class SPSpiralContext; -class SPSpiralContextClass; - struct SPSpiralContext : public SPEventContext { SPItem * item; Geom::Point center; diff --git a/src/star-context.h b/src/star-context.h index 7bcb26c41..4daafb3e4 100644 --- a/src/star-context.h +++ b/src/star-context.h @@ -25,9 +25,6 @@ #define SP_IS_STAR_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_STAR_CONTEXT)) #define SP_IS_STAR_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_STAR_CONTEXT)) -class SPStarContext; -class SPStarContextClass; - struct SPStarContext : public SPEventContext { SPItem *item; Geom::Point center; diff --git a/src/style.h b/src/style.h index 1c8cb4774..0710f5c8e 100644 --- a/src/style.h +++ b/src/style.h @@ -134,8 +134,6 @@ struct SPILength { #define SP_STYLE_FILL_SERVER(s) ((const_cast (s))->getFillPaintServer()) #define SP_STYLE_STROKE_SERVER(s) ((const_cast (s))->getStrokePaintServer()) -class SVGICCColor; - /// Paint type internal to SPStyle. struct SPIPaint { unsigned set : 1; @@ -246,7 +244,7 @@ struct SPILengthOrNormal { float computed; }; -class SPTextStyle; +struct SPTextStyle; /// Stroke dash details. class NRVpathDash { diff --git a/src/svg-view-widget.h b/src/svg-view-widget.h index d489ccbdd..eab5be75b 100644 --- a/src/svg-view-widget.h +++ b/src/svg-view-widget.h @@ -15,8 +15,6 @@ #include "ui/view/view-widget.h" class SPDocument; -class SPSVGSPViewWidget; -class SPSVGSPViewWidgetClass; #define SP_TYPE_SVG_VIEW_WIDGET (sp_svg_view_widget_get_type ()) #define SP_SVG_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_SVG_VIEW_WIDGET, SPSVGSPViewWidget)) diff --git a/src/svg/svg-color.h b/src/svg/svg-color.h index d1c7bee03..b8e317e3b 100644 --- a/src/svg/svg-color.h +++ b/src/svg/svg-color.h @@ -3,7 +3,7 @@ #include -class SVGICCColor; +struct SVGICCColor; guint32 sp_svg_read_color(gchar const *str, unsigned int dfl); guint32 sp_svg_read_color(gchar const *str, gchar const **end_ptr, guint32 def); diff --git a/src/text-context.h b/src/text-context.h index 9915583eb..a33c69e0a 100644 --- a/src/text-context.h +++ b/src/text-context.h @@ -30,8 +30,6 @@ #define SP_IS_TEXT_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_TEXT_CONTEXT)) struct SPCtrlLine; -class SPTextContext; -class SPTextContextClass; struct SPTextContext : public SPEventContext { diff --git a/src/ui/dialog/layer-properties.h b/src/ui/dialog/layer-properties.h index 9de303f89..0e2f8ed94 100644 --- a/src/ui/dialog/layer-properties.h +++ b/src/ui/dialog/layer-properties.h @@ -80,9 +80,9 @@ protected: void perform(LayerPropertiesDialog &dialog); }; - friend class Rename; - friend class Create; - friend class Move; + friend struct Rename; + friend struct Create; + friend struct Move; Strategy *_strategy; SPDesktop *_desktop; diff --git a/src/ui/dialog/xml-tree.h b/src/ui/dialog/xml-tree.h index 0a6e3a786..58ef3aef8 100644 --- a/src/ui/dialog/xml-tree.h +++ b/src/ui/dialog/xml-tree.h @@ -29,7 +29,7 @@ #include "message.h" class SPDesktop; -struct SPObject; +class SPObject; struct SPXMLViewAttrList; struct SPXMLViewContent; struct SPXMLViewTree; diff --git a/src/ui/tool/node-tool.h b/src/ui/tool/node-tool.h index 49b1496d4..bc5267bb2 100644 --- a/src/ui/tool/node-tool.h +++ b/src/ui/tool/node-tool.h @@ -25,9 +25,6 @@ #define INK_IS_NODE_TOOL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INK_TYPE_NODE_TOOL)) #define INK_IS_NODE_TOOL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INK_TYPE_NODE_TOOL)) -class InkNodeTool; -class InkNodeToolClass; - namespace Inkscape { namespace Display { diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h index 2a7843a51..fa35b815e 100644 --- a/src/ui/widget/registered-widget.h +++ b/src/ui/widget/registered-widget.h @@ -32,7 +32,7 @@ #include -class SPUnit; +struct SPUnit; class SPDocument; namespace Gtk { diff --git a/src/ui/widget/selected-style.h b/src/ui/widget/selected-style.h index 6d5222429..9b78cb17f 100644 --- a/src/ui/widget/selected-style.h +++ b/src/ui/widget/selected-style.h @@ -40,7 +40,7 @@ #include "helper/units.h" class SPDesktop; -class SPUnit; +struct SPUnit; namespace Inkscape { namespace UI { diff --git a/src/ui/widget/style-swatch.h b/src/ui/widget/style-swatch.h index 2b9c32b2e..d7bab3732 100644 --- a/src/ui/widget/style-swatch.h +++ b/src/ui/widget/style-swatch.h @@ -26,7 +26,7 @@ #include "button.h" #include "preferences.h" -class SPUnit; +struct SPUnit; struct SPStyle; class SPCSSAttr; diff --git a/src/undo-stack-observer.h b/src/undo-stack-observer.h index f4d67e841..1057ace8f 100644 --- a/src/undo-stack-observer.h +++ b/src/undo-stack-observer.h @@ -14,7 +14,7 @@ namespace Inkscape { -class Event; +struct Event; /** * Observes changes made to the undo and redo stacks. diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h index 1ed6c6c46..6719691d1 100644 --- a/src/widgets/gradient-vector.h +++ b/src/widgets/gradient-vector.h @@ -33,7 +33,7 @@ class SPDocument; class SPObject; class SPGradient; -class SPStop; +struct SPStop; struct SPGradientVectorSelector { GtkVBox vbox; diff --git a/src/xml/composite-node-observer.h b/src/xml/composite-node-observer.h index 96825d607..3e4b1673a 100644 --- a/src/xml/composite-node-observer.h +++ b/src/xml/composite-node-observer.h @@ -23,7 +23,7 @@ namespace Inkscape { namespace XML { -class NodeEventVector; +struct NodeEventVector; /** * @brief An observer that relays notifications to multiple other observers -- cgit v1.2.3