Clean up more GObject type definitions

(bzr r12055)

1 files changed, 2 insertions, 25 deletions

diff --git a/src/sp-shape.h b/src/sp-shape.h
index 453750946..422281cae 100644
--- a/src/sp-shape.h
+++ b/src/sp-shape.h
@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <sigc++/connection.h>
 
-#define SP_TYPE_SHAPE (SPShape::getType ())
+#define SP_TYPE_SHAPE (sp_shape_get_type ())
 #define SP_SHAPE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_SHAPE, SPShape))
 #define SP_SHAPE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_SHAPE, SPShapeClass))
 #define SP_IS_SHAPE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_SHAPE))
@@ -32,13 +32,13 @@
 
 class SPDesktop;
 namespace Inkscape { class DrawingItem; }
+GType sp_shape_get_type (void) G_GNUC_CONST;
 
 /**
  * Base class for shapes, including <path> element
  */
 class SPShape : public SPLPEItem {
 public:
-    static GType getType (void);
     void setShape ();
     SPCurve * getCurve () const;
     SPCurve * getCurveBeforeLPE () const;
@@ -58,26 +58,6 @@ public:
     sigc::connection _modified_connect [SP_MARKER_LOC_QTY];
 
 private:
-    static void sp_shape_init (SPShape *shape);
-    static void sp_shape_finalize (GObject *object);
-
-    static void sp_shape_build (SPObject * object, SPDocument * document, Inkscape::XML::Node * repr);
-    static void sp_shape_release (SPObject *object);
-
-    static void sp_shape_set(SPObject *object, unsigned key, gchar const *value);
-    static void sp_shape_update (SPObject *object, SPCtx *ctx, unsigned int flags);
-    static void sp_shape_modified (SPObject *object, unsigned int flags);
-    static Inkscape::XML::Node *sp_shape_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
-
-    static Geom::OptRect sp_shape_bbox(SPItem const *item, Geom::Affine const &transform, SPItem::BBoxType type);
-    static Inkscape::DrawingItem *sp_shape_show (SPItem *item, Inkscape::Drawing &drawing, unsigned int key, unsigned int flags);
-    static void sp_shape_hide (SPItem *item, unsigned int key);
-    static void sp_shape_snappoints (SPItem const *item, std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs);
-
-    static void sp_shape_update_marker_view (SPShape *shape, Inkscape::DrawingItem *ai);
-
-
-
     friend class SPShapeClass;	
 };
 
@@ -89,9 +69,6 @@ public:
     void (* set_shape) (SPShape *shape);
 
 private:
-    static SPLPEItemClass *parent_class;
-    static void sp_shape_class_init (SPShapeClass *klass);
-
     friend class SPShape;
 };