Cleanup more GObject type definitions

(bzr r12034)

1 files changed, 7 insertions, 18 deletions

diff --git a/src/sp-object-group.h b/src/sp-object-group.h
index a666a316a..88e0e0f4e 100644
--- a/src/sp-object-group.h
+++ b/src/sp-object-group.h
@@ -16,25 +16,17 @@
 
 #include "sp-object.h"
 
-#define SP_TYPE_OBJECTGROUP (SPObjectGroup::sp_objectgroup_get_type ())
-#define SP_OBJECTGROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_OBJECTGROUP, SPObjectGroup))
-#define SP_OBJECTGROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_OBJECTGROUP, SPObjectGroupClass))
-#define SP_IS_OBJECTGROUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_OBJECTGROUP))
+#define SP_TYPE_OBJECTGROUP            (sp_objectgroup_get_type ())
+#define SP_OBJECTGROUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_OBJECTGROUP, SPObjectGroup))
+#define SP_OBJECTGROUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), SP_TYPE_OBJECTGROUP, SPObjectGroupClass))
+#define SP_IS_OBJECTGROUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SP_TYPE_OBJECTGROUP))
 #define SP_IS_OBJECTGROUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SP_TYPE_OBJECTGROUP))
 
-class SPObjectGroup : public SPObject {
-public:
-    static GType sp_objectgroup_get_type(void);
+GType sp_objectgroup_get_type() G_GNUC_CONST;
 
+class SPObjectGroup : public SPObject {
 private:
-    static void init(SPObjectGroup *objectgroup);
-
-    static void childAdded(SPObject * object, Inkscape::XML::Node * child, Inkscape::XML::Node * ref);
-    static void removeChild(SPObject * object, Inkscape::XML::Node * child);
-    static void orderChanged(SPObject * object, Inkscape::XML::Node * child, Inkscape::XML::Node * old_ref, Inkscape::XML::Node * new_ref);
-    static Inkscape::XML::Node *write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
-
-    friend class SPObjectGroupClass;	
+    friend class SPObjectGroupClass;
 };
 
 class SPObjectGroupClass {
@@ -42,9 +34,6 @@ public:
     SPObjectClass parent_class;
 
 private:
-    static void sp_objectgroup_class_init(SPObjectGroupClass *klass);
-    static SPObjectClass *static_parent_class;
-
     friend class SPObjectGroup;	
 };