Avoid unnecessary inclusions in public headers

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

diff --git a/plugins/utils/trimmer/iterator.c b/plugins/utils/trimmer/iterator.c
index fd0ef2a5f06fc4d82d6c4bd58388d58332f6c12c..f7094c90d8ebd21b841546512491983e2bd09d53 100644 (file)
--- a/plugins/utils/trimmer/iterator.c
+++ b/plugins/utils/trimmer/iterator.c
@@ -31,25 +31,7 @@
 
 #include <babeltrace/compat/time-internal.h>
 #include <babeltrace/compat/utc-internal.h>
-#include <babeltrace/graph/notification-iterator.h>
-#include <babeltrace/graph/private-notification-iterator.h>
-#include <babeltrace/graph/notification.h>
-#include <babeltrace/graph/notification-event.h>
-#include <babeltrace/graph/notification-stream.h>
-#include <babeltrace/graph/notification-packet.h>
-#include <babeltrace/graph/component-filter.h>
-#include <babeltrace/graph/private-component-filter.h>
-#include <babeltrace/graph/private-port.h>
-#include <babeltrace/graph/private-connection.h>
-#include <babeltrace/graph/private-component.h>
-#include <babeltrace/graph/connection.h>
-#include <babeltrace/ctf-ir/event.h>
-#include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/clock-class.h>
-#include <babeltrace/ctf-ir/packet.h>
-#include <babeltrace/ctf-ir/trace.h>
-#include <babeltrace/ctf-ir/fields.h>
+#include <babeltrace/babeltrace.h>
 #include <assert.h>
 #include <plugins-common.h>
 
@@ -67,11 +49,11 @@ gboolean close_packets(gpointer key, gpointer value, gpointer user_data)
 }
 
 BT_HIDDEN
-void trimmer_iterator_finalize(struct bt_private_notification_iterator *it)
+void trimmer_iterator_finalize(struct bt_private_connection_private_notification_iterator *it)
 {
        struct trimmer_iterator *trim_it;
 
-       trim_it = bt_private_notification_iterator_get_user_data(it);
+       trim_it = bt_private_connection_private_notification_iterator_get_user_data(it);
        assert(trim_it);
 
        bt_put(trim_it->input_iterator);
@@ -83,7 +65,7 @@ void trimmer_iterator_finalize(struct bt_private_notification_iterator *it)
 
 BT_HIDDEN
 enum bt_notification_iterator_status trimmer_iterator_init(
-               struct bt_private_notification_iterator *iterator,
+               struct bt_private_connection_private_notification_iterator *iterator,
                struct bt_private_port *port)
 {
        enum bt_notification_iterator_status ret =
@@ -93,7 +75,7 @@ enum bt_notification_iterator_status trimmer_iterator_init(
        struct bt_private_port *input_port = NULL;
        struct bt_private_connection *connection = NULL;
        struct bt_private_component *component =
-               bt_private_notification_iterator_get_private_component(iterator);
+               bt_private_connection_private_notification_iterator_get_private_component(iterator);
        struct trimmer_iterator *it_data = g_new0(struct trimmer_iterator, 1);
        static const enum bt_notification_type notif_types[] = {
                BT_NOTIFICATION_TYPE_EVENT,
@@ -126,7 +108,7 @@ enum bt_notification_iterator_status trimmer_iterator_init(
        it_data->packet_map = g_hash_table_new_full(g_direct_hash,
                        g_direct_equal, NULL, NULL);
 
-       it_ret = bt_private_notification_iterator_set_user_data(iterator,
+       it_ret = bt_private_connection_private_notification_iterator_set_user_data(iterator,
                it_data);
        if (it_ret) {
                goto end;
@@ -582,23 +564,23 @@ enum bt_notification_iterator_status evaluate_notification(
 }
 
 BT_HIDDEN
-struct bt_notification_iterator_next_return trimmer_iterator_next(
-               struct bt_private_notification_iterator *iterator)
+struct bt_notification_iterator_next_method_return trimmer_iterator_next(
+               struct bt_private_connection_private_notification_iterator *iterator)
 {
        struct trimmer_iterator *trim_it = NULL;
        struct bt_private_component *component = NULL;
        struct trimmer *trimmer = NULL;
        struct bt_notification_iterator *source_it = NULL;
-       struct bt_notification_iterator_next_return ret = {
+       struct bt_notification_iterator_next_method_return ret = {
                .status = BT_NOTIFICATION_ITERATOR_STATUS_OK,
                .notification = NULL,
        };
        bool notification_in_range = false;
 
-       trim_it = bt_private_notification_iterator_get_user_data(iterator);
+       trim_it = bt_private_connection_private_notification_iterator_get_user_data(iterator);
        assert(trim_it);
 
-       component = bt_private_notification_iterator_get_private_component(
+       component = bt_private_connection_private_notification_iterator_get_private_component(
                iterator);
        assert(component);
        trimmer = bt_private_component_get_user_data(component);
@@ -635,11 +617,3 @@ end:
        bt_put(component);
        return ret;
 }
-
-BT_HIDDEN
-enum bt_notification_iterator_status trimmer_iterator_seek_time(
-               struct bt_private_notification_iterator *iterator,
-               int64_t time)
-{
-       return BT_NOTIFICATION_ITERATOR_STATUS_OK;
-}