Cleanup: use "pyrna_enum_*" prefix for RNA utility functions

5 files changed, 10 insertions, 10 deletions

diff --git a/source/blender/python/intern/bpy_msgbus.c b/source/blender/python/intern/bpy_msgbus.c
index 0aff1249923..75a5f6f72ae 100644
--- a/source/blender/python/intern/bpy_msgbus.c
+++ b/source/blender/python/intern/bpy_msgbus.c
@@ -261,7 +261,7 @@ static PyObject *bpy_msgbus_subscribe_rna(PyObject *UNUSED(self), PyObject *args
   }
 
   if (py_options &&
-      (pyrna_set_to_enum_bitfield(py_options_enum, py_options, &options, error_prefix)) == -1) {
+      (pyrna_enum_bitfield_from_set(py_options_enum, py_options, &options, error_prefix)) == -1) {
     return NULL;
   }
 
diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c
index a08b375ee61..5ae123f3254 100644
--- a/source/blender/python/intern/bpy_operator.c
+++ b/source/blender/python/intern/bpy_operator.c
@@ -108,7 +108,7 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args)
 
   if (context_str) {
     if (RNA_enum_value_from_id(rna_enum_operator_context_items, context_str, &context) == 0) {
-      char *enum_str = BPy_enum_as_string(rna_enum_operator_context_items);
+      char *enum_str = pyrna_enum_repr(rna_enum_operator_context_items);
       PyErr_Format(PyExc_TypeError,
                    "Calling operator \"bpy.ops.%s.poll\" error, "
                    "expected a string enum in (%s)",
@@ -210,7 +210,7 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
 
   if (context_str) {
     if (RNA_enum_value_from_id(rna_enum_operator_context_items, context_str, &context) == 0) {
-      char *enum_str = BPy_enum_as_string(rna_enum_operator_context_items);
+      char *enum_str = pyrna_enum_repr(rna_enum_operator_context_items);
       PyErr_Format(PyExc_TypeError,
                    "Calling operator \"bpy.ops.%s\" error, "
                    "expected a string enum in (%s)",
@@ -347,7 +347,7 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
   BPY_modules_update();
 
   /* return operator_ret as a bpy enum */
-  return pyrna_enum_bitfield_to_py(rna_enum_operator_return_items, operator_ret);
+  return pyrna_enum_bitfield_as_set(rna_enum_operator_return_items, operator_ret);
 }
 
 static PyObject *pyop_as_string(PyObject *UNUSED(self), PyObject *args)
@@ -460,7 +460,7 @@ static PyObject *pyop_get_bl_options(PyObject *UNUSED(self), PyObject *value)
   if ((ot = ot_lookup_from_py_string(value, "get_bl_options")) == NULL) {
     return NULL;
   }
-  return pyrna_enum_bitfield_to_py(rna_enum_operator_type_flag_items, ot->flag);
+  return pyrna_enum_bitfield_as_set(rna_enum_operator_type_flag_items, ot->flag);
 }
 
 static struct PyMethodDef bpy_ops_methods[] = {
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 42db49b7688..9d0755a865d 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -1213,7 +1213,7 @@ static const char *pyrna_enum_as_string(PointerRNA *ptr, PropertyRNA *prop)
 
   RNA_property_enum_items(BPY_context_get(), ptr, prop, &item, NULL, &free);
   if (item) {
-    result = BPy_enum_as_string(item);
+    result = pyrna_enum_repr(item);
   }
   else {
     result = "";
@@ -1275,7 +1275,7 @@ static int pyrna_prop_to_enum_bitfield(
   RNA_property_enum_items(BPY_context_get(), ptr, prop, &item, NULL, &free);
 
   if (item) {
-    ret = pyrna_set_to_enum_bitfield(item, value, r_value, error_prefix);
+    ret = pyrna_enum_bitfield_from_set(item, value, r_value, error_prefix);
   }
   else {
     if (PySet_GET_SIZE(value)) {
diff --git a/source/blender/python/intern/bpy_rna_anim.c b/source/blender/python/intern/bpy_rna_anim.c
index 4063bb702bb..f4fe5838c6e 100644
--- a/source/blender/python/intern/bpy_rna_anim.c
+++ b/source/blender/python/intern/bpy_rna_anim.c
@@ -266,7 +266,7 @@ static int pyrna_struct_keyframe_parse(PointerRNA *ptr,
   /* flag may be null (no option currently for remove keyframes e.g.). */
   if (r_options) {
     if (pyoptions &&
-        (pyrna_set_to_enum_bitfield(
+        (pyrna_enum_bitfield_from_set(
              rna_enum_keying_flag_items_api, pyoptions, r_options, error_prefix) == -1)) {
       return -1;
     }
diff --git a/source/blender/python/intern/bpy_rna_id_collection.c b/source/blender/python/intern/bpy_rna_id_collection.c
index 4f3480ddc13..2e684faf61b 100644
--- a/source/blender/python/intern/bpy_rna_id_collection.c
+++ b/source/blender/python/intern/bpy_rna_id_collection.c
@@ -179,7 +179,7 @@ static PyObject *bpy_user_map(PyObject *UNUSED(self), PyObject *args, PyObject *
   }
 
   if (key_types) {
-    key_types_bitmap = pyrna_set_to_enum_bitmap(
+    key_types_bitmap = pyrna_enum_bitmap_from_set(
         rna_enum_id_type_items, key_types, sizeof(short), true, USHRT_MAX, "key types");
     if (key_types_bitmap == NULL) {
       goto error;
@@ -187,7 +187,7 @@ static PyObject *bpy_user_map(PyObject *UNUSED(self), PyObject *args, PyObject *
   }
 
   if (val_types) {
-    val_types_bitmap = pyrna_set_to_enum_bitmap(
+    val_types_bitmap = pyrna_enum_bitmap_from_set(
         rna_enum_id_type_items, val_types, sizeof(short), true, USHRT_MAX, "value types");
     if (val_types_bitmap == NULL) {
       goto error;