Commit a69c4df8 authored by Øyvind Kolås's avatar Øyvind Kolås

s/associate/attach/ in the API, perhaps this should even be passed the

node it is being attached to as a parameter.
* gegl/gegl-node.c: (gegl_node_set_operation_object):
* gegl/gegl-operation-composer.c:
(gegl_operation_composer_class_init), (attach):
* gegl/gegl-operation-filter.c: (gegl_operation_filter_class_init),
(attach):
* gegl/gegl-operation-sink.c: (gegl_operation_sink_class_init),
(attach):
* gegl/gegl-operation-source.c: (gegl_operation_source_class_init),
(attach):
* gegl/gegl-operation.c: (gegl_operation_class_init), (attach),
(gegl_operation_attach):
* gegl/gegl-operation.h:
* operations/color/remap.c: (attach),
(gegl_operation_remap_class_init):
* operations/file-io/load.c: (attach), (class_init):
* operations/meta/dropshadow.c: (attach), (class_init):
* operations/meta/layer.c: (attach), (class_init):
* operations/meta/tonemap.c: (attach), (class_init):
* operations/meta/unsharp-mask.c: (attach), (class_init):
* operations/workshop/dog.c: (attach), (class_init):
parent be210754
2006-12-29 Øyvind Kolås <pippin@gimp.org>
* NEWS: added generic feature blurb as first news item in NEWS file.
s/associate/attach/ in the API, perhaps this should even be passed the
node it is being attached to as a parameter.
* gegl/gegl-node.c: (gegl_node_set_operation_object):
* gegl/gegl-operation-composer.c:
(gegl_operation_composer_class_init), (attach):
* gegl/gegl-operation-filter.c: (gegl_operation_filter_class_init),
(attach):
* gegl/gegl-operation-sink.c: (gegl_operation_sink_class_init),
(attach):
* gegl/gegl-operation-source.c: (gegl_operation_source_class_init),
(attach):
* gegl/gegl-operation.c: (gegl_operation_class_init), (attach),
(gegl_operation_attach):
* gegl/gegl-operation.h:
* operations/color/remap.c: (attach),
(gegl_operation_remap_class_init):
* operations/file-io/load.c: (attach), (class_init):
* operations/meta/dropshadow.c: (attach), (class_init):
* operations/meta/layer.c: (attach), (class_init):
* operations/meta/tonemap.c: (attach), (class_init):
* operations/meta/unsharp-mask.c: (attach), (class_init):
* operations/workshop/dog.c: (attach), (class_init):
2006-12-29 Øyvind Kolås <pippin@gimp.org>
* docs/Makefile.am: removed libtool barf in scrabed usage information.
* NEWS: added generic feature blurb as first news item in NEWS file.
2006-12-29 Øyvind Kolås <pippin@gimp.org>
......
......@@ -964,7 +964,7 @@ gegl_node_set_operation_object (GeglNode *self,
gegl_node_disconnect_sinks (self);
/* FIXME: handle this in a more generic way, but it is needed to allow
* the associate to work properly.
* the attach to work properly.
*/
if (gegl_node_get_pad (self, "output"))
......@@ -974,7 +974,7 @@ gegl_node_set_operation_object (GeglNode *self,
if (gegl_node_get_pad (self, "aux"))
gegl_node_remove_pad (self, gegl_node_get_pad (self, "aux"));
gegl_operation_associate (operation, self);
gegl_operation_attach (operation, self);
if (input)
gegl_node_connect_from (self, "input", input, "output");
......
......@@ -45,7 +45,7 @@ static void set_property (GObject *gobject,
static gboolean process (GeglOperation *operation,
gpointer dynamic_id,
const gchar *output_prop);
static void associate (GeglOperation *operation);
static void attach (GeglOperation *operation);
static GeglRectangle get_defined_region (GeglOperation *self);
static gboolean calc_source_regions (GeglOperation *self,
......@@ -65,7 +65,7 @@ gegl_operation_composer_class_init (GeglOperationComposerClass * klass)
object_class->get_property = get_property;
operation_class->process = process;
operation_class->associate = associate;
operation_class->attach = attach;
operation_class->get_defined_region = get_defined_region;
operation_class->calc_source_regions = calc_source_regions;
......@@ -101,7 +101,7 @@ gegl_operation_composer_init (GeglOperationComposer *self)
}
static void
associate (GeglOperation *self)
attach (GeglOperation *self)
{
GeglOperation *operation = GEGL_OPERATION (self);
GObjectClass *object_class = G_OBJECT_GET_CLASS (self);
......
......@@ -42,7 +42,7 @@ static gboolean process (GeglOperation *operation,
gpointer dynamic_id,
const gchar *output_prop);
static void associate (GeglOperation *operation);
static void attach (GeglOperation *operation);
static GeglRectangle get_defined_region (GeglOperation *self);
static gboolean calc_source_regions (GeglOperation *self,
......@@ -61,7 +61,7 @@ gegl_operation_filter_class_init (GeglOperationFilterClass * klass)
object_class->get_property = get_property;
operation_class->process = process;
operation_class->associate = associate;
operation_class->attach = attach;
operation_class->get_defined_region = get_defined_region;
operation_class->calc_source_regions = calc_source_regions;
......@@ -90,7 +90,7 @@ gegl_operation_filter_init (GeglOperationFilter *self)
}
static void
associate (GeglOperation *self)
attach (GeglOperation *self)
{
GeglOperation *operation = GEGL_OPERATION (self);
GObjectClass *object_class = G_OBJECT_GET_CLASS (self);
......
......@@ -41,7 +41,7 @@ static gboolean process (GeglOperation *operation,
gpointer dynamic_id,
const gchar *output_prop);
static void associate (GeglOperation *operation);
static void attach (GeglOperation *operation);
static GeglRectangle get_defined_region (GeglOperation *self);
static gboolean calc_source_regions (GeglOperation *self,
......@@ -60,7 +60,7 @@ gegl_operation_sink_class_init (GeglOperationSinkClass * klass)
object_class->get_property = get_property;
operation_class->process = process;
operation_class->associate = associate;
operation_class->attach = attach;
operation_class->get_defined_region = get_defined_region;
operation_class->calc_source_regions = calc_source_regions;
......@@ -81,7 +81,7 @@ gegl_operation_sink_init (GeglOperationSink *self)
}
static void
associate (GeglOperation *self)
attach (GeglOperation *self)
{
GeglOperation *operation = GEGL_OPERATION (self);
GObjectClass *object_class = G_OBJECT_GET_CLASS (self);
......
......@@ -38,7 +38,7 @@ static void set_property (GObject *gobject,
static gboolean process (GeglOperation *operation,
gpointer dynamic_id,
const gchar *output_prop);
static void associate (GeglOperation *operation);
static void attach (GeglOperation *operation);
......@@ -58,7 +58,7 @@ gegl_operation_source_class_init (GeglOperationSourceClass * klass)
gobject_class->get_property = get_property;
operation_class->process = process;
operation_class->associate = associate;
operation_class->attach = attach;
operation_class->get_defined_region = get_defined_region;
operation_class->calc_source_regions = calc_source_regions;
......@@ -79,7 +79,7 @@ gegl_operation_source_init (GeglOperationSource *self)
}
static void
associate (GeglOperation *self)
attach (GeglOperation *self)
{
GeglOperation *operation = GEGL_OPERATION (self);
GObjectClass *object_class = G_OBJECT_GET_CLASS (self);
......
......@@ -33,7 +33,7 @@
static void gegl_operation_class_init (GeglOperationClass *klass);
static void gegl_operation_init (GeglOperation *self);
static void associate (GeglOperation *self);
static void attach (GeglOperation *self);
static GeglRectangle get_defined_region (GeglOperation *self);
static GeglRectangle get_affected_region (GeglOperation *self,
......@@ -51,7 +51,7 @@ gegl_operation_class_init (GeglOperationClass * klass)
when doing operation lookup by name */
klass->description = NULL;
klass->associate = associate;
klass->attach = attach;
klass->prepare = NULL;
klass->get_defined_region = get_defined_region;
klass->get_affected_region = get_affected_region;
......@@ -150,7 +150,7 @@ gegl_operation_calc_source_regions (GeglOperation *self,
}
static void
associate (GeglOperation *self)
attach (GeglOperation *self)
{
g_warning ("kilroy was at What The Hack (%p, %s)\n", (void*)self,
G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS(self)));
......@@ -158,8 +158,8 @@ associate (GeglOperation *self)
}
void
gegl_operation_associate (GeglOperation *self,
GeglNode *node)
gegl_operation_attach (GeglOperation *self,
GeglNode *node)
{
GeglOperationClass *klass;
......@@ -168,9 +168,9 @@ gegl_operation_associate (GeglOperation *self,
klass = GEGL_OPERATION_GET_CLASS (self);
g_assert (klass->associate);
g_assert (klass->attach);
self->node = node;
klass->associate (self);
klass->attach (self);
}
void
......
......@@ -59,10 +59,10 @@ struct _GeglOperationClass
gchar *description; /* textual description of the operation */
char *categories; /* a colon seperated list of categories */
/* associate this operation with a GeglNode, override this if you are
/* attach this operation with a GeglNode, override this if you are
* creating a GeglGraph, it is already defined for Filters/Sources/Composers.
*/
void (*associate) (GeglOperation *self);
void (*attach) (GeglOperation *self);
/* prepare the node for processing (all properties will be set)
* override this if you are creating a meta operation (using the node
......@@ -123,7 +123,7 @@ GeglRectangle gegl_operation_get_affected_region (GeglOperation *self,
GeglRectangle gegl_operation_get_defined_region (GeglOperation *self);
gboolean gegl_operation_calc_source_regions (GeglOperation *self,
gpointer dynamic_id);
void gegl_operation_associate (GeglOperation *self,
void gegl_operation_attach (GeglOperation *self,
GeglNode *node);
void gegl_operation_prepare (GeglOperation *self,
gpointer dynamic_id);
......
......@@ -264,7 +264,7 @@ get_affected_region (GeglOperation *self,
static void
associate (GeglOperation *self)
attach (GeglOperation *self)
{
GeglOperation *operation = GEGL_OPERATION (self);
GObjectClass *object_class = G_OBJECT_GET_CLASS (self);
......@@ -306,7 +306,7 @@ gegl_operation_remap_class_init (GeglOperationRemapClass * klass)
operation_class->get_defined_region = get_defined_region;
operation_class->get_affected_region = get_affected_region;
operation_class->calc_source_regions = calc_source_regions;
operation_class->associate = associate;
operation_class->attach = attach;
gegl_operation_class_set_name (operation_class, "remap");;
......
......@@ -146,7 +146,7 @@ prepare (GeglOperation *operation,
}
}
static void associate (GeglOperation *operation)
static void attach (GeglOperation *operation)
{
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
Priv *priv = (Priv*)self->priv;
......@@ -170,7 +170,7 @@ static void associate (GeglOperation *operation)
static void class_init (GeglOperationClass *klass)
{
klass->prepare = prepare;
klass->associate = associate;
klass->attach = attach;
G_OBJECT_CLASS (klass)->dispose = dispose;
G_OBJECT_CLASS (klass)->finalize = finalize;
......
......@@ -52,8 +52,8 @@ struct _Priv
GeglNode *black;
};
/* in associate we hook into graph adding the needed nodes */
static void associate (GeglOperation *operation)
/* in attach we hook into graph adding the needed nodes */
static void attach (GeglOperation *operation)
{
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
Priv *priv = (Priv*)self->priv;
......@@ -92,7 +92,7 @@ static void associate (GeglOperation *operation)
static void class_init (GeglOperationClass *klass)
{
klass->associate = associate;
klass->attach = attach;
}
#endif
......@@ -116,7 +116,7 @@ prepare (GeglOperation *operation,
}
}
static void associate (GeglOperation *operation)
static void attach (GeglOperation *operation)
{
GeglChantOperation *self = GEGL_CHANT_OPERATION (operation);
Priv *priv = (Priv*)self->priv;
......@@ -184,7 +184,7 @@ finalize (GObject *object)
static void class_init (GeglOperationClass *klass)
{
klass->prepare = prepare;
klass->associate = associate;
klass->attach = attach;
G_OBJECT_CLASS (klass)->dispose = dispose;
G_OBJECT_CLASS (klass)->finalize = finalize;
......
......@@ -49,7 +49,7 @@ struct _Priv
GeglNode *remap;
};
static void associate (GeglOperation *operation)
static void attach (GeglOperation *operation)
{
GeglChantOperation *self;
Priv *priv;
......@@ -124,7 +124,7 @@ static void associate (GeglOperation *operation)
static void class_init (GeglOperationClass *klass)
{
klass->associate = associate;
klass->attach = attach;
}
#endif
......@@ -45,7 +45,7 @@ struct _Priv
GeglNode *blur;
};
static void associate (GeglOperation *operation)
static void attach (GeglOperation *operation)
{
GeglChantOperation *self;
Priv *priv;
......@@ -94,7 +94,7 @@ static void associate (GeglOperation *operation)
static void class_init (GeglOperationClass *klass)
{
klass->associate = associate;
klass->attach = attach;
}
#endif
......@@ -45,7 +45,7 @@ struct _Priv
GeglNode *blur2;
};
static void associate (GeglOperation *operation)
static void attach (GeglOperation *operation)
{
GeglChantOperation *self;
Priv *priv;
......@@ -89,7 +89,7 @@ static void associate (GeglOperation *operation)
static void class_init (GeglOperationClass *klass)
{
klass->associate = associate;
klass->attach = attach;
}
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment