diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-22 01:48:52 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-22 01:48:52 +0400 |
commit | b4e968391d2fb54ad6c78883b1216d48187bbca6 (patch) | |
tree | e7e31ca493bb5e8c8d9faffb11995f4a6bd764f7 | |
parent | 39f8c6e189c89f4097f5d979612cb71bd8773030 (diff) |
Attribute renaming: .exact_type_name --> .name. Also did a more generic implementation
of the attribute (meant to be a shortcut of .__class__.__name__).
3 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp index b455ba20cf9..b73942aa357 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp @@ -127,14 +127,14 @@ static PyMethodDef BPy_Interface0D_methods[] = { /*----------------------Interface1D get/setters ----------------------------*/ -PyDoc_STRVAR(Interface0D_exact_type_name_doc, +PyDoc_STRVAR(Interface0D_name_doc, "The string of the name of this 0D element.\n" "\n" ":type: str"); -static PyObject *Interface0D_exact_type_name_get(BPy_Interface0D *self, void *UNUSED(closure)) +static PyObject *Interface0D_name_get(BPy_Interface0D *self, void *UNUSED(closure)) { - return PyUnicode_FromString(self->if0D->getExactTypeName().c_str()); + return PyUnicode_FromString(((PyObject *)self)->ob_type->tp_name); } PyDoc_STRVAR(Interface0D_point_3d_doc, @@ -229,7 +229,7 @@ static PyObject *Interface0D_nature_get(BPy_Interface0D *self, void *UNUSED(clos } static PyGetSetDef BPy_Interface0D_getseters[] = { - {(char *)"exact_type_name", (getter)Interface0D_exact_type_name_get, (setter)NULL, (char *)Interface0D_exact_type_name_doc, NULL}, + {(char *)"name", (getter)Interface0D_name_get, (setter)NULL, (char *)Interface0D_name_doc, NULL}, {(char *)"point_3d", (getter)Interface0D_point_3d_get, (setter)NULL, (char *)Interface0D_point_3d_doc, NULL}, {(char *)"projected_x", (getter)Interface0D_projected_x_get, (setter)NULL, (char *)Interface0D_projected_x_doc, NULL}, {(char *)"projected_y", (getter)Interface0D_projected_y_get, (setter)NULL, (char *)Interface0D_projected_y_doc, NULL}, diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp index c0c5943018b..3511804c690 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp @@ -193,14 +193,14 @@ static PyMethodDef BPy_Interface1D_methods[] = { /*----------------------Interface1D get/setters ----------------------------*/ -PyDoc_STRVAR(Interface1D_exact_type_name_doc, +PyDoc_STRVAR(Interface1D_name_doc, "The string of the name of the 1D element.\n" "\n" ":type: str"); -static PyObject *Interface1D_exact_type_name_get(BPy_Interface1D *self, void *UNUSED(closure)) +static PyObject *Interface1D_name_get(BPy_Interface1D *self, void *UNUSED(closure)) { - return PyUnicode_FromString(self->if1D->getExactTypeName().c_str()); + return PyUnicode_FromString(((PyObject *)self)->ob_type->tp_name); } PyDoc_STRVAR(Interface1D_id_doc, @@ -265,7 +265,7 @@ static int Interface1D_time_stamp_set(BPy_Interface1D *self, PyObject *value, vo } static PyGetSetDef BPy_Interface1D_getseters[] = { - {(char *)"exact_type_name", (getter)Interface1D_exact_type_name_get, (setter)NULL, (char *)Interface1D_exact_type_name_doc, NULL}, + {(char *)"name", (getter)Interface1D_name_get, (setter)NULL, (char *)Interface1D_name_doc, NULL}, {(char *)"id", (getter)Interface1D_id_get, (setter)NULL, (char *)Interface1D_id_doc, NULL}, {(char *)"nature", (getter)Interface1D_nature_get, (setter)NULL, (char *)Interface1D_nature_doc, NULL}, {(char *)"length_2d", (getter)Interface1D_length_2d_get, (setter)NULL, (char *)Interface1D_length_2d_doc, NULL}, diff --git a/source/blender/freestyle/intern/python/BPy_Iterator.cpp b/source/blender/freestyle/intern/python/BPy_Iterator.cpp index a8729f61760..b29620cc8fe 100644 --- a/source/blender/freestyle/intern/python/BPy_Iterator.cpp +++ b/source/blender/freestyle/intern/python/BPy_Iterator.cpp @@ -151,14 +151,14 @@ static PyMethodDef BPy_Iterator_methods[] = { /*----------------------Iterator get/setters ----------------------------*/ -PyDoc_STRVAR(Iterator_exact_type_name_doc, +PyDoc_STRVAR(Iterator_name_doc, "The string of the name of this iterator.\n" "\n" ":type: str"); -static PyObject *Iterator_exact_type_name_get(BPy_Iterator *self, void *UNUSED(closure)) +static PyObject *Iterator_name_get(BPy_Iterator *self, void *UNUSED(closure)) { - return PyUnicode_FromString(self->it->getExactTypeName().c_str()); + return PyUnicode_FromString(((PyObject *)self)->ob_type->tp_name); } PyDoc_STRVAR(Iterator_is_begin_doc, @@ -182,7 +182,7 @@ static PyObject *Iterator_is_end_get(BPy_Iterator *self, void *UNUSED(closure)) } static PyGetSetDef BPy_Iterator_getseters[] = { - {(char *)"exact_type_name", (getter)Iterator_exact_type_name_get, (setter)NULL, (char *)Iterator_exact_type_name_doc, NULL}, + {(char *)"name", (getter)Iterator_name_get, (setter)NULL, (char *)Iterator_name_doc, NULL}, {(char *)"is_begin", (getter)Iterator_is_begin_get, (setter)NULL, (char *)Iterator_is_begin_doc, NULL}, {(char *)"is_end", (getter)Iterator_is_end_get, (setter)NULL, (char *)Iterator_is_end_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ |