From ef951d8fabfa365f8ccc8510b912d904ac94a331 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 14 Mar 2013 01:33:10 +0000 Subject: Kill ancient gcc version check in configure.ac and fix a load of broken forward declarations (bzr r12203) --- src/display/canvas-bpath.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/display') diff --git a/src/display/canvas-bpath.h b/src/display/canvas-bpath.h index f0520f012..72eca6eeb 100644 --- a/src/display/canvas-bpath.h +++ b/src/display/canvas-bpath.h @@ -22,7 +22,7 @@ struct SPCanvasBPath; struct SPCanvasBPathClass; struct SPCanvasGroup; -struct SPCurve; +class SPCurve; #define SP_TYPE_CANVAS_BPATH (sp_canvas_bpath_get_type ()) #define SP_CANVAS_BPATH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CANVAS_BPATH, SPCanvasBPath)) -- cgit v1.2.3 From c2fc1ca64cb822e76211d145a2ebcd6ff62a66d2 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 14 Mar 2013 10:28:27 +0000 Subject: Fix another tonne of forward declaration tags (bzr r12204) --- src/display/drawing-group.h | 2 +- src/display/drawing-item.h | 2 +- src/display/drawing-shape.h | 2 +- src/display/drawing-text.h | 2 +- src/display/nr-filter-primitive.h | 2 +- src/display/nr-style.h | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/display') 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; } -- cgit v1.2.3 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/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 +- 6 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src/display') 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)) -- cgit v1.2.3 From 78b82d1a27484ccbfe5fe2d7e14a486b8275ac3a Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 15 Mar 2013 00:39:02 +0000 Subject: Fix even more forward declaration tags (bzr r12206) --- src/display/guideline.h | 2 +- src/display/nr-filter-diffuselighting.h | 6 +++--- src/display/nr-filter-specularlighting.h | 6 +++--- src/display/nr-style.h | 2 +- src/display/nr-svgfonts.h | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/display') diff --git a/src/display/guideline.h b/src/display/guideline.h index 164244c46..2d9a87d9b 100644 --- a/src/display/guideline.h +++ b/src/display/guideline.h @@ -21,7 +21,7 @@ #define SP_GUIDELINE(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_GUIDELINE, SPGuideLine)) #define SP_IS_GUIDELINE(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_GUIDELINE)) -class SPCtrlPoint; +struct SPCtrlPoint; struct SPGuideLine { SPCanvasItem item; diff --git a/src/display/nr-filter-diffuselighting.h b/src/display/nr-filter-diffuselighting.h index 043a5eb39..15cc8e1ff 100644 --- a/src/display/nr-filter-diffuselighting.h +++ b/src/display/nr-filter-diffuselighting.h @@ -19,9 +19,9 @@ #include "display/nr-filter-slot.h" #include "display/nr-filter-units.h" -class SPFeDistantLight; -class SPFePointLight; -class SPFeSpotLight; +struct SPFeDistantLight; +struct SPFePointLight; +struct SPFeSpotLight; struct SVGICCColor; namespace Inkscape { diff --git a/src/display/nr-filter-specularlighting.h b/src/display/nr-filter-specularlighting.h index c57e3a9ff..0d1c0644f 100644 --- a/src/display/nr-filter-specularlighting.h +++ b/src/display/nr-filter-specularlighting.h @@ -17,9 +17,9 @@ #include "display/nr-light-types.h" #include "display/nr-filter-primitive.h" -class SPFeDistantLight; -class SPFePointLight; -class SPFeSpotLight; +struct SPFeDistantLight; +struct SPFePointLight; +struct SPFeSpotLight; struct SVGICCColor; namespace Inkscape { diff --git a/src/display/nr-style.h b/src/display/nr-style.h index 725828089..80547c43e 100644 --- a/src/display/nr-style.h +++ b/src/display/nr-style.h @@ -16,7 +16,7 @@ #include <2geom/rect.h> #include "color.h" -class SPPaintServer; +struct SPPaintServer; struct SPStyle; namespace Inkscape { diff --git a/src/display/nr-svgfonts.h b/src/display/nr-svgfonts.h index 6138e2fbb..1101f93f2 100644 --- a/src/display/nr-svgfonts.h +++ b/src/display/nr-svgfonts.h @@ -18,8 +18,8 @@ class SvgFont; struct SPFont; -class SPGlyph; -class SPMissingGlyph; +struct SPGlyph; +struct SPMissingGlyph; struct _GdkEventExpose; typedef _GdkEventExpose GdkEventExpose; -- cgit v1.2.3