summaryrefslogtreecommitdiff
path: root/plugins/pychrysalide/analysis/types/encaps.c
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/pychrysalide/analysis/types/encaps.c')
-rw-r--r--plugins/pychrysalide/analysis/types/encaps.c37
1 files changed, 2 insertions, 35 deletions
diff --git a/plugins/pychrysalide/analysis/types/encaps.c b/plugins/pychrysalide/analysis/types/encaps.c
index b530394..3a5acb5 100644
--- a/plugins/pychrysalide/analysis/types/encaps.c
+++ b/plugins/pychrysalide/analysis/types/encaps.c
@@ -31,6 +31,7 @@
#include <analysis/types/encaps.h>
+#include "constants.h"
#include "../type.h"
#include "../../access.h"
#include "../../helpers.h"
@@ -43,9 +44,6 @@ static PyObject *py_encapsulated_type_new(PyTypeObject *, PyObject *, PyObject *
/* Fournit le type encapsulée dans le type. */
static PyObject *py_encapsulated_type_get_item(PyObject *, void *);
-/* Définit les constantes pour les types d'encapsulation. */
-static bool py_encapsulated_type_define_constants(PyTypeObject *);
-
/******************************************************************************
@@ -198,37 +196,6 @@ PyTypeObject *get_python_encapsulated_type_type(void)
/******************************************************************************
* *
-* Paramètres : obj_type = type dont le dictionnaire est à compléter. *
-* *
-* Description : Définit les constantes pour les types d'encapsulation. *
-* *
-* Retour : - *
-* *
-* Remarques : - *
-* *
-******************************************************************************/
-
-static bool py_encapsulated_type_define_constants(PyTypeObject *obj_type)
-{
- bool result; /* Bilan à retourner */
-
- result = true;
-
- result &= PyDict_AddULongMacro(obj_type, ECT_POINTER);
- result &= PyDict_AddULongMacro(obj_type, ECT_REFERENCE);
- result &= PyDict_AddULongMacro(obj_type, ECT_RVALUE_REF);
- result &= PyDict_AddULongMacro(obj_type, ECT_COMPLEX);
- result &= PyDict_AddULongMacro(obj_type, ECT_IMAGINARY);
-
- result &= PyDict_AddULongMacro(obj_type, ECT_COUNT);
-
- return result;
-
-}
-
-
-/******************************************************************************
-* *
* Paramètres : module = module dont la définition est à compléter. *
* *
* Description : Prend en charge l'objet 'pychrysalide.....EncapsulatedType'. *
@@ -259,7 +226,7 @@ bool ensure_python_encapsulated_type_is_registered(void)
if (!register_class_for_pygobject(dict, G_TYPE_ENCAPSULATED_TYPE, type, get_python_data_type_type()))
return false;
- if (!py_encapsulated_type_define_constants(type))
+ if (!define_encapsulated_type_constants(type))
return false;
}