diff options
author | Hans Goudey <h.goudey@me.com> | 2022-10-04 01:37:25 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-10-04 01:38:16 +0300 |
commit | 97746129d5870beedc40e3c035c7982ce8a6bebc (patch) | |
tree | b819b8e7875e6684aad7ea1f6bb7922d4fa1c8fc /source/blender/freestyle/intern/python/Interface0D | |
parent | ed7f5713f8f9d605e3cd4cce42e40fb5c6bf4bf5 (diff) |
Cleanup: replace UNUSED macro with commented args in C++ code
This is the conventional way of dealing with unused arguments in C++,
since it works on all compilers.
Regex find and replace: `UNUSED\((\w+)\)` -> `/*$1*/`
Diffstat (limited to 'source/blender/freestyle/intern/python/Interface0D')
6 files changed, 36 insertions, 43 deletions
diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp index 2b6d40e1710..a4067be3dc1 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp @@ -123,7 +123,7 @@ PyDoc_STRVAR(CurvePoint_first_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *CurvePoint_first_svertex_get(BPy_CurvePoint *self, void *UNUSED(closure)) +static PyObject *CurvePoint_first_svertex_get(BPy_CurvePoint *self, void * /*closure*/) { SVertex *A = self->cp->A(); if (A) { @@ -132,9 +132,7 @@ static PyObject *CurvePoint_first_svertex_get(BPy_CurvePoint *self, void *UNUSED Py_RETURN_NONE; } -static int CurvePoint_first_svertex_set(BPy_CurvePoint *self, - PyObject *value, - void *UNUSED(closure)) +static int CurvePoint_first_svertex_set(BPy_CurvePoint *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); @@ -149,7 +147,7 @@ PyDoc_STRVAR(CurvePoint_second_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *CurvePoint_second_svertex_get(BPy_CurvePoint *self, void *UNUSED(closure)) +static PyObject *CurvePoint_second_svertex_get(BPy_CurvePoint *self, void * /*closure*/) { SVertex *B = self->cp->B(); if (B) { @@ -158,9 +156,7 @@ static PyObject *CurvePoint_second_svertex_get(BPy_CurvePoint *self, void *UNUSE Py_RETURN_NONE; } -static int CurvePoint_second_svertex_set(BPy_CurvePoint *self, - PyObject *value, - void *UNUSED(closure)) +static int CurvePoint_second_svertex_set(BPy_CurvePoint *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); @@ -176,7 +172,7 @@ PyDoc_STRVAR(CurvePoint_fedge_doc, "\n" ":type: :class:`FEdge`"); -static PyObject *CurvePoint_fedge_get(BPy_CurvePoint *self, void *UNUSED(closure)) +static PyObject *CurvePoint_fedge_get(BPy_CurvePoint *self, void * /*closure*/) { SVertex *A = self->cp->A(); Interface0D *B = (Interface0D *)self->cp->B(); @@ -192,12 +188,12 @@ PyDoc_STRVAR(CurvePoint_t2d_doc, "\n" ":type: float"); -static PyObject *CurvePoint_t2d_get(BPy_CurvePoint *self, void *UNUSED(closure)) +static PyObject *CurvePoint_t2d_get(BPy_CurvePoint *self, void * /*closure*/) { return PyFloat_FromDouble(self->cp->t2d()); } -static int CurvePoint_t2d_set(BPy_CurvePoint *self, PyObject *value, void *UNUSED(closure)) +static int CurvePoint_t2d_set(BPy_CurvePoint *self, PyObject *value, void * /*closure*/) { float scalar; if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) { diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp index 09202127ad2..cb84b7e82ba 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp @@ -265,13 +265,13 @@ PyDoc_STRVAR(SVertex_point_3d_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *SVertex_point_3d_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_point_3d_get(BPy_SVertex *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 3, SVertex_mathutils_cb_index, MATHUTILS_SUBTYPE_POINT3D); } -static int SVertex_point_3d_set(BPy_SVertex *self, PyObject *value, void *UNUSED(closure)) +static int SVertex_point_3d_set(BPy_SVertex *self, PyObject *value, void * /*closure*/) { float v[3]; if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) { @@ -287,13 +287,13 @@ PyDoc_STRVAR(SVertex_point_2d_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *SVertex_point_2d_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_point_2d_get(BPy_SVertex *self, void * /*closure*/) { return Vector_CreatePyObject_cb( (PyObject *)self, 3, SVertex_mathutils_cb_index, MATHUTILS_SUBTYPE_POINT2D); } -static int SVertex_point_2d_set(BPy_SVertex *self, PyObject *value, void *UNUSED(closure)) +static int SVertex_point_2d_set(BPy_SVertex *self, PyObject *value, void * /*closure*/) { float v[3]; if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) { @@ -309,13 +309,13 @@ PyDoc_STRVAR(SVertex_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *SVertex_id_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_id_get(BPy_SVertex *self, void * /*closure*/) { Id id(self->sv->getId()); return BPy_Id_from_Id(id); // return a copy } -static int SVertex_id_set(BPy_SVertex *self, PyObject *value, void *UNUSED(closure)) +static int SVertex_id_set(BPy_SVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_Id_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an Id"); @@ -332,7 +332,7 @@ PyDoc_STRVAR(SVertex_normals_doc, "\n" ":type: list of :class:`mathutils.Vector` objects"); -static PyObject *SVertex_normals_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_normals_get(BPy_SVertex *self, void * /*closure*/) { PyObject *py_normals; set<Vec3r> normals = self->sv->normals(); @@ -352,7 +352,7 @@ PyDoc_STRVAR(SVertex_normals_size_doc, "\n" ":type: int"); -static PyObject *SVertex_normals_size_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_normals_size_get(BPy_SVertex *self, void * /*closure*/) { return PyLong_FromLong(self->sv->normalsSize()); } @@ -363,7 +363,7 @@ PyDoc_STRVAR(SVertex_viewvertex_doc, "\n" ":type: :class:`ViewVertex`"); -static PyObject *SVertex_viewvertex_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_viewvertex_get(BPy_SVertex *self, void * /*closure*/) { ViewVertex *vv = self->sv->viewvertex(); if (vv) { @@ -385,7 +385,7 @@ PyDoc_STRVAR(SVertex_curvatures_doc, "\n" ":type: tuple"); -static PyObject *SVertex_curvatures_get(BPy_SVertex *self, void *UNUSED(closure)) +static PyObject *SVertex_curvatures_get(BPy_SVertex *self, void * /*closure*/) { const CurvatureInfo *info = self->sv->getCurvatureInfo(); if (!info) { diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp index 4695d61af9c..7b9e7bd213a 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp @@ -118,7 +118,7 @@ PyDoc_STRVAR(ViewVertex_nature_doc, "\n" ":type: :class:`Nature`"); -static PyObject *ViewVertex_nature_get(BPy_ViewVertex *self, void *UNUSED(closure)) +static PyObject *ViewVertex_nature_get(BPy_ViewVertex *self, void * /*closure*/) { Nature::VertexNature nature = self->vv->getNature(); if (PyErr_Occurred()) { @@ -127,7 +127,7 @@ static PyObject *ViewVertex_nature_get(BPy_ViewVertex *self, void *UNUSED(closur return BPy_Nature_from_Nature(nature); // return a copy } -static int ViewVertex_nature_set(BPy_ViewVertex *self, PyObject *value, void *UNUSED(closure)) +static int ViewVertex_nature_set(BPy_ViewVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_Nature_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a Nature"); diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp index 228be7f4f76..35eb95c6f23 100644 --- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp @@ -220,14 +220,12 @@ PyDoc_STRVAR(StrokeVertex_attribute_doc, "\n" ":type: :class:`StrokeAttribute`"); -static PyObject *StrokeVertex_attribute_get(BPy_StrokeVertex *self, void *UNUSED(closure)) +static PyObject *StrokeVertex_attribute_get(BPy_StrokeVertex *self, void * /*closure*/) { return BPy_StrokeAttribute_from_StrokeAttribute(self->sv->attribute()); } -static int StrokeVertex_attribute_set(BPy_StrokeVertex *self, - PyObject *value, - void *UNUSED(closure)) +static int StrokeVertex_attribute_set(BPy_StrokeVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_StrokeAttribute_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a StrokeAttribute object"); @@ -242,15 +240,14 @@ PyDoc_STRVAR(StrokeVertex_curvilinear_abscissa_doc, "\n" ":type: float"); -static PyObject *StrokeVertex_curvilinear_abscissa_get(BPy_StrokeVertex *self, - void *UNUSED(closure)) +static PyObject *StrokeVertex_curvilinear_abscissa_get(BPy_StrokeVertex *self, void * /*closure*/) { return PyFloat_FromDouble(self->sv->curvilinearAbscissa()); } static int StrokeVertex_curvilinear_abscissa_set(BPy_StrokeVertex *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { float scalar; if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) { @@ -267,12 +264,12 @@ PyDoc_STRVAR(StrokeVertex_point_doc, "\n" ":type: :class:`mathutils.Vector`"); -static PyObject *StrokeVertex_point_get(BPy_StrokeVertex *self, void *UNUSED(closure)) +static PyObject *StrokeVertex_point_get(BPy_StrokeVertex *self, void * /*closure*/) { return Vector_CreatePyObject_cb((PyObject *)self, 2, StrokeVertex_mathutils_cb_index, 0); } -static int StrokeVertex_point_set(BPy_StrokeVertex *self, PyObject *value, void *UNUSED(closure)) +static int StrokeVertex_point_set(BPy_StrokeVertex *self, PyObject *value, void * /*closure*/) { float v[2]; if (mathutils_array_parse(v, 2, 2, value, "value must be a 2-dimensional vector") == -1) { @@ -289,14 +286,14 @@ PyDoc_STRVAR(StrokeVertex_stroke_length_doc, "\n" ":type: float"); -static PyObject *StrokeVertex_stroke_length_get(BPy_StrokeVertex *self, void *UNUSED(closure)) +static PyObject *StrokeVertex_stroke_length_get(BPy_StrokeVertex *self, void * /*closure*/) { return PyFloat_FromDouble(self->sv->strokeLength()); } static int StrokeVertex_stroke_length_set(BPy_StrokeVertex *self, PyObject *value, - void *UNUSED(closure)) + void * /*closure*/) { float scalar; if ((scalar = PyFloat_AsDouble(value)) == -1.0f && PyErr_Occurred()) { @@ -313,7 +310,7 @@ PyDoc_STRVAR(StrokeVertex_u_doc, "\n" ":type: float"); -static PyObject *StrokeVertex_u_get(BPy_StrokeVertex *self, void *UNUSED(closure)) +static PyObject *StrokeVertex_u_get(BPy_StrokeVertex *self, void * /*closure*/) { return PyFloat_FromDouble(self->sv->u()); } diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp index de9748d41c1..59fead5f70c 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp @@ -63,7 +63,7 @@ PyDoc_STRVAR(NonTVertex_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *NonTVertex_svertex_get(BPy_NonTVertex *self, void *UNUSED(closure)) +static PyObject *NonTVertex_svertex_get(BPy_NonTVertex *self, void * /*closure*/) { SVertex *v = self->ntv->svertex(); if (v) { @@ -72,7 +72,7 @@ static PyObject *NonTVertex_svertex_get(BPy_NonTVertex *self, void *UNUSED(closu Py_RETURN_NONE; } -static int NonTVertex_svertex_set(BPy_NonTVertex *self, PyObject *value, void *UNUSED(closure)) +static int NonTVertex_svertex_set(BPy_NonTVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp index 8dc76c1c448..ca4908cae7b 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp @@ -122,7 +122,7 @@ PyDoc_STRVAR(TVertex_front_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *TVertex_front_svertex_get(BPy_TVertex *self, void *UNUSED(closure)) +static PyObject *TVertex_front_svertex_get(BPy_TVertex *self, void * /*closure*/) { SVertex *v = self->tv->frontSVertex(); if (v) { @@ -131,7 +131,7 @@ static PyObject *TVertex_front_svertex_get(BPy_TVertex *self, void *UNUSED(closu Py_RETURN_NONE; } -static int TVertex_front_svertex_set(BPy_TVertex *self, PyObject *value, void *UNUSED(closure)) +static int TVertex_front_svertex_set(BPy_TVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); @@ -146,7 +146,7 @@ PyDoc_STRVAR(TVertex_back_svertex_doc, "\n" ":type: :class:`SVertex`"); -static PyObject *TVertex_back_svertex_get(BPy_TVertex *self, void *UNUSED(closure)) +static PyObject *TVertex_back_svertex_get(BPy_TVertex *self, void * /*closure*/) { SVertex *v = self->tv->backSVertex(); if (v) { @@ -155,7 +155,7 @@ static PyObject *TVertex_back_svertex_get(BPy_TVertex *self, void *UNUSED(closur Py_RETURN_NONE; } -static int TVertex_back_svertex_set(BPy_TVertex *self, PyObject *value, void *UNUSED(closure)) +static int TVertex_back_svertex_set(BPy_TVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_SVertex_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an SVertex"); @@ -170,13 +170,13 @@ PyDoc_STRVAR(TVertex_id_doc, "\n" ":type: :class:`Id`"); -static PyObject *TVertex_id_get(BPy_TVertex *self, void *UNUSED(closure)) +static PyObject *TVertex_id_get(BPy_TVertex *self, void * /*closure*/) { Id id(self->tv->getId()); return BPy_Id_from_Id(id); // return a copy } -static int TVertex_id_set(BPy_TVertex *self, PyObject *value, void *UNUSED(closure)) +static int TVertex_id_set(BPy_TVertex *self, PyObject *value, void * /*closure*/) { if (!BPy_Id_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be an Id"); |