X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt_query_exec.i;h=77838b1f918dbaddd83272c98e4f5cba711e7c2c;hp=af78efaf1f5c0ad52b9ea3168cc2e036a2c6697f;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hpb=578e048b5debf169e286e5b5cc747b5d6c16886d

diff --git a/src/bindings/python/bt2/bt2/native_bt_query_exec.i b/src/bindings/python/bt2/bt2/native_bt_query_exec.i
index af78efaf..77838b1f 100644
--- a/src/bindings/python/bt2/bt2/native_bt_query_exec.i
+++ b/src/bindings/python/bt2/bt2/native_bt_query_exec.i
@@ -1,62 +1,16 @@
 /*
- * The MIT License (MIT)
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2017 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
  */
 
-/* From query-executor-const.h */
-
-typedef enum bt_query_executor_status {
-	BT_QUERY_EXECUTOR_STATUS_OK = 0,
-	BT_QUERY_EXECUTOR_STATUS_AGAIN = 11,
-	BT_QUERY_EXECUTOR_STATUS_UNSUPPORTED = 95,
-	BT_QUERY_EXECUTOR_STATUS_CANCELED = 125,
-	BT_QUERY_EXECUTOR_STATUS_ERROR = -1,
-	BT_QUERY_EXECUTOR_STATUS_NOMEM = -12,
-	BT_QUERY_EXECUTOR_STATUS_INVALID_OBJECT = -23,
-	BT_QUERY_EXECUTOR_STATUS_INVALID_PARAMS = -24,
-} bt_query_executor_status;
-
-extern
-bt_bool bt_query_executor_is_canceled(
-		const bt_query_executor *query_executor);
-
-extern void bt_query_executor_get_ref(
-		const bt_query_executor *query_executor);
-
-extern void bt_query_executor_put_ref(
-		const bt_query_executor *query_executor);
-
-/* From query-executor.h */
-
-extern
-bt_query_executor *bt_query_executor_create(void);
+%include <babeltrace2/graph/private-query-executor.h>
+%include <babeltrace2/graph/query-executor.h>
 
-extern
-bt_query_executor_status bt_query_executor_query(
-		bt_query_executor *query_executor,
-		const bt_component_class *component_class,
-		const char *object, const bt_value *params,
-		const bt_value **OUT);
+%{
+#include "native_bt_query_exec.i.h"
+%}
 
-extern
-bt_query_executor_status bt_query_executor_cancel(
-		bt_query_executor *query_executor);
+bt_query_executor *bt_bt2_query_executor_create(
+		const bt_component_class *component_class, const char *object,
+		const bt_value *params, PyObject *py_obj);