Rename bt_ctf_X -> bt_X, maintain backward compat. for pre-2.0 CTF writer

[babeltrace.git] / plugins / ctf / fs-src / fs.h

diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h
index f5eaabb8f739cfc5d6912f42e90eb1ea8e7298cc..bbac1bb4d96daf7ee4fcbf286b702ed118c26141 100644 (file)
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -30,8 +30,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
+#include <babeltrace/babeltrace.h>
 #include "data-stream-file.h"
 #include "metadata.h"
 
@@ -50,7 +49,7 @@ struct ctf_fs_file {
 
 struct ctf_fs_metadata {
        /* Owned by this */
-       struct bt_ctf_trace *trace;
+       struct bt_trace *trace;
 
        /* Owned by this */
        char *text;
@@ -103,10 +102,10 @@ struct ctf_fs_ds_file_group {
        GPtrArray *ds_file_infos;
 
        /* Owned by this */
-       struct bt_ctf_stream_class *stream_class;
+       struct bt_stream_class *stream_class;
 
        /* Owned by this */
-       struct bt_ctf_stream *stream;
+       struct bt_stream *stream;
 
        /* Stream (instance) ID; -1ULL means none */
        uint64_t stream_id;
@@ -131,7 +130,7 @@ struct ctf_fs_notif_iter_data {
        size_t ds_file_info_index;
 
        /* Owned by this */
-       struct bt_ctf_notif_iter *notif_iter;
+       struct bt_notif_iter *notif_iter;
 };
 
 BT_HIDDEN