Clean up more GObject type definitions

(bzr r12055)

1 files changed, 4 insertions, 19 deletions

diff --git a/src/sp-item.h b/src/sp-item.h
index 2c7bd5a5d..85ef3531e 100644
--- a/src/sp-item.h
+++ b/src/sp-item.h
@@ -101,16 +101,16 @@ public:
 class SPItem;
 class SPItemClass;
 
-#define SP_TYPE_ITEM (SPItem::getType ())
+#define SP_TYPE_ITEM (sp_item_get_type ())
 #define SP_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_ITEM, SPItem))
 #define SP_ITEM_CLASS(clazz) (G_TYPE_CHECK_CLASS_CAST((clazz), SP_TYPE_ITEM, SPItemClass))
 #define SP_IS_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_ITEM))
 
+GType sp_item_get_type() G_GNUC_CONST;
 
 /** Abstract base class for all visible shapes. */
 class SPItem : public SPObject {
 public:
-    static GType getType();
     enum BBoxType {
         // legacy behavior: includes crude stroke, markers; excludes long miters, blur margin; is known to be wrong for caps
         APPROXIMATE_BBOX,
@@ -227,19 +227,7 @@ private:
     mutable bool _is_evaluated;
     mutable EvaluatedStatus _evaluated_status;
 
-    static void sp_item_init(SPItem *item);
-
-    static void sp_item_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
-    static void sp_item_release(SPObject *object);
-    static void sp_item_set(SPObject *object, unsigned key, gchar const *value);
-    static void sp_item_update(SPObject *object, SPCtx *ctx, guint flags);
-    static Inkscape::XML::Node *sp_item_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
-
-    static gchar *sp_item_private_description(SPItem *item);
-    static void sp_item_private_snappoints(SPItem const *item, std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs);
-
     static SPItemView *sp_item_view_new_prepend(SPItemView *list, SPItem *item, unsigned flags, unsigned key, Inkscape::DrawingItem *arenaitem);
-    static SPItemView *sp_item_view_list_remove(SPItemView *list, SPItemView *view);
     static void clip_ref_changed(SPObject *old_clip, SPObject *clip, SPItem *item);
     static void mask_ref_changed(SPObject *old_clip, SPObject *clip, SPItem *item);
 
@@ -278,11 +266,8 @@ public:
     /** Emit event, if applicable */
     gint (* event) (SPItem *item, SPEvent *event);
 
-	private:
-	static SPObjectClass *static_parent_class;
-	static void sp_item_class_init(SPItemClass *klass);
-
-	friend class SPItem;
+private:
+    friend class SPItem;
 };
 
 // Utility