Merge from branch

(bzr r11950.1.18)

1 files changed, 2 insertions, 81 deletions

diff --git a/src/sp-object.h b/src/sp-object.h
index 0c4429a74..b3f3e6c2f 100644
--- a/src/sp-object.h
+++ b/src/sp-object.h
@@ -18,7 +18,7 @@
 class SPObject;
 class SPObjectClass;
 
-#define SP_TYPE_OBJECT (SPObject::get_type ())
+#define SP_TYPE_OBJECT (sp_object_get_type())
 #define SP_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_OBJECT, SPObject))
 #define SP_OBJECT_CLASS(clazz) (G_TYPE_CHECK_CLASS_CAST((clazz), SP_TYPE_OBJECT, SPObjectClass))
 #define SP_IS_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_OBJECT))
@@ -122,6 +122,7 @@ struct SPIXmlSpace {
     guint value : 1;
 };
 
+GType sp_object_get_type() G_GNUC_CONST;
 
 /*
  * Refcounting
@@ -226,7 +227,6 @@ public:
     /**
      * Returns the XML representation of tree
      */
-    //Inkscape::XML::Node const* getRepr() const;
 //protected:
     Inkscape::XML::Node * getRepr();
 
@@ -796,78 +796,6 @@ private:
      */
     GString * textualContent() const;
 
-    /**
-     * Callback to initialize the SPObject object.
-     */
-    static void init(SPObject *object);
-
-    /**
-     * Callback to destroy all members and connections of object and itself.
-     */
-    static void finalize(GObject *object);
-
-    /**
-     * Callback for child_added event.
-     * Invoked whenever the given mutation event happens in the XML tree.
-     */
-    static void child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref);
-
-    /**
-     * Remove object's child whose node equals repr, release and
-     * unref it.
-     *
-     * Invoked whenever the given mutation event happens in the XML
-     * tree, BEFORE removal from the XML tree happens, so grouping
-     * objects can safely release the child data.
-     */
-    static void remove_child(SPObject *object, Inkscape::XML::Node *child);
-
-    /**
-     * Move object corresponding to child after sibling object corresponding
-     * to new_ref.
-     * Invoked whenever the given mutation event happens in the XML tree.
-     * @param old_ref Ignored
-     */
-    static void order_changed(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *old_ref, Inkscape::XML::Node *new_ref);
-
-    /**
-     * Removes, releases and unrefs all children of object.
-     *
-     * This is the opposite of build. It has to be invoked as soon as the
-     * object is removed from the tree, even if it is still alive according
-     * to reference count. The frontend unregisters the object from the
-     * document and releases the SPRepr bindings; implementations should free
-     * state data and release all child objects.  Invoking release on
-     * SPRoot destroys the whole document tree.
-     * @see build()
-     */
-    static void release(SPObject *object);
-
-    /**
-     * Virtual build callback.
-     *
-     * This has to be invoked immediately after creation of an SPObject. The
-     * frontend method ensures that the new object is properly attached to
-     * the document and repr; implementation then will parse all of the attributes,
-     * generate the children objects and so on.  Invoking build on the SPRoot
-     * object results in creation of the whole document tree (this is, what
-     * SPDocument does after the creation of the XML tree).
-     * @see release()
-     */
-    static void build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
-
-    /**
-     * Callback for set event.
-     */
-    static void private_set(SPObject *object, unsigned int key, gchar const *value);
-
-    /**
-     * Callback for write event.
-     */
-    static Inkscape::XML::Node *private_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
-
-    static gchar *get_unique_id(SPObject *object, gchar const *defid);
-
     /* Real handlers of repr signals */
 
 public:
@@ -935,13 +863,6 @@ public:
     Inkscape::XML::Node * (* write) (SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, unsigned int flags);
 
 private:
-    static GObjectClass *static_parent_class;
-
-    /**
-     * Initializes the SPObject vtable.
-     */
-    static void init(SPObjectClass *klass);
-
     friend class SPObject;
 };