lib: rename "self comp. input port message iter." -> "message iterator"

[babeltrace.git] / src / bindings / python / bt2 / bt2 / native_bt_message_iterator.i

diff --git a/src/bindings/python/bt2/bt2/native_bt_message_iterator.i b/src/bindings/python/bt2/bt2/native_bt_message_iterator.i
index 7362bb7962d861a166689ed166759562f2788af9..23b697999c3c50ee82adb7410e52f7e43ad6bd63 100644 (file)
--- a/src/bindings/python/bt2/bt2/native_bt_message_iterator.i
+++ b/src/bindings/python/bt2/bt2/native_bt_message_iterator.i
@@ -24,18 +24,18 @@
 
 /* Output argument typemap for message_iterator (always appends) */
 %typemap(in, numinputs=0)
-       (bt_self_component_port_input_message_iterator **)
-       (bt_self_component_port_input_message_iterator *temp_msg_iter = NULL) {
+       (bt_message_iterator **)
+       (bt_message_iterator *temp_msg_iter = NULL) {
        $1 = &temp_msg_iter;
 }
 
 %typemap(argout)
-       (bt_self_component_port_input_message_iterator **) {
+       (bt_message_iterator **) {
        if (*$1) {
                /* SWIG_Python_AppendOutput() steals the created object */
                $result = SWIG_Python_AppendOutput($result,
                                SWIG_NewPointerObj(SWIG_as_voidptr(*$1),
-                                       SWIGTYPE_p_bt_self_component_port_input_message_iterator, 0));
+                                       SWIGTYPE_p_bt_message_iterator, 0));
        } else {
                /* SWIG_Python_AppendOutput() steals Py_None */
                Py_INCREF(Py_None);
@@ -44,7 +44,6 @@
 }
 
 %include <babeltrace2/graph/message-iterator.h>
-%include <babeltrace2/graph/self-component-port-input-message-iterator.h>
 %include <babeltrace2/graph/self-message-iterator.h>
 
 /* Helper functions for Python */
@@ -52,17 +51,17 @@
 #include "native_bt_message_iterator.i.h"
 %}
 
-bt_self_component_port_input_message_iterator_create_from_message_iterator_status
-bt_bt2_self_component_port_input_message_iterator_create_from_message_iterator(
+bt_message_iterator_create_from_message_iterator_status
+bt_bt2_message_iterator_create_from_message_iterator(
                bt_self_message_iterator *self_msg_iter,
                bt_self_component_port_input *input_port,
-               bt_self_component_port_input_message_iterator **message_iterator);
-bt_self_component_port_input_message_iterator_create_from_sink_component_status
-bt_bt2_self_component_port_input_message_iterator_create_from_sink_component(
+               bt_message_iterator **message_iterator);
+bt_message_iterator_create_from_sink_component_status
+bt_bt2_message_iterator_create_from_sink_component(
                bt_self_component_sink *self_comp,
                bt_self_component_port_input *input_port,
-               bt_self_component_port_input_message_iterator **message_iterator);
+               bt_message_iterator **message_iterator);
 PyObject *bt_bt2_get_user_component_from_user_msg_iter(
                bt_self_message_iterator *self_message_iterator);
 PyObject *bt_bt2_self_component_port_input_get_msg_range(
-               bt_self_component_port_input_message_iterator *iter);
+               bt_message_iterator *iter);