X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fcomponent-class-sink.h;h=b57abc94cf713092634490bb8200dd0160b22af0;hb=8eee8ea204462cf0efd8c3b59a4dd57709fffb0b;hp=196a2ef13dbe680202d4ccc589acb373774f7416;hpb=8c6884d908cf7a7cf2340f3384441278635d19e1;p=babeltrace.git

diff --git a/include/babeltrace/graph/component-class-sink.h b/include/babeltrace/graph/component-class-sink.h
index 196a2ef1..b57abc94 100644
--- a/include/babeltrace/graph/component-class-sink.h
+++ b/include/babeltrace/graph/component-class-sink.h
@@ -32,89 +32,87 @@
 /* For enum bt_query_status */
 #include <babeltrace/graph/component-class.h>
 
+/*
+ * For bt_component_class, bt_component_class_sink, bt_port_output,
+ * bt_query_executor, bt_self_component_class_sink,
+ * bt_self_component_sink, bt_self_component_port_input, bt_value
+ */
+#include <babeltrace/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_component_class;
-struct bt_component_class_sink;
-struct bt_port_output;
-struct bt_query_executor;
-struct bt_self_component_class_sink;
-struct bt_self_component_port_input;
-struct bt_self_component_sink;
-struct bt_value;
-
 typedef enum bt_self_component_status
 (*bt_component_class_sink_init_method)(
-		struct bt_self_component_sink *self_component,
-		const struct bt_value *params, void *init_method_data);
+		bt_self_component_sink *self_component,
+		const bt_value *params, void *init_method_data);
 
 typedef void (*bt_component_class_sink_finalize_method)(
-		struct bt_self_component_sink *self_component);
+		bt_self_component_sink *self_component);
 
 typedef enum bt_query_status
 (*bt_component_class_sink_query_method)(
-		struct bt_self_component_class_sink *comp_class,
-		const struct bt_query_executor *query_executor,
-		const char *object, const struct bt_value *params,
-		const struct bt_value **result);
+		bt_self_component_class_sink *comp_class,
+		const bt_query_executor *query_executor,
+		const char *object, const bt_value *params,
+		const bt_value **result);
 
 typedef enum bt_self_component_status
 (*bt_component_class_sink_accept_input_port_connection_method)(
-		struct bt_self_component_sink *self_component,
-		struct bt_self_component_port_input *self_port,
-		const struct bt_port_output *other_port);
+		bt_self_component_sink *self_component,
+		bt_self_component_port_input *self_port,
+		const bt_port_output *other_port);
 
 typedef enum bt_self_component_status
 (*bt_component_class_sink_input_port_connected_method)(
-		struct bt_self_component_sink *self_component,
-		struct bt_self_component_port_input *self_port,
-		const struct bt_port_output *other_port);
+		bt_self_component_sink *self_component,
+		bt_self_component_port_input *self_port,
+		const bt_port_output *other_port);
 
 typedef void
 (*bt_component_class_sink_input_port_disconnected_method)(
-		struct bt_self_component_sink *self_component,
-		struct bt_self_component_port_input *self_port);
+		bt_self_component_sink *self_component,
+		bt_self_component_port_input *self_port);
 
 typedef enum bt_self_component_status
 (*bt_component_class_sink_consume_method)(
-	struct bt_self_component_sink *self_component);
+	bt_self_component_sink *self_component);
 
 static inline
-struct bt_component_class *bt_component_class_sink_as_component_class(
-		struct bt_component_class_sink *comp_cls_sink)
+bt_component_class *bt_component_class_sink_as_component_class(
+		bt_component_class_sink *comp_cls_sink)
 {
 	return (void *) comp_cls_sink;
 }
 
 extern
-struct bt_component_class_sink *bt_component_class_sink_create(
+bt_component_class_sink *bt_component_class_sink_create(
 		const char *name,
 		bt_component_class_sink_consume_method method);
 
 extern int bt_component_class_sink_set_init_method(
-		struct bt_component_class_sink *comp_class,
+		bt_component_class_sink *comp_class,
 		bt_component_class_sink_init_method method);
 
 extern int bt_component_class_sink_set_finalize_method(
-		struct bt_component_class_sink *comp_class,
+		bt_component_class_sink *comp_class,
 		bt_component_class_sink_finalize_method method);
 
 extern int bt_component_class_sink_set_accept_input_port_connection_method(
-		struct bt_component_class_sink *comp_class,
+		bt_component_class_sink *comp_class,
 		bt_component_class_sink_accept_input_port_connection_method method);
 
 extern int bt_component_class_sink_set_input_port_connected_method(
-		struct bt_component_class_sink *comp_class,
+		bt_component_class_sink *comp_class,
 		bt_component_class_sink_input_port_connected_method method);
 
 extern int bt_component_class_sink_set_input_port_disconnected_method(
-		struct bt_component_class_sink *comp_class,
+		bt_component_class_sink *comp_class,
 		bt_component_class_sink_input_port_disconnected_method method);
 
 extern int bt_component_class_sink_set_query_method(
-		struct bt_component_class_sink *comp_class,
+		bt_component_class_sink *comp_class,
 		bt_component_class_sink_query_method method);
 
 #ifdef __cplusplus