Created more converters for Python arguments.

4 files changed, 8 insertions, 20 deletions

diff --git a/plugins/pychrysalide/analysis/types/array.c b/plugins/pychrysalide/analysis/types/array.c
index 5224d36..9c3a1ea 100644
--- a/plugins/pychrysalide/analysis/types/array.c
+++ b/plugins/pychrysalide/analysis/types/array.c
@@ -82,16 +82,13 @@ static int py_array_type_set_dimension_expression(PyObject *, PyObject *, void *
 static PyObject *py_array_type_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
     PyObject *result;                       /* Instance à retourner        */
-    PyObject *members_obj;                  /* Objet du type d'éléments    */
-    int ret;                                /* Bilan de lecture des args.  */
     GDataType *members;                     /* Version GLib du type        */
+    int ret;                                /* Bilan de lecture des args.  */
     GDataType *dtype;                       /* Version GLib du type        */
 
-    ret = PyArg_ParseTuple(args, "O!", get_python_data_type_type(), &members_obj);
+    ret = PyArg_ParseTuple(args, "O&", convert_to_data_type, &members);
     if (!ret) return NULL;
 
-    members = G_DATA_TYPE(pygobject_get(members_obj));
-
     dtype = g_array_type_new(members);
     result = pygobject_new(G_OBJECT(dtype));
     g_object_unref(dtype);
diff --git a/plugins/pychrysalide/analysis/types/encaps.c b/plugins/pychrysalide/analysis/types/encaps.c
index c2d435c..b876547 100644
--- a/plugins/pychrysalide/analysis/types/encaps.c
+++ b/plugins/pychrysalide/analysis/types/encaps.c
@@ -66,16 +66,13 @@ static PyObject *py_encapsulated_type_new(PyTypeObject *type, PyObject *args, Py
 {
     PyObject *result;                       /* Instance à retourner        */
     EncapsulationType encapsulation;        /* Type d'encapsulation        */
-    PyObject *encaps_obj;                   /* Objet du type encapsulé     */
-    int ret;                                /* Bilan de lecture des args.  */
     GDataType *encapsulated;                /* Type encapsulé              */
+    int ret;                                /* Bilan de lecture des args.  */
     GDataType *dtype;                       /* Version GLib du type        */
 
-    ret = PyArg_ParseTuple(args, "kO!", &encapsulation, get_python_data_type_type(), &encaps_obj);
+    ret = PyArg_ParseTuple(args, "kO&", &encapsulation, convert_to_data_type, &encapsulated);
     if (!ret) return NULL;
 
-    encapsulated = G_DATA_TYPE(pygobject_get(encaps_obj));
-
     dtype = g_encapsulated_type_new(encapsulation, encapsulated);
     result = pygobject_new(G_OBJECT(dtype));
     g_object_unref(dtype);
diff --git a/plugins/pychrysalide/analysis/types/proto.c b/plugins/pychrysalide/analysis/types/proto.c
index a6046ab..975be1e 100644
--- a/plugins/pychrysalide/analysis/types/proto.c
+++ b/plugins/pychrysalide/analysis/types/proto.c
@@ -98,18 +98,15 @@ static PyObject *py_proto_type_new(PyTypeObject *type, PyObject *args, PyObject
 
 static PyObject *py_proto_type_add_arg(PyObject *self, PyObject *args)
 {
-    PyObject *arg_obj;                      /* Objet du type d'argument  */
-    int ret;                                /* Bilan de lecture des args.  */
     GDataType *arg;                         /* Version GLib du type        */
+    int ret;                                /* Bilan de lecture des args.  */
     GProtoType *type;                       /* Version GLib du type        */
 
-    ret = PyArg_ParseTuple(args, "O!", get_python_data_type_type(), &arg_obj);
+    ret = PyArg_ParseTuple(args, "O&", convert_to_data_type, &arg);
     if (!ret) return NULL;
 
     type = G_PROTO_TYPE(pygobject_get(self));
 
-    arg = G_DATA_TYPE(pygobject_get(arg_obj));
-
     g_object_ref(G_OBJECT(arg));
     g_proto_type_add_arg(type, arg);
 
diff --git a/plugins/pychrysalide/analysis/types/template.c b/plugins/pychrysalide/analysis/types/template.c
index 485eca4..0f6c002 100644
--- a/plugins/pychrysalide/analysis/types/template.c
+++ b/plugins/pychrysalide/analysis/types/template.c
@@ -99,18 +99,15 @@ static PyObject *py_template_type_new(PyTypeObject *type, PyObject *args, PyObje
 
 static PyObject *py_template_type_add_param(PyObject *self, PyObject *args)
 {
-    PyObject *param_obj;                    /* Objet du type de paramètre  */
-    int ret;                                /* Bilan de lecture des args.  */
     GDataType *param;                       /* Version GLib du type        */
+    int ret;                                /* Bilan de lecture des args.  */
     GTemplateType *type;                    /* Version GLib du type        */
 
-    ret = PyArg_ParseTuple(args, "O!", get_python_data_type_type(), &param_obj);
+    ret = PyArg_ParseTuple(args, "O&", convert_to_data_type, &param);
     if (!ret) return NULL;
 
     type = G_TEMPLATE_TYPE(pygobject_get(self));
 
-    param = G_DATA_TYPE(pygobject_get(param_obj));
-
     g_object_ref(G_OBJECT(param));
     g_template_type_add_param(type, param);