mixed usage of class and struct for same object

(bzr r10766.1.1)

31 files changed, 58 insertions, 58 deletions

diff --git a/src/conn-avoid-ref.h b/src/conn-avoid-ref.h
index f99d1f0cb..89e86ded7 100644
--- a/src/conn-avoid-ref.h
+++ b/src/conn-avoid-ref.h
@@ -13,12 +13,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
+#include <glib/gslist.h>
 #include <stddef.h>
 #include <sigc++/connection.h>
 
-struct SPDesktop;
-struct SPItem;
+class  SPDesktop;
+class  SPItem;
 struct ConnectionPoint;
 typedef std::map<int, ConnectionPoint> IdConnectionPointMap;
 namespace Avoid { class ShapeRef; }
diff --git a/src/context-fns.h b/src/context-fns.h
index c56c67a27..12d6e6194 100644
--- a/src/context-fns.h
+++ b/src/context-fns.h
@@ -14,8 +14,8 @@
 #include <gdk/gdk.h>
 #include <2geom/forward.h>
 
-struct SPDesktop;
-struct SPItem;
+class  SPDesktop;
+class  SPItem;
 struct SPEventContext;
 
 const double goldenratio = 1.61803398874989484820; // golden ratio
diff --git a/src/desktop-events.h b/src/desktop-events.h
index e573fc878..cac7e089f 100644
--- a/src/desktop-events.h
+++ b/src/desktop-events.h
@@ -16,9 +16,9 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-class SPDesktop;
-class SPDesktopWidget;
-class SPCanvasItem;
+class  SPDesktop;
+class  SPDesktopWidget;
+struct SPCanvasItem;
 
 /* Item handlers */
 
diff --git a/src/desktop-style.h b/src/desktop-style.h
index 3719c2a9e..81485420b 100644
--- a/src/desktop-style.h
+++ b/src/desktop-style.h
@@ -17,8 +17,8 @@
 
 class ColorRGBA;
 struct SPCSSAttr;
-struct SPDesktop;
-struct SPObject;
+class  SPDesktop;
+class  SPObject;
 struct SPStyle;
 namespace Inkscape {
 namespace XML {
diff --git a/src/desktop.h b/src/desktop.h
index 8921f45b8..b466fff15 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -44,9 +44,9 @@ struct SPCanvas;
 struct SPCanvasItem;
 struct SPCanvasGroup;
 struct SPEventContext;
-struct SPItem;
+class  SPItem;
 struct SPNamedView;
-struct SPObject;
+class  SPObject;
 struct SPStyle;
 typedef struct _DocumentInterface DocumentInterface;//struct DocumentInterface;
 
diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h
index e63d660fe..1f8bad51d 100644
--- a/src/display/canvas-axonomgrid.h
+++ b/src/display/canvas-axonomgrid.h
@@ -24,7 +24,7 @@
 
 #include "canvas-grid.h"
 
-struct SPDesktop;
+class  SPDesktop;
 struct SPNamedView;
 
 namespace Inkscape {
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h
index 10feeca0e..f7cc3c032 100644
--- a/src/display/canvas-grid.h
+++ b/src/display/canvas-grid.h
@@ -24,10 +24,10 @@
 #include "snapper.h"
 #include "line-snapper.h"
 
-struct SPDesktop;
+class  SPDesktop;
 struct SPNamedView;
 struct SPCanvasBuf;
-class SPDocument;
+class  SPDocument;
 
 namespace Inkscape {
 
diff --git a/src/display/canvas-text.h b/src/display/canvas-text.h
index 85333d84e..90c02717c 100644
--- a/src/display/canvas-text.h
+++ b/src/display/canvas-text.h
@@ -16,8 +16,8 @@
 
 #include "sp-canvas-item.h"
 
-struct SPItem;
-struct SPDesktop;
+class SPItem;
+class SPDesktop;
 
 #define SP_TYPE_CANVASTEXT (sp_canvastext_get_type ())
 #define SP_CANVASTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CANVASTEXT, SPCanvasText))
diff --git a/src/display/sp-ctrlline.h b/src/display/sp-ctrlline.h
index eeed7e75d..4bfe50a77 100644
--- a/src/display/sp-ctrlline.h
+++ b/src/display/sp-ctrlline.h
@@ -16,7 +16,7 @@
 
 #include "sp-canvas-item.h"
 
-struct SPItem;
+class SPItem;
 
 #define SP_TYPE_CTRLLINE (sp_ctrlline_get_type ())
 #define SP_CTRLLINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CTRLLINE, SPCtrlLine))
diff --git a/src/display/sp-ctrlpoint.h b/src/display/sp-ctrlpoint.h
index 907f74bf8..a7a5475b7 100644
--- a/src/display/sp-ctrlpoint.h
+++ b/src/display/sp-ctrlpoint.h
@@ -14,7 +14,7 @@
 
 #include "sp-canvas-item.h"
 
-struct SPItem;
+class SPItem;
 
 #define SP_TYPE_CTRLPOINT (sp_ctrlpoint_get_type ())
 #define SP_CTRLPOINT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CTRLPOINT, SPCtrlPoint))
diff --git a/src/document.h b/src/document.h
index efb14123a..b799cb832 100644
--- a/src/document.h
+++ b/src/document.h
@@ -39,8 +39,8 @@ class Router;
 }
 
 struct SPDesktop;
-struct SPItem;
-struct SPObject;
+class  SPItem;
+class  SPObject;
 struct SPGroup;
 struct SPRoot;
 struct SPUnit;
diff --git a/src/event-context.h b/src/event-context.h
index 1c9f46a46..1e641e6ef 100644
--- a/src/event-context.h
+++ b/src/event-context.h
@@ -20,9 +20,9 @@
 #include "preferences.h"
 
 struct GrDrag;
-struct SPDesktop;
-struct SPItem;
-class ShapeEditor;
+class  SPDesktop;
+class  SPItem;
+class  ShapeEditor;
 struct SPEventContext;
 
 namespace Inkscape {
diff --git a/src/gradient-drag.h b/src/gradient-drag.h
index cb3f13e71..8aa9a6550 100644
--- a/src/gradient-drag.h
+++ b/src/gradient-drag.h
@@ -24,12 +24,12 @@
 
 #include "knot-enums.h"
 
-struct SPItem;
 struct SPKnot;
 
 class SPDesktop;
 class SPCSSAttr;
 class SPLinearGradient;
+class SPItem;
 class SPObject;
 class SPRadialGradient;
 class SPStop;
diff --git a/src/knot-holder-entity.h b/src/knot-holder-entity.h
index e708486ca..5422e6d1b 100644
--- a/src/knot-holder-entity.h
+++ b/src/knot-holder-entity.h
@@ -19,7 +19,7 @@
 #include <2geom/forward.h>
 #include "snapper.h"
 
-struct SPItem;
+class  SPItem;
 struct SPKnot;
 
 class SPDesktop;
diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h
index 91d09fef6..48577c225 100644
--- a/src/live_effects/effect.h
+++ b/src/live_effects/effect.h
@@ -21,13 +21,13 @@
 
 struct SPDocument;
 struct SPDesktop;
-struct SPItem;
-class SPNodeContext;
+class  SPItem;
+class  SPNodeContext;
 struct LivePathEffectObject;
-class SPLPEItem;
-class KnotHolder;
-class KnotHolderEntity;
-class SPPath;
+class  SPLPEItem;
+class  KnotHolder;
+class  KnotHolderEntity;
+class  SPPath;
 struct SPCurve;
 
 namespace Gtk {
diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h
index fe93e8dca..92c2c8b41 100644
--- a/src/live_effects/parameter/parameter.h
+++ b/src/live_effects/parameter/parameter.h
@@ -15,8 +15,8 @@
 
 class KnotHolder;
 class SPLPEItem;
-struct SPDesktop;
-struct SPItem;
+class SPDesktop;
+class SPItem;
 
 namespace Gtk {
     class Widget;
diff --git a/src/object-snapper.h b/src/object-snapper.h
index d51cade93..59e2f10ce 100644
--- a/src/object-snapper.h
+++ b/src/object-snapper.h
@@ -16,8 +16,8 @@
 #include "snap-candidate.h"
 
 struct SPNamedView;
-struct SPItem;
-struct SPObject;
+class  SPItem;
+class  SPObject;
 
 namespace Inkscape
 {
diff --git a/src/rubberband.h b/src/rubberband.h
index 1b71f9ae2..fbebe2b08 100644
--- a/src/rubberband.h
+++ b/src/rubberband.h
@@ -17,10 +17,10 @@
 
 /* fixme: do multidocument safe */
 
-class CtrlRect;
-class SPCanvasItem;
-class SPCurve;
-class SPDesktop;
+class  CtrlRect;
+struct SPCanvasItem;
+class  SPCurve;
+class  SPDesktop;
 
 enum {
     RUBBERBAND_MODE_RECT,
diff --git a/src/selcue.h b/src/selcue.h
index 0869a597d..f62ef768a 100644
--- a/src/selcue.h
+++ b/src/selcue.h
@@ -17,8 +17,8 @@
 #include <stddef.h>
 #include <sigc++/sigc++.h>
 
-class SPDesktop;
-class SPCanvasItem;
+class  SPDesktop;
+struct SPCanvasItem;
 
 namespace Inkscape {
 
diff --git a/src/seltrans.h b/src/seltrans.h
index 3804caef3..122e7a522 100644
--- a/src/seltrans.h
+++ b/src/seltrans.h
@@ -27,9 +27,9 @@
 #include "sp-item.h"
 
 struct SPKnot;
-class SPDesktop;
-class SPCanvasItem;
-class SPSelTransHandle;
+class  SPDesktop;
+struct SPCanvasItem;
+class  SPSelTransHandle;
 
 namespace Inkscape
 {
diff --git a/src/snap-candidate.h b/src/snap-candidate.h
index 1c5cf3234..5f17c8572 100644
--- a/src/snap-candidate.h
+++ b/src/snap-candidate.h
@@ -17,7 +17,7 @@
 //#include "snapped-point.h"
 #include "snap-enums.h"
 
-struct SPItem; // forward declaration
+class SPItem; // forward declaration
 
 namespace Inkscape {
 
diff --git a/src/snapper.h b/src/snapper.h
index f5fbd4fdc..78d32c12c 100644
--- a/src/snapper.h
+++ b/src/snapper.h
@@ -31,7 +31,7 @@ struct IntermSnapResults {
 };
 
 class SnapManager;
-struct SPItem;
+class SPItem;
 
 namespace Inkscape
 {
diff --git a/src/sp-shape.h b/src/sp-shape.h
index 014158b21..c5e9588b3 100644
--- a/src/sp-shape.h
+++ b/src/sp-shape.h
@@ -31,7 +31,7 @@
 
 #define SP_SHAPE_WRITE_PATH (1 << 2)
 
-struct SPDesktop;
+class SPDesktop;
 
 namespace Inkscape {
 
diff --git a/src/splivarot.h b/src/splivarot.h
index 40089ad71..9dc596888 100644
--- a/src/splivarot.h
+++ b/src/splivarot.h
@@ -11,7 +11,7 @@
 #include <2geom/forward.h>
 #include <2geom/path.h>
 class SPCurve;
-struct SPItem;
+class SPItem;
 
 // boolean operations
 // work on the current selection
diff --git a/src/svg-view.h b/src/svg-view.h
index 33a9b569a..aaaa8a9a5 100644
--- a/src/svg-view.h
+++ b/src/svg-view.h
@@ -14,7 +14,7 @@
 #include "ui/view/view.h"
 
 class SPCanvasGroup;
-class SPCanvasItem;
+struct SPCanvasItem;
 
 
 /**
diff --git a/src/text-editing.h b/src/text-editing.h
index c0f104dec..37527d385 100644
--- a/src/text-editing.h
+++ b/src/text-editing.h
@@ -18,9 +18,9 @@
 #include "libnrtype/Layout-TNG.h"
 #include "text-tag-attributes.h"
 
-class SPCSSAttr;
-struct SPItem;
-struct SPObject;
+class  SPCSSAttr;
+class  SPItem;
+class  SPObject;
 struct SPStyle;
 
 typedef std::pair<Inkscape::Text::Layout::iterator, Inkscape::Text::Layout::iterator> iterator_pair; 
diff --git a/src/trace/trace.h b/src/trace/trace.h
index 29b8716ee..a7fbe0cc8 100644
--- a/src/trace/trace.h
+++ b/src/trace/trace.h
@@ -27,7 +27,7 @@
 #include <sp-shape.h>
 
 struct SPImage;
-struct SPItem;
+class  SPItem;
 
 namespace Inkscape {
 
diff --git a/src/ui/dialog/calligraphic-profile-rename.h b/src/ui/dialog/calligraphic-profile-rename.h
index e9f6a8b95..f0eb0b491 100644
--- a/src/ui/dialog/calligraphic-profile-rename.h
+++ b/src/ui/dialog/calligraphic-profile-rename.h
@@ -15,7 +15,7 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/label.h>
 #include <gtkmm/table.h>
-struct SPDesktop;
+class SPDesktop;
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/dialog/icon-preview.h b/src/ui/dialog/icon-preview.h
index 9c10eb89b..ec4b3cac4 100644
--- a/src/ui/dialog/icon-preview.h
+++ b/src/ui/dialog/icon-preview.h
@@ -26,7 +26,7 @@
 #include "ui/widget/panel.h"
 #include "desktop-tracker.h"
 
-struct SPObject;
+class SPObject;
 namespace Glib {
 class Timer;
 }
diff --git a/src/ui/widget/ruler.h b/src/ui/widget/ruler.h
index 319624709..1a455a325 100644
--- a/src/ui/widget/ruler.h
+++ b/src/ui/widget/ruler.h
@@ -14,7 +14,7 @@
 #include <2geom/point.h>
 
 struct SPCanvasItem;
-struct SPDesktop;
+class  SPDesktop;
 namespace Glib {
     class ustring;
 }
diff --git a/src/widgets/select-toolbar.h b/src/widgets/select-toolbar.h
index a4c42880f..e3573da66 100644
--- a/src/widgets/select-toolbar.h
+++ b/src/widgets/select-toolbar.h
@@ -15,7 +15,7 @@
  */
 
 #include <gtk/gtk.h>
-struct SPDesktop;
+class SPDesktop;
 
 void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder);