Clean up of style code: Patch from suv: SPStyle: struct -> class

(bzr r13309)

21 files changed, 30 insertions, 30 deletions

diff --git a/src/desktop-style.h b/src/desktop-style.h
index 47575de75..fc20e97b9 100644
--- a/src/desktop-style.h
+++ b/src/desktop-style.h
@@ -16,10 +16,10 @@
 #include <glib.h>
 
 class ColorRGBA;
-class  SPCSSAttr;
-class  SPDesktop;
-class  SPObject;
-struct SPStyle;
+class SPCSSAttr;
+class SPDesktop;
+class SPObject;
+class SPStyle;
 namespace Inkscape {
 namespace XML {
 class Node;
diff --git a/src/desktop.h b/src/desktop.h
index fec6249e9..be2bf891f 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -54,10 +54,10 @@ class ToolBase;
 }
 }
 
-class  SPItem;
+class SPItem;
 class SPNamedView;
-class  SPObject;
-struct SPStyle;
+class SPObject;
+class SPStyle;
 typedef struct _DocumentInterface DocumentInterface;//struct DocumentInterface;
 
 namespace Gtk
diff --git a/src/display/drawing-group.h b/src/display/drawing-group.h
index 651e9d8af..ab1f9895d 100644
--- a/src/display/drawing-group.h
+++ b/src/display/drawing-group.h
@@ -14,7 +14,7 @@
 
 #include "display/drawing-item.h"
 
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 
diff --git a/src/display/drawing-item.h b/src/display/drawing-item.h
index db803cf60..d89299eeb 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>
 
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 
diff --git a/src/display/drawing-shape.h b/src/display/drawing-shape.h
index 405c789e0..f37de9ce7 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"
 
-struct SPStyle;
+class SPStyle;
 class SPCurve;
 
 namespace Inkscape {
diff --git a/src/display/drawing-text.h b/src/display/drawing-text.h
index b863ca2a4..41039d85d 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"
 
-struct SPStyle;
+class SPStyle;
 class font_instance;
 
 namespace Inkscape {
diff --git a/src/display/nr-filter-primitive.h b/src/display/nr-filter-primitive.h
index 94bd6abb0..214b2cfc5 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"
 
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-style.h b/src/display/nr-style.h
index 717cda899..8b5a0ee3d 100644
--- a/src/display/nr-style.h
+++ b/src/display/nr-style.h
@@ -17,7 +17,7 @@
 #include "color.h"
 
 class SPPaintServer;
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 class DrawingContext;
diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h
index 9d679982a..fb323cd78 100644
--- a/src/extension/implementation/implementation.h
+++ b/src/extension/implementation/implementation.h
@@ -29,7 +29,7 @@ namespace Gtk {
 }
 
 class SPDocument;
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 
diff --git a/src/extension/internal/emf-inout.h b/src/extension/internal/emf-inout.h
index a97cb0a54..fc98958bb 100644
--- a/src/extension/internal/emf-inout.h
+++ b/src/extension/internal/emf-inout.h
@@ -40,7 +40,7 @@ typedef struct {
 } EMF_STRINGS, *PEMF_STRINGS;
 
 typedef struct emf_device_context {
-    struct SPStyle  style;
+    class SPStyle   style;
     char           *font_name;
     bool            stroke_set;
     int             stroke_mode;  // enumeration from drawmode, not used if fill_set is not True
diff --git a/src/extension/internal/wmf-inout.h b/src/extension/internal/wmf-inout.h
index 3d23ca749..94a290873 100644
--- a/src/extension/internal/wmf-inout.h
+++ b/src/extension/internal/wmf-inout.h
@@ -39,7 +39,7 @@ typedef struct {
 } WMF_STRINGS, *PWMF_STRINGS;
 
 typedef struct wmf_device_context {
-    struct SPStyle  style;
+    class SPStyle   style;
     char           *font_name;
     bool            stroke_set;
     int             stroke_mode;  // enumeration from drawmode, not used if fill_set is not True
diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h
index c3ccbffb5..efb5ebc24 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
 
-struct SPStyle;
+class SPStyle;
 class Shape;
 struct SPPrintContext;
 class SVGLength;
diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h
index c42bf98fd..a460388d3 100644
--- a/src/libnrtype/font-lister.h
+++ b/src/libnrtype/font-lister.h
@@ -26,7 +26,7 @@
 class SPObject;
 class SPDocument;
 class SPCSSAttr;
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape
 {
diff --git a/src/libnrtype/font-style-to-pos.h b/src/libnrtype/font-style-to-pos.h
index 56eb391c2..41ba6cf72 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>
 
-struct SPStyle;
+class SPStyle;
 
 NRTypePosDef font_style_to_pos(SPStyle const &style);
 
diff --git a/src/livarot/Path.h b/src/livarot/Path.h
index a109298a2..32ee71ffc 100644
--- a/src/livarot/Path.h
+++ b/src/livarot/Path.h
@@ -20,7 +20,7 @@ struct PathDescrCubicTo;
 struct PathDescrBezierTo;
 struct PathDescrIntermBezierTo;
 
-struct SPStyle;
+class SPStyle;
 
 /*
  * the Path class: a structure to hold path description and their polyline approximation (not kept in sync)
diff --git a/src/print.h b/src/print.h
index 80d0446fd..bbf95b833 100644
--- a/src/print.h
+++ b/src/print.h
@@ -18,7 +18,7 @@ class Window;
 }
 
 class SPDocument;
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 namespace Extension {
diff --git a/src/sp-object.h b/src/sp-object.h
index 9ce5629e6..e58f161d6 100644
--- a/src/sp-object.h
+++ b/src/sp-object.h
@@ -56,7 +56,7 @@ class SPObject;
 #include "util/forward-pointer-iterator.h"
 
 class SPCSSAttr;
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 namespace XML {
diff --git a/src/text-editing.h b/src/text-editing.h
index 04ef6461d..290a39194 100644
--- a/src/text-editing.h
+++ b/src/text-editing.h
@@ -18,11 +18,11 @@
 #include "libnrtype/Layout-TNG.h"
 #include "text-tag-attributes.h"
 
-class  SPCSSAttr;
-class  SPDesktop;
-class  SPItem;
-class  SPObject;
-struct SPStyle;
+class SPCSSAttr;
+class SPDesktop;
+class SPItem;
+class SPObject;
+class SPStyle;
 
 typedef std::pair<Inkscape::Text::Layout::iterator, Inkscape::Text::Layout::iterator> iterator_pair; 
 
diff --git a/src/ui/widget/style-subject.h b/src/ui/widget/style-subject.h
index c2941d995..47da91732 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;
-struct SPStyle;
+class SPStyle;
 
 namespace Inkscape {
 class Selection;
diff --git a/src/ui/widget/style-swatch.h b/src/ui/widget/style-swatch.h
index 23ecbdfda..557ca82e2 100644
--- a/src/ui/widget/style-swatch.h
+++ b/src/ui/widget/style-swatch.h
@@ -29,7 +29,7 @@
 #include "desktop.h"
 #include "preferences.h"
 
-struct SPStyle;
+class SPStyle;
 class SPCSSAttr;
 
 namespace Gtk {
diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h
index d3b3f4116..d6ad3f50c 100644
--- a/src/widgets/paint-selector.h
+++ b/src/widgets/paint-selector.h
@@ -23,7 +23,7 @@
 class SPGradient;
 class SPDesktop;
 class SPPattern;
-struct SPStyle;
+class 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))