Split notification iterator API into base and specialized functions

[babeltrace.git] / include / babeltrace / graph / component-class.h

diff --git a/include/babeltrace/graph/component-class.h b/include/babeltrace/graph/component-class.h
index 19f50876fee299f080cd6ff5a7e8b4191af7a7e2..a8498ee303d4c8ebd0b35ffdb1938ebd1ec1e156 100644 (file)
--- a/include/babeltrace/graph/component-class.h
+++ b/include/babeltrace/graph/component-class.h
@@ -41,7 +41,7 @@ struct bt_private_component;
 struct bt_private_port;
 struct bt_port;
 struct bt_value;
-struct bt_private_notification_iterator;
+struct bt_private_connection_private_notification_iterator;
 struct bt_query_executor;
 
 /**
@@ -60,12 +60,12 @@ enum bt_component_class_type {
        BT_COMPONENT_CLASS_TYPE_FILTER =        2,
 };
 
-struct bt_notification_iterator_next_return {
+struct bt_notification_iterator_next_method_return {
        struct bt_notification *notification;
        enum bt_notification_iterator_status status;
 };
 
-struct bt_component_class_query_return {
+struct bt_component_class_query_method_return {
        struct bt_value *result;
        enum bt_query_status status;
 };
@@ -79,16 +79,17 @@ typedef void (*bt_component_class_finalize_method)(
 
 typedef enum bt_notification_iterator_status
                (*bt_component_class_notification_iterator_init_method)(
-               struct bt_private_notification_iterator *private_notification_iterator,
+               struct bt_private_connection_private_notification_iterator *notification_iterator,
                struct bt_private_port *private_port);
 
 typedef void (*bt_component_class_notification_iterator_finalize_method)(
-               struct bt_private_notification_iterator *private_notification_iterator);
+               struct bt_private_connection_private_notification_iterator *notification_iterator);
 
-typedef struct bt_notification_iterator_next_return (*bt_component_class_notification_iterator_next_method)(
-               struct bt_private_notification_iterator *private_notification_iterator);
+typedef struct bt_notification_iterator_next_method_return
+(*bt_component_class_notification_iterator_next_method)(
+               struct bt_private_connection_private_notification_iterator *notification_iterator);
 
-typedef struct bt_component_class_query_return (*bt_component_class_query_method)(
+typedef struct bt_component_class_query_method_return (*bt_component_class_query_method)(
                struct bt_component_class *component_class,
                struct bt_query_executor *query_executor,
                const char *object, struct bt_value *params);
@@ -109,27 +110,27 @@ typedef void (*bt_component_class_port_disconnected_method)(
 
 extern int bt_component_class_set_init_method(
                struct bt_component_class *component_class,
-               bt_component_class_init_method init_method);
+               bt_component_class_init_method method);
 
 extern int bt_component_class_set_finalize_method(
                struct bt_component_class *component_class,
-               bt_component_class_finalize_method finalize_method);
+               bt_component_class_finalize_method method);
 
 extern int bt_component_class_set_accept_port_connection_method(
                struct bt_component_class *component_class,
-               bt_component_class_accept_port_connection_method accept_port_connection_method);
+               bt_component_class_accept_port_connection_method method);
 
 extern int bt_component_class_set_port_connected_method(
                struct bt_component_class *component_class,
-               bt_component_class_port_connected_method port_connected_method);
+               bt_component_class_port_connected_method method);
 
 extern int bt_component_class_set_port_disconnected_method(
                struct bt_component_class *component_class,
-               bt_component_class_port_disconnected_method port_disconnected_method);
+               bt_component_class_port_disconnected_method method);
 
 extern int bt_component_class_set_query_method(
                struct bt_component_class *component_class,
-               bt_component_class_query_method query_method);
+               bt_component_class_query_method method);
 
 extern int bt_component_class_set_description(
                struct bt_component_class *component_class,