gegl r2542 - in trunk: . gegl operations/common operations/external

[neo svn gnome org]

Author: neo
Date: Tue Jul 29 10:19:24 2008
New Revision: 2542
URL: http://svn.gnome.org/viewvc/gegl?rev=2542&view=rev

Log:
2008-07-29  Sven Neumann  <sven gimp org>

	* gegl/gegl-chant.h: renamed chant_parent_class to
	gegl_chant_parent_class. Removed ##type_parent_class as that was
	only an alias for gegl_chant_parent_class.

	* operations/common/layer.c
	* operations/common/load-buffer.c
	* operations/common/load.c
	* operations/common/mblur.c
	* operations/common/open-buffer.c
	* operations/common/rectangle.c
	* operations/external/ff-load.c
	* operations/external/text.c
	* operations/external/v4l.c: changed accordingly.



Modified:
   trunk/ChangeLog
   trunk/gegl/gegl-chant.h
   trunk/operations/common/color-temperature.c
   trunk/operations/common/layer.c
   trunk/operations/common/load-buffer.c
   trunk/operations/common/load.c
   trunk/operations/common/mblur.c
   trunk/operations/common/open-buffer.c
   trunk/operations/external/ff-load.c
   trunk/operations/external/text.c
   trunk/operations/external/v4l.c

Modified: trunk/gegl/gegl-chant.h
==============================================================================
--- trunk/gegl/gegl-chant.h	(original)
+++ trunk/gegl/gegl-chant.h	Tue Jul 29 10:19:24 2008
@@ -36,19 +36,17 @@
 static void gegl_chant_register_type       (GTypeModule *module);
 static void gegl_chant_init_properties     (GeglChant   *self);
 static void gegl_chant_class_intern_init   (gpointer     klass);
-static gpointer chant_parent_class = NULL;
+static gpointer gegl_chant_parent_class = NULL;
 
 #define GEGL_DEFINE_DYNAMIC_OPERATION(T_P)  GEGL_DEFINE_DYNAMIC_OPERATION_EXTENDED (GEGL_CHANT_C_FILE, GeglChant, gegl_chant, T_P, 0, {})
 #define GEGL_DEFINE_DYNAMIC_OPERATION_EXTENDED(C_FILE, TypeName, type_name, TYPE_PARENT, flags, CODE) \
 static void     type_name##_init              (TypeName        *self);  \
 static void     type_name##_class_init        (TypeName##Class *klass); \
 static void     type_name##_class_finalize    (TypeName##Class *klass); \
-static gpointer type_name##_parent_class = NULL;                        \
 static GType    type_name##_type_id = 0;                                \
 static void     type_name##_class_chant_intern_init (gpointer klass)    \
   {                                                                     \
-    type_name##_parent_class = g_type_class_peek_parent (klass);        \
-    chant_parent_class = type_name##_parent_class;                      \
+    gegl_chant_parent_class = g_type_class_peek_parent (klass);         \
     type_name##_class_init ((TypeName##Class*) klass);                  \
     gegl_chant_class_intern_init (klass);                               \
   }                                                                     \
@@ -623,7 +621,7 @@
 {
   GObject *obj;
 
-  obj = G_OBJECT_CLASS (chant_parent_class)->constructor (
+  obj = G_OBJECT_CLASS (gegl_chant_parent_class)->constructor (
             type, n_construct_properties, construct_properties);
 
   g_object_set_data_full (obj, "chant-data", obj, gegl_chant_destroy_notify);

Modified: trunk/operations/common/color-temperature.c
==============================================================================
--- trunk/operations/common/color-temperature.c	(original)
+++ trunk/operations/common/color-temperature.c	Tue Jul 29 10:19:24 2008
@@ -86,7 +86,7 @@
       o->chant_data = NULL;
     }
 
-  G_OBJECT_CLASS (chant_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gegl_chant_parent_class)->finalize (object);
 }
 
 static void
