Filter effects dialog:

[inkscape.git] / src / sp-femerge.cpp

diff --git a/src/sp-femerge.cpp b/src/sp-femerge.cpp
index 6904f5b52db541e6a867ba4678b4fe961de5d040..2b262db0d2cfadbac7cae03ea6952b889d41735c 100644 (file)
--- a/src/sp-femerge.cpp
+++ b/src/sp-femerge.cpp
@@ -22,19 +22,6 @@
 #include "sp-femerge.h"
 #include "xml/repr.h"
 
-//#define SP_MACROS_SILENT
-//#include "macros.h"
-
-#define DEBUG_FEMERGE
-#ifdef DEBUG_FEMERGE
-# define debug(f, a...) { g_print("%s(%d) %s:", \
-                                  __FILE__,__LINE__,__FUNCTION__); \
-                          g_print(f, ## a); \
-                          g_print("\n"); \
-                        }
-#else
-# define debug(f, a...) /**/
-#endif
 
 /* FeMerge base class */
 
@@ -47,7 +34,7 @@ static void sp_feMerge_set(SPObject *object, unsigned int key, gchar const *valu
 static void sp_feMerge_update(SPObject *object, SPCtx *ctx, guint flags);
 static Inkscape::XML::Node *sp_feMerge_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
 
-static SPObjectClass *feMerge_parent_class;
+static SPFilterPrimitiveClass *feMerge_parent_class;
 
 GType
 sp_feMerge_get_type()
@@ -65,7 +52,7 @@ sp_feMerge_get_type()
             (GInstanceInitFunc) sp_feMerge_init,
             NULL,    /* value_table */
         };
-        feMerge_type = g_type_register_static(SP_TYPE_OBJECT, "SPFeMerge", &feMerge_info, (GTypeFlags)0);
+        feMerge_type = g_type_register_static(SP_TYPE_FILTER_PRIMITIVE, "SPFeMerge", &feMerge_info, (GTypeFlags)0);
     }
     return feMerge_type;
 }
@@ -75,7 +62,7 @@ sp_feMerge_class_init(SPFeMergeClass *klass)
 {
     SPObjectClass *sp_object_class = (SPObjectClass *)klass;
 
-    feMerge_parent_class = (SPObjectClass*)g_type_class_peek_parent(klass);
+    feMerge_parent_class = (SPFilterPrimitiveClass*)g_type_class_peek_parent(klass);
 
     sp_object_class->build = sp_feMerge_build;
     sp_object_class->release = sp_feMerge_release;
@@ -87,7 +74,6 @@ sp_feMerge_class_init(SPFeMergeClass *klass)
 static void
 sp_feMerge_init(SPFeMerge *feMerge)
 {
-    debug("0x%p",feMerge);
 }
 
 /**
@@ -98,7 +84,6 @@ sp_feMerge_init(SPFeMerge *feMerge)
 static void
 sp_feMerge_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
 {
-    debug("0x%p",object);
     if (((SPObjectClass *) feMerge_parent_class)->build) {
         ((SPObjectClass *) feMerge_parent_class)->build(object, document, repr);
     }
@@ -112,8 +97,6 @@ sp_feMerge_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *re
 static void
 sp_feMerge_release(SPObject *object)
 {
-    debug("0x%p",object);
-
     if (((SPObjectClass *) feMerge_parent_class)->release)
         ((SPObjectClass *) feMerge_parent_class)->release(object);
 }
@@ -124,11 +107,10 @@ sp_feMerge_release(SPObject *object)
 static void
 sp_feMerge_set(SPObject *object, unsigned int key, gchar const *value)
 {
-    debug("0x%p %s(%u): '%s'",object,
-            sp_attribute_name(key),key,value);
     SPFeMerge *feMerge = SP_FEMERGE(object);
+    (void)feMerge;
 
-    switch(key) {\r
+    switch(key) {
        /*DEAL WITH SETTING ATTRIBUTES HERE*/
         default:
             if (((SPObjectClass *) feMerge_parent_class)->set)
@@ -144,8 +126,6 @@ sp_feMerge_set(SPObject *object, unsigned int key, gchar const *value)
 static void
 sp_feMerge_update(SPObject *object, SPCtx *ctx, guint flags)
 {
-    debug("0x%p",object);
-
     if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG |
                  SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) {
 
@@ -164,15 +144,13 @@ sp_feMerge_update(SPObject *object, SPCtx *ctx, guint flags)
 static Inkscape::XML::Node *
 sp_feMerge_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
 {
-    debug("0x%p",object);
-
     // Inkscape-only object, not copied during an "plain SVG" dump:
     if (flags & SP_OBJECT_WRITE_EXT) {
         if (repr) {
             // is this sane?
             repr->mergeFrom(SP_OBJECT_REPR(object), "id");
         } else {
-            repr = SP_OBJECT_REPR(object)->duplicate();
+            repr = SP_OBJECT_REPR(object)->duplicate(NULL); // FIXME
         }
     }