Avoid unnecessary inclusions in public headers

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

diff --git a/plugins/utils/trimmer/iterator.h b/plugins/utils/trimmer/iterator.h
index cca226db9b17fd79c518e04d66f1b651a76ebab7..65a74f444a66240eb6b59830bc53f2048c80e7fc 100644 (file)
--- a/plugins/utils/trimmer/iterator.h
+++ b/plugins/utils/trimmer/iterator.h
@@ -28,37 +28,27 @@
  */
 
 #include "trimmer.h"
-#include <babeltrace/component/notification/notification.h>
-#include <babeltrace/component/notification/iterator.h>
-#include <babeltrace/component/private-component.h>
-#include <babeltrace/component/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;
+       FILE *err;
+       /* Map between reader and writer packets. */
+       GHashTable *packet_map;
 };
 
 BT_HIDDEN
 enum bt_notification_iterator_status trimmer_iterator_init(
-               struct bt_private_component *component,
-               struct bt_private_port *port,
-               struct bt_private_notification_iterator *iterator);
+               struct bt_private_connection_private_notification_iterator *iterator,
+               struct bt_private_port *port);
 
 BT_HIDDEN
-void trimmer_iterator_finalize(struct bt_private_notification_iterator *it);
+void trimmer_iterator_finalize(struct bt_private_connection_private_notification_iterator *it);
 
 BT_HIDDEN
-struct bt_notification *trimmer_iterator_get(
-               struct bt_private_notification_iterator *iterator);
-
-BT_HIDDEN
-enum bt_notification_iterator_status trimmer_iterator_next(
-               struct bt_private_notification_iterator *iterator);
-
-BT_HIDDEN
-enum bt_notification_iterator_status trimmer_iterator_seek_time(
-               struct bt_private_notification_iterator *iterator,
-               int64_t time);
+struct bt_notification_iterator_next_method_return trimmer_iterator_next(
+               struct bt_private_connection_private_notification_iterator *iterator);
 
 #endif /* BABELTRACE_PLUGIN_TRIMMER_ITERATOR_H */