@@ -108,8 +108,8 @@
         }
     }
 
-  if (G_OBJECT_CLASS (chant_parent_class)->notify)
-    G_OBJECT_CLASS (chant_parent_class)->notify (object, pspec);
+  if (G_OBJECT_CLASS (gegl_chant_parent_class)->notify)
+    G_OBJECT_CLASS (gegl_chant_parent_class)->notify (object, pspec);
 }
 
 

Modified: trunk/operations/common/layer.c
==============================================================================
--- trunk/operations/common/layer.c	(original)
+++ trunk/operations/common/layer.c	Tue Jul 29 10:19:24 2008
@@ -218,7 +218,7 @@
   if (self->p_composite_op)
     g_free (self->p_composite_op);
 
-  G_OBJECT_CLASS (chant_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gegl_chant_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/operations/common/load-buffer.c
==============================================================================
--- trunk/operations/common/load-buffer.c	(original)
+++ trunk/operations/common/load-buffer.c	Tue Jul 29 10:19:24 2008
@@ -74,7 +74,7 @@
       o->buffer = NULL;
     }
 
-  G_OBJECT_CLASS (chant_parent_class)->dispose (object);
+  G_OBJECT_CLASS (gegl_chant_parent_class)->dispose (object);
 }
 
 

Modified: trunk/operations/common/load.c
==============================================================================
--- trunk/operations/common/load.c	(original)
+++ trunk/operations/common/load.c	Tue Jul 29 10:19:24 2008
@@ -152,7 +152,7 @@
       self->cached_path = NULL;
     }
 
-  G_OBJECT_CLASS (chant_parent_class)->dispose (object);
+  G_OBJECT_CLASS (gegl_chant_parent_class)->dispose (object);
 }
 
 static void

Modified: trunk/operations/common/mblur.c
==============================================================================
--- trunk/operations/common/mblur.c	(original)
+++ trunk/operations/common/mblur.c	Tue Jul 29 10:19:24 2008
@@ -115,7 +115,7 @@
       o->chant_data = NULL;
     }
 
-  G_OBJECT_CLASS (chant_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gegl_chant_parent_class)->finalize (object);
 }
 
 

Modified: trunk/operations/common/open-buffer.c
==============================================================================
--- trunk/operations/common/open-buffer.c	(original)
+++ trunk/operations/common/open-buffer.c	Tue Jul 29 10:19:24 2008
@@ -101,7 +101,7 @@
       o->chant_data = NULL;
     }
 
-  G_OBJECT_CLASS (chant_parent_class)->dispose (object);
+  G_OBJECT_CLASS (gegl_chant_parent_class)->dispose (object);
 }
 
 

Modified: trunk/operations/external/ff-load.c
==============================================================================
--- trunk/operations/external/ff-load.c	(original)
+++ trunk/operations/external/ff-load.c	Tue Jul 29 10:19:24 2008
@@ -416,7 +416,7 @@
       o->chant_data = NULL;
     }
 
-  G_OBJECT_CLASS (chant_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gegl_chant_parent_class)->finalize (object);
 }
 
 

Modified: trunk/operations/external/text.c
==============================================================================
--- trunk/operations/external/text.c	(original)
+++ trunk/operations/external/text.c	Tue Jul 29 10:19:24 2008
@@ -261,7 +261,7 @@
   if (self->cex.font)
     g_free (self->cex.font);
 
-  G_OBJECT_CLASS (chant_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gegl_chant_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/operations/external/v4l.c
==============================================================================
--- trunk/operations/external/v4l.c	(original)
+++ trunk/operations/external/v4l.c	Tue Jul 29 10:19:24 2008
@@ -182,7 +182,7 @@
       o->chant_data = NULL;
     }
 
-  G_OBJECT_CLASS (chant_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gegl_chant_parent_class)->finalize (object);
 }
 
 static gboolean