Yet mor in c++ification

[inkscape.git] / src / sp-defs.h

diff --git a/src/sp-defs.h b/src/sp-defs.h
index 4b6f7a5b712b3c49bd6b059f00f5edf46a733bb0..c88aef81e61cf5ef824aa847eaee7bc0d3f3ea95 100644 (file)
--- a/src/sp-defs.h
+++ b/src/sp-defs.h
@@ -14,20 +14,38 @@
 
 #include "sp-object.h"
 
-#define SP_TYPE_DEFS            (sp_defs_get_type())
+#define SP_TYPE_DEFS            (SPDefs::sp_defs_get_type())
 #define SP_DEFS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), SP_TYPE_DEFS, SPDefs))
 #define SP_DEFS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), SP_TYPE_DEFS, SPDefsClass))
 #define SP_IS_DEFS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), SP_TYPE_DEFS))
 #define SP_IS_DEFS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_DEFS))
 
-struct SPDefs : public SPObject {
+class SPDefs : public SPObject {
+       public:
+               static GType sp_defs_get_type(void);
+       
+       private:
+               static void sp_defs_init(SPDefs *defs);
+               static void sp_defs_release(SPObject *object);
+               static void sp_defs_update(SPObject *object, SPCtx *ctx, guint flags);
+               static void sp_defs_modified(SPObject *object, guint flags);
+               static Inkscape::XML::Node *sp_defs_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
+
+       friend class SPDefsClass;       
 };
 
-struct SPDefsClass {
-    SPObjectClass parent_class;
+class SPDefsClass {
+       public:
+               SPObjectClass parent_class;
+
+       private:
+               static void sp_defs_class_init(SPDefsClass *dc);
+               static SPObjectClass *static_parent_class;
+
+       friend class SPDefs;    
 };
 
-GType sp_defs_get_type(void);
+//GType sp_defs_get_type(void);
 
 
 #endif /* !SEEN_SP_DEFS_H */