lib: add aliases for Babeltrace enumeration types

[babeltrace.git] / plugins / utils / trimmer / iterator.h

diff --git a/plugins/utils/trimmer/iterator.h b/plugins/utils/trimmer/iterator.h
index dc0dcccbc33107da308fe301dc4328637d859791..cede7c8f2da9b4f1424799cb6e8fdc7453c5427e 100644 (file)
--- a/plugins/utils/trimmer/iterator.h
+++ b/plugins/utils/trimmer/iterator.h
@@ -28,30 +28,27 @@
  */
 
 #include "trimmer.h"
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/private-port.h>
+#include <babeltrace/babeltrace.h>
 
 struct trimmer_iterator {
        /* Input iterator associated with this output iterator. */
-       struct bt_notification_iterator *input_iterator;
-       struct bt_notification *current_notification;
+       bt_message_iterator *input_iterator;
+       const bt_message *current_message;
        FILE *err;
        /* Map between reader and writer packets. */
        GHashTable *packet_map;
 };
 
 BT_HIDDEN
-enum bt_notification_iterator_status trimmer_iterator_init(
-               struct bt_private_notification_iterator *iterator,
+bt_message_iterator_status trimmer_iterator_init(
+               bt_self_message_iterator *iterator,
                struct bt_private_port *port);
 
 BT_HIDDEN
-void trimmer_iterator_finalize(struct bt_private_notification_iterator *it);
+void trimmer_iterator_finalize(bt_self_message_iterator *it);
 
 BT_HIDDEN
-struct bt_notification_iterator_next_return trimmer_iterator_next(
-               struct bt_private_notification_iterator *iterator);
+bt_message_iterator_next_method_return trimmer_iterator_next(
+               bt_self_message_iterator *iterator);
 
 #endif /* BABELTRACE_PLUGIN_TRIMMER_ITERATOR_H */