Add iterator and source implementations

[babeltrace.git] / include / babeltrace / plugin / component-internal.h

diff --git a/include/babeltrace/plugin/component-internal.h b/include/babeltrace/plugin/component-internal.h
index 3fc85c858c90b905e5a40531960cfb4308f729b1..ea6c489daf681d64bc3b22fe615c4e9218c4be84 100644 (file)
--- a/include/babeltrace/plugin/component-internal.h
+++ b/include/babeltrace/plugin/component-internal.h
@@ -28,40 +28,29 @@
  */
 
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/plugin.h>
-#include <babeltrace/plugin/component.h>
 #include <babeltrace/plugin/plugin-system.h>
+#include <babeltrace/plugin/component.h>
 #include <babeltrace/ctf-writer/ref-internal.h>
 #include <glib.h>
 #include <stdio.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct bt_notification;
-
 struct bt_component {
        struct bt_ctf_ref ref_count;
        GString *name;
-       enum bt_plugin_type type;
+       enum bt_component_type type;
        /** No ownership taken */
        FILE *error_stream;
 
        void *user_data;
-       bt_plugin_destroy_cb user_data_destroy;
-       bt_plugin_destroy_cb destroy;
+       bt_component_destroy_cb user_data_destroy;
+       bt_component_destroy_cb destroy;
 };
 
 BT_HIDDEN
-enum bt_component_status bt_component_init(struct bt_component *plugin,
+enum bt_component_status bt_component_init(struct bt_component *component,
                const char *name, void *user_data,
                bt_component_destroy_cb destroy_func,
                enum bt_component_type component_type,
                bt_component_destroy_cb component_destroy);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* BABELTRACE_PLUGIN_COMPONENT_INTERNAL_H */