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

%s/gegl_node_connect/gegl_node_connect_from/

* bin/gegl-tree-editor-action.c: (remove_itm), (move_up),
(move_down), (add_sibling_op), (add_child_op):
* bin/gegl.c: (main):
* docs/hello-world.c: (main):
* gegl/gegl-node.c: (gegl_node_connect_from), (gegl_node_link),
(gegl_node_set_operation_object), (gegl_node_get_bounding_box),
(gegl_node_process):
* gegl/gegl-node.h:
* gegl/gegl-xml.c: (start_element), (end_element), (each_ref):
* gegl/gegl.h:
* operations/file-io/load.c: (associate):
* operations/meta/dropshadow.c: (associate):
* operations/meta/layer.c: (prepare), (associate):
* operations/meta/unsharp-mask.c: (associate):
* tests/bfspadvisitortest.c: (test_bfs_pad_visitor):
* tests/dfsnodevisitortest.c: (test_dfs_node_visitor):
* tests/dfspadvisitortest.c: (test_dfs_pad_visitor):
* tests/graphtest.c: (test_graph_properties),
(test_graph_property_visitors):
* tests/mockimageoperationtest.c:
(test_mock_image_operation_chain),
(test_mock_image_operation_chain2):
* tests/nodeconnectionstest.c: (test_node_connections):
* tests/updatepadtest.c: (test_update_pad):
parent 8a67a555
2006-12-04 Øyvind Kolås <pippin@gimp.org>
%s/gegl_node_connect/gegl_node_connect_from/
* bin/gegl-tree-editor-action.c: (remove_itm), (move_up),
(move_down), (add_sibling_op), (add_child_op):
* bin/gegl.c: (main):
* docs/hello-world.c: (main):
* gegl/gegl-node.c: (gegl_node_connect_from), (gegl_node_link),
(gegl_node_set_operation_object), (gegl_node_get_bounding_box),
(gegl_node_process):
* gegl/gegl-node.h:
* gegl/gegl-xml.c: (start_element), (end_element), (each_ref):
* gegl/gegl.h:
* operations/file-io/load.c: (associate):
* operations/meta/dropshadow.c: (associate):
* operations/meta/layer.c: (prepare), (associate):
* operations/meta/unsharp-mask.c: (associate):
* tests/bfspadvisitortest.c: (test_bfs_pad_visitor):
* tests/dfsnodevisitortest.c: (test_dfs_node_visitor):
* tests/dfspadvisitortest.c: (test_dfs_pad_visitor):
* tests/graphtest.c: (test_graph_properties),
(test_graph_property_visitors):
* tests/mockimageoperationtest.c:
(test_mock_image_operation_chain),
(test_mock_image_operation_chain2):
* tests/nodeconnectionstest.c: (test_node_connections):
* tests/updatepadtest.c: (test_update_pad):
2006-12-04 Øyvind Kolås <pippin@gimp.org>
%s/gegl_node_get_defined_rect/gegl_node_get_bounding_box/
......
......@@ -70,7 +70,7 @@ remove_itm (GtkAction *action, gpointer userdata)
if (next)
{
gegl_node_disconnect (item, "input", next, "output");
gegl_node_connect (previous, "input", next, "output");
gegl_node_connect_from (previous, "input", next, "output");
}
g_object_unref (G_OBJECT (item));
}
......@@ -83,7 +83,7 @@ remove_itm (GtkAction *action, gpointer userdata)
if (next)
{
gegl_node_disconnect (item, "input", next, "output");
gegl_node_connect (parent, "aux", next, "output");
gegl_node_connect_from (parent, "aux", next, "output");
}
g_object_unref (G_OBJECT (item));
}
......@@ -182,12 +182,12 @@ move_up (GtkAction *action, gpointer userdata)
gegl_node_disconnect (prev, "input", item, "output");
gegl_node_disconnect (item, "input", next, "output");
gegl_node_connect (prev, "input", next, "output");
gegl_node_connect_from (prev, "input", next, "output");
/* now it is kind of removed */
gegl_node_disconnect (next, "input", next2, "output");
gegl_node_connect (next, "input", item, "output");
gegl_node_connect (item, "input", next2, "output");
gegl_node_connect_from (next, "input", item, "output");
gegl_node_connect_from (item, "input", next2, "output");
/* and hooked back in */
}
else /* need to rehook parent instead */
......@@ -225,12 +225,12 @@ move_up (GtkAction *action, gpointer userdata)
}
gegl_node_disconnect (parent, "aux", item, "output");
gegl_node_disconnect (item, "input", next, "output");
gegl_node_connect (parent, "aux", next, "output");
gegl_node_connect_from (parent, "aux", next, "output");
/* now it is kind of removed */
gegl_node_disconnect (next, "input", next2, "output");
gegl_node_connect (next, "input", item, "output");
gegl_node_connect (item, "input", next2, "output");
gegl_node_connect_from (next, "input", item, "output");
gegl_node_connect_from (item, "input", next2, "output");
/* and hooked back in */
}
......@@ -291,11 +291,11 @@ move_down (GtkAction *action, gpointer userdata)
{
gegl_node_disconnect (prev, "input", item, "output");
gegl_node_disconnect (item, "input", next, "output");
gegl_node_connect (prev, "input", next, "output");
gegl_node_connect_from (prev, "input", next, "output");
gegl_node_disconnect (next, "input", next2, "output");
gegl_node_connect (next, "input", item, "output");
gegl_node_connect (item, "input", next2, "output");
gegl_node_connect_from (next, "input", item, "output");
gegl_node_connect_from (item, "input", next2, "output");
{ /* compute the reordering that needs to be indicated to */
gint *new_order;
......@@ -322,11 +322,11 @@ move_down (GtkAction *action, gpointer userdata)
gegl_node_disconnect (parent, "aux", item, "output");
gegl_node_disconnect (item, "input", next, "output");
gegl_node_connect (parent, "aux", next, "output");
gegl_node_connect_from (parent, "aux", next, "output");
gegl_node_disconnect (next, "input", next2, "output");
gegl_node_connect (next, "input", item, "output");
gegl_node_connect (item, "input", next2, "output");
gegl_node_connect_from (next, "input", item, "output");
gegl_node_connect_from (item, "input", next2, "output");
{ /* compute the reordering that needs to be indicated to */
......@@ -379,15 +379,15 @@ add_sibling_op (GtkAction *action, gpointer userdata)
if (previous) /* we're just chaining in */
{
gegl_node_disconnect (previous, "input", item, "output");
gegl_node_connect (previous, "input", new_item, "output");
gegl_node_connect (new_item, "input", item, "output");
gegl_node_connect_from (previous, "input", new_item, "output");
gegl_node_connect_from (new_item, "input", item, "output");
}
else /* we're chaining in as the new aux of the parent level */
{
GeglNode *parent = gegl_parent (item);
gegl_node_disconnect (parent, "aux", item, "output");
gegl_node_connect (parent, "aux", new_item, "output");
gegl_node_connect (new_item, "input", item, "output");
gegl_node_connect_from (parent, "aux", new_item, "output");
gegl_node_connect_from (new_item, "input", item, "output");
}
iter.user_data = new_item;
......@@ -438,7 +438,7 @@ add_child_op (GtkAction *action, gpointer userdata)
new_item = gegl_graph_new_node (GEGL_STORE (model)->gegl,
"operation", "blank",
NULL);
gegl_node_connect (item, "aux", new_item, "output");
gegl_node_connect_from (item, "aux", new_item, "output");
}
iter.user_data = new_item;
......
......@@ -182,7 +182,7 @@ main (gint argc,
"operation", "png-save",
"path", o->output,
NULL);
gegl_node_connect (output, "input", gegl_graph_output (gegl, "output"), "output");
gegl_node_connect_from (output, "input", gegl_graph_output (gegl, "output"), "output");
gegl_node_process (output);
g_object_unref (gegl);
......
......@@ -39,7 +39,7 @@ main (gint argc,
/* link the nodes together */
gegl_node_link_many (load, scale, bcontrast, layer, save, NULL);
gegl_node_link (text, dropshadow);
gegl_node_connect (layer, "aux", dropshadow, "output");
gegl_node_connect_from (layer, "aux", dropshadow, "output");
/* set properties for the nodes */
gegl_node_set (load, "path", argv[1], NULL);
......
......@@ -360,7 +360,7 @@ find_connection (GeglNode *sink,
#include <stdio.h>
gboolean
gegl_node_connect (GeglNode *sink,
gegl_node_connect_from (GeglNode *sink,
const gchar *sink_pad_name,
GeglNode *source,
const gchar *source_pad_name)
......@@ -586,7 +586,7 @@ gegl_node_get_sources (GeglNode *self)
void gegl_node_link (GeglNode *source,
GeglNode *sink)
{
gegl_node_connect (sink, "input", source, "output");
gegl_node_connect_from (sink, "input", source, "output");
}
void gegl_node_link_many (GeglNode *source,
......@@ -943,11 +943,11 @@ gegl_node_set_operation_object (GeglNode *self,
gegl_operation_associate (operation, self);
if (input)
gegl_node_connect (self, "input", input, "output");
gegl_node_connect_from (self, "input", input, "output");
if (aux)
gegl_node_connect (self, "aux", aux, "output");
gegl_node_connect_from (self, "aux", aux, "output");
if (output)
gegl_node_connect (output, output_dest_pad, self, "output");
gegl_node_connect_from (output, output_dest_pad, self, "output");
if (output_dest_pad)
g_free (output_dest_pad);
......@@ -1420,7 +1420,7 @@ gegl_node_clear_dirt (GeglNode *node)
}
GeglRect
gegl_node_get_defined_rect (GeglNode *root)
gegl_node_get_bounding_box (GeglNode *root)
{
GeglVisitor *have_visitor;
......@@ -1455,7 +1455,7 @@ gegl_node_process (GeglNode *self)
input = gegl_node_get_connected_to (self, "input");
gegl_node_apply (input, "output");
defined = gegl_node_get_defined_rect (input);
defined = gegl_node_get_bounding_box (input);
gegl_node_get (input, "output", &buffer, NULL);
gegl_node_set (self, "input", buffer, NULL);
gegl_node_set_result_rect (self, defined.x, defined.y, defined.w, defined.h);
......
......@@ -98,7 +98,7 @@ void gegl_node_link_many (GeglNode *source,
GeglNode *dest,
...) G_GNUC_NULL_TERMINATED;
gboolean gegl_node_connect (GeglNode *self,
gboolean gegl_node_connect_from (GeglNode *self,
const gchar *input_pad_name,
GeglNode *source,
const gchar *output_pad_name);
......
......@@ -109,7 +109,7 @@ static void start_element (GMarkupParseContext *context,
gegl_graph_output (new, "output"); /* creates the pad if it doesn't exist */
if (pd->iter)
gegl_node_connect (pd->iter, "input", new, "output");
gegl_node_connect_from (pd->iter, "input", new, "output");
pd->iter = gegl_graph_output (new, "output");
}
else if (!strcmp (element_name, "graph"))
......@@ -213,12 +213,12 @@ static void start_element (GMarkupParseContext *context,
if (pd->state == STATE_TREE_FIRST_CHILD)
{
gegl_node_connect (pd->iter, "aux", new, "output");
gegl_node_connect_from (pd->iter, "aux", new, "output");
}
else
{
if (pd->iter)
gegl_node_connect (pd->iter, "input", new, "output");
gegl_node_connect_from (pd->iter, "input", new, "output");
}
pd->parent = g_list_prepend (pd->parent, new);
pd->state = STATE_TREE_FIRST_CHILD;
......@@ -246,7 +246,7 @@ static void end_element (GMarkupParseContext *context,
{
if (gegl_node_get_pad (pd->iter, "input"))
{
gegl_node_connect (pd->iter, "input",
gegl_node_connect_from (pd->iter, "input",
gegl_graph_input (GEGL_NODE (pd->parent->data), "input"), "output");
pd->iter = gegl_graph_input (GEGL_NODE (pd->parent->data), "input");
}
......@@ -304,7 +304,7 @@ static void each_ref (gpointer value,
gegl_node_get (dest_node, "ref", &ref, NULL);
source_node = g_hash_table_lookup (pd->ids, ref);
gegl_node_connect (dest_node, "input", source_node, "output");
gegl_node_connect_from (dest_node, "input", source_node, "output");
}
GeglNode *gegl_xml_parse (const gchar *xmldata)
......
......@@ -70,7 +70,7 @@ GeglNode * gegl_graph_new_node (GeglNode *graph,
* pads specified by names ("input","aux" and "output" are the names
* currently in use
*/
gboolean gegl_node_connect (GeglNode *sink,
gboolean gegl_node_connect_from (GeglNode *sink,
const gchar *input_pad_name,
GeglNode *source,
const gchar *output_pad_name);
......
......@@ -164,7 +164,7 @@ static void associate (GeglOperation *operation)
"string", "foo",
NULL);
gegl_node_connect (priv->output, "input", priv->load, "output");
gegl_node_connect_from (priv->output, "input", priv->load, "output");
}
static void class_init (GeglOperationClass *klass)
......
......@@ -79,8 +79,8 @@ static void associate (GeglOperation *operation)
NULL);
gegl_node_link_many (priv->input, priv->darken, priv->blur, priv->opacity, priv->translate, priv->over, priv->output, NULL);
gegl_node_connect (priv->over, "aux", priv->input, "output");
gegl_node_connect (priv->darken, "aux", priv->black, "output");
gegl_node_connect_from (priv->over, "aux", priv->input, "output");
gegl_node_connect_from (priv->darken, "aux", priv->black, "output");
gegl_operation_meta_redirect (operation, "opacity", priv->opacity, "value");
gegl_operation_meta_redirect (operation, "radius", priv->blur, "radius-x");
......
......@@ -92,7 +92,7 @@ prepare (GeglOperation *operation)
}
else
{
gegl_node_connect (priv->opacity, "input", priv->aux, "output");
gegl_node_connect_from (priv->opacity, "input", priv->aux, "output");
}
if (self->opacity != priv->p_opacity)
......@@ -145,7 +145,7 @@ static void associate (GeglOperation *operation)
gegl_node_link_many (priv->load, priv->opacity, priv->shift, NULL);
gegl_node_link_many (priv->input, priv->composite_op, priv->output, NULL);
gegl_node_connect (priv->composite_op, "aux", priv->shift, "output");
gegl_node_connect_from (priv->composite_op, "aux", priv->shift, "output");
}
static void
......
......@@ -83,8 +83,8 @@ static void associate (GeglOperation *operation)
gegl_node_link_many (priv->input, priv->add, priv->output, NULL);
gegl_node_connect (priv->subtract, "aux", priv->blur, "output");
gegl_node_connect (priv->add, "aux", priv->multiply, "output");
gegl_node_connect_from (priv->subtract, "aux", priv->blur, "output");
gegl_node_connect_from (priv->add, "aux", priv->multiply, "output");
gegl_operation_meta_redirect (operation, "scale", priv->multiply, "value");
gegl_operation_meta_redirect (operation, "radius", priv->blur, "radius-x");
......
......@@ -79,8 +79,8 @@ test_bfs_pad_visitor(Test *test)
B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation01", NULL);
C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (C, "input0", A, "output0");
gegl_node_connect (C, "input1", B, "output0");
gegl_node_connect_from (C, "input0", A, "output0");
gegl_node_connect_from (C, "input1", B, "output0");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 5, "output0", C));
......@@ -113,8 +113,8 @@ test_bfs_pad_visitor(Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation11", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation11", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (C, "input0", B, "output0");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (C, "input0", B, "output0");
ct_test(test, do_visitor_and_check_visit_order (visit_order, 5, "output0", C));
......@@ -141,8 +141,8 @@ test_bfs_pad_visitor(Test *test)
GeglNode *A = g_object_new (GEGL_TYPE_NODE, "name", "A", "operation", "GeglMockOperation01", NULL);
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (B, "input1", A, "output0");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (B, "input1", A, "output0");
ct_test(test, do_visitor_and_check_visit_order (visit_order, 4, "output0", B));
......@@ -177,8 +177,8 @@ test_bfs_pad_visitor(Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation21", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (C, "input1", B, "output0");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (C, "input1", B, "output0");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 7, "output0", C));
......@@ -214,10 +214,10 @@ test_bfs_pad_visitor(Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation22", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (B, "input1", A, "output0");
gegl_node_connect (C, "input0", B, "output0");
gegl_node_connect (C, "input1", B, "output1");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (B, "input1", A, "output0");
gegl_node_connect_from (C, "input0", B, "output0");
gegl_node_connect_from (C, "input1", B, "output1");
ct_test(test, do_visitor_and_check_visit_order (visit_order, 8, "output0", C));
......@@ -247,8 +247,8 @@ test_bfs_pad_visitor(Test *test)
GeglNode *A = g_object_new (GEGL_TYPE_NODE, "name", "A", "operation", "GeglMockOperation12", NULL);
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation21", NULL);
gegl_node_connect(B, "input0", A, "output0");
gegl_node_connect(B, "input1", A, "output1");
gegl_node_connect_from(B, "input0", A, "output0");
gegl_node_connect_from(B, "input1", A, "output1");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 6, "output0", B));
......@@ -281,9 +281,9 @@ test_bfs_pad_visitor(Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation11", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (C, "input1", B, "output0");
gegl_node_connect (C, "input0", A, "output0");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (C, "input1", B, "output0");
gegl_node_connect_from (C, "input0", A, "output0");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 6, "output0", C));
......@@ -327,10 +327,10 @@ test_bfs_pad_visitor(Test *test)
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation11", NULL);
GeglNode *D = g_object_new (GEGL_TYPE_NODE, "name", "D", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (C, "input0", B, "output0");
gegl_node_connect (D, "input0", B, "output0");
gegl_node_connect (D, "input1", C, "output0");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (C, "input0", B, "output0");
gegl_node_connect_from (D, "input0", B, "output0");
gegl_node_connect_from (D, "input1", C, "output0");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 9, "output0", D));
......@@ -372,10 +372,10 @@ test_bfs_pad_visitor(Test *test)
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation11", NULL);
GeglNode *D = g_object_new (GEGL_TYPE_NODE, "name", "D", "operation", "GeglMockOperation21", NULL);
gegl_node_connect(B, "input0", A, "output0");
gegl_node_connect(C, "input0", B, "output0");
gegl_node_connect(D, "input1", C, "output0");
gegl_node_connect(D, "input0", A, "output0");
gegl_node_connect_from(B, "input0", A, "output0");
gegl_node_connect_from(C, "input0", B, "output0");
gegl_node_connect_from(D, "input1", C, "output0");
gegl_node_connect_from(D, "input0", A, "output0");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 8, "output0", D));
......
......@@ -63,8 +63,8 @@ test_dfs_node_visitor(Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation01", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation21", NULL);
gegl_node_connect(C, "input0", A, "output0");
gegl_node_connect(C, "input1", B, "output0");
gegl_node_connect_from(C, "input0", A, "output0");
gegl_node_connect_from(C, "input1", B, "output0");
ct_test(test, do_visitor_and_check_visit_order(visit_order, 3, C));
......@@ -94,8 +94,8 @@ test_dfs_node_visitor(Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation11", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation11", NULL);
gegl_node_connect(B, "input0", A, "output0");
gegl_node_connect(C, "input0", B, "output0");
gegl_node_connect_from(B, "input0", A, "output0");
gegl_node_connect_from(C, "input0", B, "output0");
ct_test(test, do_visitor_and_check_visit_order(visit_order, 3, C));
......@@ -120,8 +120,8 @@ test_dfs_node_visitor(Test *test)
GeglNode *A = g_object_new (GEGL_TYPE_NODE, "name", "A", "operation", "GeglMockOperation01", NULL);
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation21", NULL);
gegl_node_connect(B, "input0", A, "output0");
gegl_node_connect(B, "input1", A, "output0");
gegl_node_connect_from(B, "input0", A, "output0");
gegl_node_connect_from(B, "input1", A, "output0");
ct_test(test, do_visitor_and_check_visit_order(visit_order, 2, B));
......@@ -152,8 +152,8 @@ test_dfs_node_visitor(Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation21", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation21", NULL);
gegl_node_connect(B, "input0", A, "output0");
gegl_node_connect(C, "input1", B, "output0");
gegl_node_connect_from(B, "input0", A, "output0");
gegl_node_connect_from(C, "input1", B, "output0");
ct_test(test, do_visitor_and_check_visit_order(visit_order, 3, C));
......@@ -185,10 +185,10 @@ test_dfs_node_visitor(Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation22", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation21", NULL);
gegl_node_connect(B, "input0", A, "output0");
gegl_node_connect(B, "input1", A, "output0");
gegl_node_connect(C, "input0", B, "output0");
gegl_node_connect(C, "input1", B, "output1");
gegl_node_connect_from(B, "input0", A, "output0");
gegl_node_connect_from(B, "input1", A, "output0");
gegl_node_connect_from(C, "input0", B, "output0");
gegl_node_connect_from(C, "input1", B, "output1");
ct_test(test, do_visitor_and_check_visit_order(visit_order, 3, C));
......@@ -215,8 +215,8 @@ test_dfs_node_visitor(Test *test)
GeglNode *A = g_object_new (GEGL_TYPE_NODE, "name", "A", "operation", "GeglMockOperation12", NULL);
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation21", NULL);
gegl_node_connect(B, "input0", A, "output0");
gegl_node_connect(B, "input1", A, "output1");
gegl_node_connect_from(B, "input0", A, "output0");
gegl_node_connect_from(B, "input1", A, "output1");
ct_test(test, do_visitor_and_check_visit_order(visit_order, 2, B));
......@@ -246,9 +246,9 @@ test_dfs_node_visitor(Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation11", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation21", NULL);
gegl_node_connect(B, "input0", A, "output0");
gegl_node_connect(C, "input1", B, "output0");
gegl_node_connect(C, "input0", A, "output0");
gegl_node_connect_from(B, "input0", A, "output0");
gegl_node_connect_from(C, "input1", B, "output0");
gegl_node_connect_from(C, "input0", A, "output0");
ct_test(test, do_visitor_and_check_visit_order(visit_order, 3, C));
......@@ -287,10 +287,10 @@ test_dfs_node_visitor(Test *test)
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation11", NULL);
GeglNode *D = g_object_new (GEGL_TYPE_NODE, "name", "D", "operation", "GeglMockOperation21", NULL);
gegl_node_connect(B, "input0", A, "output0");
gegl_node_connect(C, "input0", B, "output0");
gegl_node_connect(D, "input0", B, "output0");
gegl_node_connect(D, "input1", C, "output0");
gegl_node_connect_from(B, "input0", A, "output0");
gegl_node_connect_from(C, "input0", B, "output0");
gegl_node_connect_from(D, "input0", B, "output0");
gegl_node_connect_from(D, "input1", C, "output0");
ct_test(test, do_visitor_and_check_visit_order(visit_order, 4, D));
......@@ -328,10 +328,10 @@ test_dfs_node_visitor(Test *test)
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation11", NULL);
GeglNode *D = g_object_new (GEGL_TYPE_NODE, "name", "D", "operation", "GeglMockOperation21", NULL);
gegl_node_connect(B, "input0", A, "output0");
gegl_node_connect(C, "input0", B, "output0");
gegl_node_connect(D, "input1", C, "output0");
gegl_node_connect(D, "input0", A, "output0");
gegl_node_connect_from(B, "input0", A, "output0");
gegl_node_connect_from(C, "input0", B, "output0");
gegl_node_connect_from(D, "input1", C, "output0");
gegl_node_connect_from(D, "input0", A, "output0");
ct_test(test, do_visitor_and_check_visit_order(visit_order, 4, D));
......@@ -369,13 +369,13 @@ test_dfs_node_visitor(Test *test)
GeglNode *F = g_object_new (GEGL_TYPE_NODE, "name", "F", "operation", "GeglMockOperation11", NULL);
GeglNode *G = g_object_new (GEGL_TYPE_NODE, "name", "G", "operation", "GeglMockOperation01", NULL);
gegl_node_connect(B, "input0", A, "output0");
gegl_node_connect(D, "input0", B, "output0");
gegl_node_connect(C, "input0", A, "output0");
gegl_node_connect(D, "input1", C, "output0");
gegl_node_connect(F, "input0", G, "output0");
gegl_node_connect(E, "input0", D, "output0");
gegl_node_connect(E, "input1", F, "output0");
gegl_node_connect_from(B, "input0", A, "output0");
gegl_node_connect_from(D, "input0", B, "output0");
gegl_node_connect_from(C, "input0", A, "output0");
gegl_node_connect_from(D, "input1", C, "output0");
gegl_node_connect_from(F, "input0", G, "output0");
gegl_node_connect_from(E, "input0", D, "output0");
gegl_node_connect_from(E, "input1", F, "output0");
ct_test(test, do_visitor_and_check_visit_order(visit_order, 7, E));
......
......@@ -73,8 +73,8 @@ test_dfs_pad_visitor (Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation01", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (C, "input0", A, "output0");
gegl_node_connect (C, "input1", B, "output0");
gegl_node_connect_from (C, "input0", A, "output0");
gegl_node_connect_from (C, "input1", B, "output0");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 5, "output0", C));
......@@ -106,8 +106,8 @@ test_dfs_pad_visitor (Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation11", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation11", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (C, "input0", B, "output0");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (C, "input0", B, "output0");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 5, "output0", C));
......@@ -135,8 +135,8 @@ test_dfs_pad_visitor (Test *test)
GeglNode *A = g_object_new (GEGL_TYPE_NODE, "name", "A", "operation", "GeglMockOperation01", NULL);
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (B, "input1", A, "output0");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (B, "input1", A, "output0");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 4, "output0", B));
......@@ -170,8 +170,8 @@ test_dfs_pad_visitor (Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation21", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (C, "input1", B, "output0");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (C, "input1", B, "output0");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 7, "output0", C));
......@@ -207,10 +207,10 @@ test_dfs_pad_visitor (Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation22", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (B, "input1", A, "output0");
gegl_node_connect (C, "input0", B, "output0");
gegl_node_connect (C, "input1", B, "output1");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (B, "input1", A, "output0");
gegl_node_connect_from (C, "input0", B, "output0");
gegl_node_connect_from (C, "input1", B, "output1");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 8, "output0", C));
......@@ -240,8 +240,8 @@ test_dfs_pad_visitor (Test *test)
GeglNode *A = g_object_new (GEGL_TYPE_NODE, "name", "A", "operation", "GeglMockOperation12", NULL);
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (B, "input1", A, "output1");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (B, "input1", A, "output1");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 6, "output0", B));
......@@ -274,9 +274,9 @@ test_dfs_pad_visitor (Test *test)
GeglNode *B = g_object_new (GEGL_TYPE_NODE, "name", "B", "operation", "GeglMockOperation11", NULL);
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (C, "input1", B, "output0");
gegl_node_connect (C, "input0", A, "output0");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (C, "input1", B, "output0");
gegl_node_connect_from (C, "input0", A, "output0");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 6, "output0", C));
......@@ -320,10 +320,10 @@ test_dfs_pad_visitor (Test *test)
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation11", NULL);
GeglNode *D = g_object_new (GEGL_TYPE_NODE, "name", "D", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (C, "input0", B, "output0");
gegl_node_connect (D, "input0", B, "output0");
gegl_node_connect (D, "input1", C, "output0");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (C, "input0", B, "output0");
gegl_node_connect_from (D, "input0", B, "output0");
gegl_node_connect_from (D, "input1", C, "output0");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 9, "output0", D));
......@@ -365,10 +365,10 @@ test_dfs_pad_visitor (Test *test)
GeglNode *C = g_object_new (GEGL_TYPE_NODE, "name", "C", "operation", "GeglMockOperation11", NULL);
GeglNode *D = g_object_new (GEGL_TYPE_NODE, "name", "D", "operation", "GeglMockOperation21", NULL);
gegl_node_connect (B, "input0", A, "output0");
gegl_node_connect (C, "input0", B, "output0");
gegl_node_connect (D, "input1", C, "output0");
gegl_node_connect (D, "input0", A, "output0");
gegl_node_connect_from (B, "input0", A, "output0");
gegl_node_connect_from (C, "input0", B, "output0");
gegl_node_connect_from (D, "input1", C, "output0");
gegl_node_connect_from (D, "input0", A, "output0");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 8, "output0", D));
......@@ -415,8 +415,8 @@ test_dfs_pad_visitor (Test *test)
gegl_node_add_pad (D, output0);
gegl_node_add_pad (D, input0);
gegl_node_connect (B, "input0", D, "output0");
gegl_node_connect (D, "input0", C, "output0");
gegl_node_connect_from (B, "input0", D, "output0");
gegl_node_connect_from (D, "input0", C, "output0");
ct_test (test, do_visitor_and_check_visit_order (visit_order, 5, "output0", B));
......
......@@ -72,7 +72,7 @@ test_graph_properties(Test *test)
ct_test(test, 1 == gegl_node_get_num_output_pads(GEGL_NODE(graph)));
ct_test(test, 1 == gegl_node_get_num_input_pads(GEGL_NODE(graph)));
gegl_node_connect(B, "input0", GEGL_NODE(graph), "output0");
gegl_node_connect_from(B, "input0", GEGL_NODE(graph), "output0");
ct_test(test, 0 == gegl_node_get_num_sinks(A));
ct_test(test, 1 == gegl_node_get_num_sinks(GEGL_NODE(graph)));
......@@ -126,8 +126,8 @@ test_graph_properties(Test *test)
ct_test(test, 1 == gegl_node_get_num_output_pads(D));
ct_test(test, 1 == gegl_node_get_num_input_pads(D));
gegl_node_connect(B, "input0", D, "output0");
gegl_node_connect(D, "input0", C, "output0");
gegl_node_connect_from(B, "input0", D, "output0");
gegl_node_connect_from(D, "input0", C, "output0");
ct_test(test, 0 == gegl_node_get_num_sinks(A));
ct_test(test, 0 == gegl_node_get_num_sources(A));
......@@ -199,8 +199,8 @@ test_graph_property_visitors(Test *test)