#ifndef BABELTRACE_PLUGIN_CTF_FS_QUERY_H
#define BABELTRACE_PLUGIN_CTF_FS_QUERY_H
-#include "common/macros.h"
-#include <babeltrace2/babeltrace.h>
-
-BT_HIDDEN
-bt_component_class_query_method_status metadata_info_query(
- bt_self_component_class_source *comp_class,
- const bt_value *params,
- bt_logging_level log_level, const bt_value **result);
-
-BT_HIDDEN
-bt_component_class_query_method_status trace_infos_query(
- bt_self_component_class_source *comp_class,
- const bt_value *params, bt_logging_level log_level,
- const bt_value **result);
-
-BT_HIDDEN
-bt_component_class_query_method_status support_info_query(
- bt_self_component_class_source *comp_class,
- const bt_value *params, bt_logging_level log_level,
- const bt_value **result);
+#include "cpp-common/bt2/value.hpp"
+
+namespace bt2c {
+
+class Logger;
+
+} /* namespace bt2c */
+
+bt2::Value::Shared metadata_info_query(bt2::ConstMapValue params, const bt2c::Logger& logger);
+
+bt2::Value::Shared trace_infos_query(bt2::ConstMapValue params, const bt2c::Logger& logger);
+
+bt2::Value::Shared support_info_query(bt2::ConstMapValue params, const bt2c::Logger& logger);
#endif /* BABELTRACE_PLUGIN_CTF_FS_QUERY_H */