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

%s/gegl_node_new_node/gegl_node_new_child/

%s/gegl_node_create_node/gegl_node_create_child/
* bin/editor-optype.c: (chain_in_operation):
* bin/editor.c: (cb_introspect):
* bin/gegl-tree-editor-action.c: (add_sibling_op), (add_child_op):
* bin/gegl.c: (main):
* gegl/gegl-graph.c: (gegl_node_new_child),
(gegl_node_create_child):
* gegl/gegl-graph.h:
* gegl/gegl-xml.c: (start_element):
* gegl/gegl.h:
* operations/file-io/load.c: (attach), (refresh_cache):
* operations/meta/dropshadow.c: (attach):
* operations/meta/layer.c: (attach), (refresh_cache):
* operations/meta/tonemap.c: (attach):
* operations/meta/unsharp-mask.c: (attach):
* operations/render/introspect.c: (process):
* operations/workshop/dog.c: (attach):
* tests/mockimageoperationtest.c:
(test_mock_image_operation_g_object_properties),
(test_mock_image_operation_chain):
* tools/introspect.c: (stuff):

svn path=/trunk/; revision=1124
parent c43dd936
2007-01-04 Øyvind Kolås <pippin@gimp.org>
%s/gegl_node_new_node/gegl_node_new_child/
%s/gegl_node_create_node/gegl_node_create_child/
* bin/editor-optype.c: (chain_in_operation):
* bin/editor.c: (cb_introspect):
* bin/gegl-tree-editor-action.c: (add_sibling_op), (add_child_op):
* bin/gegl.c: (main):
* gegl/gegl-graph.c: (gegl_node_new_child),
(gegl_node_create_child):
* gegl/gegl-graph.h:
* gegl/gegl-xml.c: (start_element):
* gegl/gegl.h:
* operations/file-io/load.c: (attach), (refresh_cache):
* operations/meta/dropshadow.c: (attach):
* operations/meta/layer.c: (attach), (refresh_cache):
* operations/meta/tonemap.c: (attach):
* operations/meta/unsharp-mask.c: (attach):
* operations/render/introspect.c: (process):
* operations/workshop/dog.c: (attach):
* tests/mockimageoperationtest.c:
(test_mock_image_operation_g_object_properties),
(test_mock_image_operation_chain):
* tools/introspect.c: (stuff):
2007-01-04 Øyvind Kolås <pippin@gimp.org>
%s/gegl_node_output/gegl_node_get_output_proxy/
......
......@@ -68,7 +68,7 @@ chain_in_operation (const gchar *op_type)
proxy = gegl_node_get_output_proxy (editor.gegl, "output");
iter = gegl_node_get_connected_to (proxy, "input");
new = gegl_node_new_node (editor.gegl, "operation", op_type, NULL);
new = gegl_node_new_child (editor.gegl, "operation", op_type, NULL);
if (iter)
{
gegl_node_link_many (iter, new, proxy, NULL);
......
......@@ -716,7 +716,7 @@ cb_introspect (GtkAction *action)
GeglRectangle bounding_box;
gegl = gegl_node_new ();
dot = gegl_node_new_node (gegl,
dot = gegl_node_new_child (gegl,
"operation", "introspect",
"node", editor.gegl,
NULL);
......
......@@ -372,7 +372,7 @@ add_sibling_op (GtkAction *action, gpointer userdata)
{
GeglNode *previous = gegl_previous_sibling (item);
new_item = gegl_node_new_node (GEGL_STORE (model)->gegl,
new_item = gegl_node_new_child (GEGL_STORE (model)->gegl,
"operation", "nop",
NULL);
......@@ -435,7 +435,7 @@ add_child_op (GtkAction *action, gpointer userdata)
}
else
{
new_item = gegl_node_new_node (GEGL_STORE (model)->gegl,
new_item = gegl_node_new_child (GEGL_STORE (model)->gegl,
"operation", "blank",
NULL);
gegl_node_connect_from (item, "aux", new_item, "output");
......
......@@ -147,7 +147,7 @@ main (gint argc,
while (*operation)
{
GeglNode *new = gegl_node_new_node (gegl, "operation", *operation, NULL);
GeglNode *new = gegl_node_new_child (gegl, "operation", *operation, NULL);
if (iter)
{
gegl_node_link_many (iter, new, proxy, NULL);
......@@ -185,7 +185,7 @@ main (gint argc,
break;
case GEGL_RUN_MODE_PNG:
{
GeglNode *output = gegl_node_new_node (gegl,
GeglNode *output = gegl_node_new_child (gegl,
"operation", "png-save",
"path", o->output,
NULL);
......
......@@ -106,7 +106,7 @@ gegl_node_get_children (GeglNode *self)
* returns a freshly created node, owned by the graph, and thus freed with it
*/
GeglNode *
gegl_node_new_node (GeglNode *node,
gegl_node_new_child (GeglNode *node,
const gchar *first_property_name,
...)
{
......@@ -128,10 +128,10 @@ gegl_node_new_node (GeglNode *node,
return node;
}
GeglNode * gegl_node_create_node (GeglNode *self,
GeglNode * gegl_node_create_child (GeglNode *self,
const gchar *operation)
{
return gegl_node_new_node (self, "operation", operation, NULL);
return gegl_node_new_child (self, "operation", operation, NULL);
}
static void
......
......@@ -39,10 +39,10 @@ gint gegl_node_get_num_children (GeglNode *self);
GeglNode * gegl_node_new (void);
GeglNode * gegl_node_new_node (GeglNode *self,
GeglNode * gegl_node_new_child (GeglNode *self,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
GeglNode * gegl_node_create_node (GeglNode *self,
GeglNode * gegl_node_create_child (GeglNode *self,
const gchar *operation);
GeglNode * gegl_node_get_input_proxy (GeglNode *graph,
const gchar *name);
......
......@@ -111,13 +111,13 @@ static void start_element (GMarkupParseContext *context,
if (!strcmp (element_name, "node"))
{
new = gegl_node_new_node (pd->gegl,
new = gegl_node_new_child (pd->gegl,
"operation", name2val (a, v, "operation"),
NULL);
}
else
{
new = gegl_node_new_node (pd->gegl,
new = gegl_node_new_child (pd->gegl,
"operation", element_name,
NULL);
}
......
......@@ -58,12 +58,12 @@ void gegl_exit (void);
GeglNode * gegl_node_new (void);
/* create a new node belonging to a graph */
GeglNode * gegl_node_create_node (GeglNode *graph,
GeglNode * gegl_node_create_child (GeglNode *graph,
const gchar *operation);
/* create a new node belonging to a graph, with key/value pairs for properties,
* terminated by NULL (remember to set "operation") */
GeglNode * gegl_node_new_node (GeglNode *graph,
GeglNode * gegl_node_new_child (GeglNode *graph,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
/* connect the output pad of a different node to this nodes input pad,
......
......@@ -159,7 +159,7 @@ static void attach (GeglOperation *operation)
priv->output = gegl_node_get_output_proxy (priv->self, "output");
priv->load = gegl_node_new_node (priv->self,
priv->load = gegl_node_new_child (priv->self,
"operation", "text",
"string", "foo",
NULL);
......@@ -197,7 +197,7 @@ refresh_cache (GeglChantOperation *self)
}
gegl = g_object_new (GEGL_TYPE_NODE, NULL);
load = gegl_node_new_node (gegl, "operation", "load",
load = gegl_node_new_child (gegl, "operation", "load",
"cache", FALSE,
"path", self->path,
NULL);
......
......@@ -69,12 +69,12 @@ static void attach (GeglOperation *operation)
GeglNode *gegl = priv->self;
priv->input = gegl_node_get_input_proxy (gegl, "input");
priv->output = gegl_node_get_output_proxy (gegl, "output");
priv->over = gegl_node_new_node (gegl, "operation", "over", NULL);
priv->translate = gegl_node_new_node (gegl, "operation", "translate", NULL);
priv->opacity = gegl_node_new_node (gegl, "operation", "opacity", NULL);
priv->blur = gegl_node_new_node (gegl, "operation", "gaussian-blur", NULL);
priv->darken = gegl_node_new_node (gegl, "operation", "in", NULL);
priv->black = gegl_node_new_node (gegl, "operation", "color",
priv->over = gegl_node_new_child (gegl, "operation", "over", NULL);
priv->translate = gegl_node_new_child (gegl, "operation", "translate", NULL);
priv->opacity = gegl_node_new_child (gegl, "operation", "opacity", NULL);
priv->blur = gegl_node_new_child (gegl, "operation", "gaussian-blur", NULL);
priv->darken = gegl_node_new_child (gegl, "operation", "in", NULL);
priv->black = gegl_node_new_child (gegl, "operation", "color",
"value", gegl_color_new ("rgb(0.0,0.0,0.0)"),
NULL);
......
......@@ -133,14 +133,14 @@ static void attach (GeglOperation *operation)
priv->aux = gegl_node_get_input_proxy (gegl, "aux");
priv->output = gegl_node_get_output_proxy (gegl, "output");
priv->composite_op = gegl_node_new_node (gegl,
priv->composite_op = gegl_node_new_child (gegl,
"operation", self->composite_op,
NULL);
priv->shift = gegl_node_new_node (gegl, "operation", "shift", NULL);
priv->opacity = gegl_node_new_node (gegl, "operation", "opacity", NULL);
priv->shift = gegl_node_new_child (gegl, "operation", "shift", NULL);
priv->opacity = gegl_node_new_child (gegl, "operation", "opacity", NULL);
priv->load = gegl_node_new_node (gegl,
priv->load = gegl_node_new_child (gegl,
"operation", "buffer",
NULL);
......@@ -210,7 +210,7 @@ refresh_cache (GeglChantOperation *self)
}
gegl = g_object_new (GEGL_TYPE_NODE, NULL);
load = gegl_node_new_node (gegl, "operation", "load",
load = gegl_node_new_child (gegl, "operation", "load",
"cache", FALSE,
"path", self->src,
NULL);
......
......@@ -67,31 +67,31 @@ static void attach (GeglOperation *operation)
priv->input = gegl_node_get_input_proxy (gegl, "input");
priv->output = gegl_node_get_output_proxy (gegl, "output");
priv->min = gegl_node_new_node (gegl,
priv->min = gegl_node_new_child (gegl,
"operation", "box-min",
NULL);
priv->blur_min = gegl_node_new_node (gegl,
priv->blur_min = gegl_node_new_child (gegl,
"operation", "box-blur",
NULL);
priv->max = gegl_node_new_node (gegl,
priv->max = gegl_node_new_child (gegl,
"operation", "box-max",
NULL);
priv->blur_max = gegl_node_new_node (gegl,
priv->blur_max = gegl_node_new_child (gegl,
"operation", "box-blur",
NULL);
priv->remap = gegl_node_new_node (gegl,
priv->remap = gegl_node_new_child (gegl,
"operation", "remap",
NULL);
priv->over = gegl_node_new_node (gegl,
priv->over = gegl_node_new_child (gegl,
"operation", "over",
NULL);
priv->opacity = gegl_node_new_node (gegl,
priv->opacity = gegl_node_new_child (gegl,
"operation", "opacity",
NULL);
......
......@@ -62,19 +62,19 @@ static void attach (GeglOperation *operation)
priv->input = gegl_node_get_input_proxy (gegl, "input");
priv->output = gegl_node_get_output_proxy (gegl, "output");
priv->add = gegl_node_new_node (gegl,
priv->add = gegl_node_new_child (gegl,
"operation", "add",
NULL);
priv->multiply = gegl_node_new_node (gegl,
priv->multiply = gegl_node_new_child (gegl,
"operation", "multiply",
NULL);
priv->subtract = gegl_node_new_node (gegl,
priv->subtract = gegl_node_new_child (gegl,
"operation", "subtract",
NULL);
priv->blur = gegl_node_new_node (gegl,
priv->blur = gegl_node_new_child (gegl,
"operation", "gaussian-blur",
NULL);
......
......@@ -71,7 +71,7 @@ process (GeglOperation *operation,
{
GeglNode *gegl = gegl_node_new ();
GeglNode *png_load = gegl_node_new_node (gegl, "operation", "load", "path", "/tmp/gegl-temp.png", NULL);
GeglNode *png_load = gegl_node_new_child (gegl, "operation", "load", "path", "/tmp/gegl-temp.png", NULL);
GeglNode *buffer_save;
GeglRectangle defined;
......@@ -83,7 +83,7 @@ process (GeglOperation *operation,
"width", defined.w,
"height", defined.h,
NULL);
buffer_save = gegl_node_new_node (gegl, "operation", "save-buffer", "buffer", self->buf, NULL);
buffer_save = gegl_node_new_child (gegl, "operation", "save-buffer", "buffer", self->buf, NULL);
gegl_node_link_many (png_load, buffer_save, NULL);
gegl_node_process (buffer_save);
......
......@@ -63,15 +63,15 @@ static void attach (GeglOperation *operation)
priv->input = gegl_node_get_input_proxy (gegl, "input");
priv->output = gegl_node_get_output_proxy (gegl, "output");
priv->subtract = gegl_node_new_node (gegl,
priv->subtract = gegl_node_new_child (gegl,
"operation", "subtract",
NULL);
priv->blur1 = gegl_node_new_node (gegl,
priv->blur1 = gegl_node_new_child (gegl,
"operation", "gaussian-blur",
NULL);
priv->blur2 = gegl_node_new_node (gegl,
priv->blur2 = gegl_node_new_child (gegl,
"operation", "gaussian-blur",
NULL);
......
......@@ -63,7 +63,7 @@ test_mock_image_operation_g_object_properties(Test *test)
"length", 3,
"default-pixel", 1,
NULL);
a = gegl_node_new_node (gegl,
a = gegl_node_new_child (gegl,
"operation", "GeglMockImageOperation",
"input1", 2,
"input0", image,
......@@ -121,12 +121,12 @@ test_mock_image_operation_chain(Test *test)
"default-pixel", 1,
NULL);
A = gegl_node_new_node (gegl,
A = gegl_node_new_child (gegl,
"operation", "GeglMockImageOperation",
"input0", image,
"input1", 2,
NULL);
B = gegl_node_new_node (gegl,
B = gegl_node_new_child (gegl,
"operation", "GeglMockImageOperation",
"input1", 3,
NULL);
......
......@@ -412,18 +412,18 @@ stuff (gint argc,
{
GeglNode *gegl = g_object_new (GEGL_TYPE_NODE, NULL);
GeglNode *save = gegl_node_new_node (gegl,
GeglNode *save = gegl_node_new_child (gegl,
"operation", "png-save",
"path", "/dev/null",
NULL);
GeglNode *crop = gegl_node_new_node (gegl,
GeglNode *crop = gegl_node_new_child (gegl,
"operation", "crop",
"x", 0,
"y", 0,
"width", 50,
"height", 50,
NULL);
GeglNode *png_load = gegl_node_new_node (gegl,
GeglNode *png_load = gegl_node_new_child (gegl,
"operation", "checkerboard",
NULL);
......
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