From 4a92d82626980d6d1690113b9d27aae282fd48eb Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Thu, 7 Mar 2013 23:17:23 +0000 Subject: A big code clean-up patch from Bastien Montagne, many thanks! --- .../intern/python/Iterator/BPy_AdjacencyIterator.cpp | 5 +++-- .../intern/python/Iterator/BPy_ChainPredicateIterator.cpp | 15 ++++++++++----- .../intern/python/Iterator/BPy_ChainPredicateIterator.h | 3 ++- .../python/Iterator/BPy_ChainSilhouetteIterator.cpp | 3 ++- .../intern/python/Iterator/BPy_ChainSilhouetteIterator.h | 3 ++- .../intern/python/Iterator/BPy_ChainingIterator.cpp | 6 ++++-- .../intern/python/Iterator/BPy_CurvePointIterator.cpp | 3 ++- .../intern/python/Iterator/BPy_Interface0DIterator.cpp | 5 +++-- .../intern/python/Iterator/BPy_StrokeVertexIterator.cpp | 5 +++-- .../intern/python/Iterator/BPy_ViewEdgeIterator.cpp | 14 +++++++++----- .../python/Iterator/BPy_orientedViewEdgeIterator.cpp | 5 +++-- .../intern/python/Iterator/BPy_orientedViewEdgeIterator.h | 3 ++- 12 files changed, 45 insertions(+), 25 deletions(-) (limited to 'source/blender/freestyle/intern/python/Iterator') diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp index 134dfe3d696..3f245692ac7 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp @@ -102,7 +102,7 @@ static int AdjacencyIterator_init(BPy_AdjacencyIterator *self, PyObject *args, P return 0; } -static PyObject * AdjacencyIterator_iternext(BPy_AdjacencyIterator *self) +static PyObject *AdjacencyIterator_iternext(BPy_AdjacencyIterator *self) { if (self->a_it->isEnd()) { PyErr_SetNone(PyExc_StopIteration); @@ -140,7 +140,8 @@ static PyObject *AdjacencyIterator_is_incoming_get(BPy_AdjacencyIterator *self, } static PyGetSetDef BPy_AdjacencyIterator_getseters[] = { - {(char *)"is_incoming", (getter)AdjacencyIterator_is_incoming_get, (setter)NULL, (char *)AdjacencyIterator_is_incoming_doc, NULL}, + {(char *)"is_incoming", (getter)AdjacencyIterator_is_incoming_get, (setter)NULL, + (char *)AdjacencyIterator_is_incoming_doc, NULL}, {(char *)"object", (getter)AdjacencyIterator_object_get, (setter)NULL, (char *)AdjacencyIterator_object_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp index 9b103035559..987075024f0 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp @@ -45,7 +45,8 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- PyDoc_STRVAR(ChainPredicateIterator_doc, -"Class hierarchy: :class:`Iterator` > :class:`ViewEdgeIterator` > :class:`ChainingIterator` > :class:`ChainPredicateIterator`\n" +"Class hierarchy: :class:`Iterator` > :class:`ViewEdgeIterator` > :class:`ChainingIterator` > " +":class:`ChainPredicateIterator`\n" "\n" "A \"generic\" user-controlled ViewEdge iterator. This iterator is in\n" "particular built from a unary predicate and a binary predicate.\n" @@ -76,7 +77,8 @@ PyDoc_STRVAR(ChainPredicateIterator_doc, " ViewVertex of begin. \n" " :type orientation: bool\n" "\n" -".. method:: __init__(upred, bpred, restrict_to_selection=True, restrict_to_unvisited=True, begin=None, orientation=True)\n" +".. method:: __init__(upred, bpred, restrict_to_selection=True, restrict_to_unvisited=True, begin=None, " +"orientation=True)\n" "\n" " Builds a ChainPredicateIterator from a unary predicate, a binary\n" " predicate, a starting ViewEdge and its orientation.\n" @@ -118,7 +120,8 @@ static int check_begin(PyObject *obj, void *v) static int ChainPredicateIterator_init(BPy_ChainPredicateIterator *self, PyObject *args, PyObject *kwds) { static const char *kwlist_1[] = {"brother", NULL}; - static const char *kwlist_2[] = {"upred", "bpred", "restrict_to_selection", "restrict_to_unvisited", "begin", "orientation", NULL}; + static const char *kwlist_2[] = {"upred", "bpred", "restrict_to_selection", "restrict_to_unvisited", "begin", + "orientation", NULL}; static const char *kwlist_3[] = {"restrict_to_selection", "restrict_to_unvisited", "begin", "orientation", NULL}; PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0, *obj4 = 0, *obj5 = 0, *obj6 = 0; @@ -137,7 +140,8 @@ static int ChainPredicateIterator_init(BPy_ChainPredicateIterator *self, PyObjec bool restrict_to_unvisited = (!obj4) ? true : bool_from_PyBool(obj4); ViewEdge *begin = (!obj5 || obj5 == Py_None) ? NULL : ((BPy_ViewEdge *)obj5)->ve; bool orientation = (!obj6) ? true : bool_from_PyBool(obj6); - self->cp_it = new ChainPredicateIterator(*up1D, *bp1D, restrict_to_selection, restrict_to_unvisited, begin, orientation); + self->cp_it = new ChainPredicateIterator(*up1D, *bp1D, restrict_to_selection, restrict_to_unvisited, begin, + orientation); self->upred = obj1; self->bpred = obj2; Py_INCREF(self->upred); @@ -155,7 +159,8 @@ static int ChainPredicateIterator_init(BPy_ChainPredicateIterator *self, PyObjec self->cp_it = new ChainPredicateIterator(restrict_to_selection, restrict_to_unvisited, begin, orientation); self->upred = NULL; self->bpred = NULL; - } else { + } + else { PyErr_SetString(PyExc_TypeError, "invalid argument(s)"); return -1; } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h index 90bc9123694..c69d1ad1a7b 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h @@ -47,7 +47,8 @@ extern "C" { extern PyTypeObject ChainPredicateIterator_Type; -#define BPy_ChainPredicateIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainPredicateIterator_Type)) +#define BPy_ChainPredicateIterator_Check(v) \ + (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainPredicateIterator_Type)) /*---------------------------Python BPy_ChainPredicateIterator structure definition----------*/ typedef struct { diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp index 8d7e19b9ba5..80b417d5e74 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp @@ -46,7 +46,8 @@ extern "C" { // ChainSilhouetteIterator (const ChainSilhouetteIterator &brother) PyDoc_STRVAR(ChainSilhouetteIterator_doc, -"Class hierarchy: :class:`Iterator` > :class:`ViewEdgeIterator` > :class:`ChainingIterator` > :class:`ChainSilhouetteIterator`\n" +"Class hierarchy: :class:`Iterator` > :class:`ViewEdgeIterator` > :class:`ChainingIterator` > " +":class:`ChainSilhouetteIterator`\n" "\n" "A ViewEdge Iterator used to follow ViewEdges the most naturally. For\n" "example, it will follow visible ViewEdges of same nature. As soon, as\n" diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h index 8c6f2983d3e..acc410b64a6 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h @@ -47,7 +47,8 @@ extern "C" { extern PyTypeObject ChainSilhouetteIterator_Type; -#define BPy_ChainSilhouetteIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainSilhouetteIterator_Type)) +#define BPy_ChainSilhouetteIterator_Check(v) \ + (PyObject_IsInstance((PyObject *)v, (PyObject *)&ChainSilhouetteIterator_Type)) /*---------------------------Python BPy_ChainSilhouetteIterator structure definition----------*/ typedef struct { diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp index 701f6871cc1..d193c0aa70b 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp @@ -215,8 +215,10 @@ static PyObject *ChainingIterator_is_incrementing_get(BPy_ChainingIterator *self static PyGetSetDef BPy_ChainingIterator_getseters[] = { {(char *)"object", (getter)ChainingIterator_object_get, (setter)NULL, (char *)ChainingIterator_object_doc, NULL}, - {(char *)"next_vertex", (getter)ChainingIterator_next_vertex_get, (setter)NULL, (char *)ChainingIterator_next_vertex_doc, NULL}, - {(char *)"is_incrementing", (getter)ChainingIterator_is_incrementing_get, (setter)NULL, (char *)ChainingIterator_is_incrementing_doc, NULL}, + {(char *)"next_vertex", (getter)ChainingIterator_next_vertex_get, (setter)NULL, + (char *)ChainingIterator_next_vertex_doc, NULL}, + {(char *)"is_incrementing", (getter)ChainingIterator_is_incrementing_get, (setter)NULL, + (char *)ChainingIterator_is_incrementing_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp index 60a2bb6bc79..07d74bf2264 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp @@ -128,7 +128,8 @@ static PyObject *CurvePointIterator_u_get(BPy_CurvePointIterator *self, void *UN } static PyGetSetDef BPy_CurvePointIterator_getseters[] = { - {(char *)"object", (getter)CurvePointIterator_object_get, (setter)NULL, (char *)CurvePointIterator_object_doc, NULL}, + {(char *)"object", (getter)CurvePointIterator_object_get, (setter)NULL, + (char *)CurvePointIterator_object_doc, NULL}, {(char *)"t", (getter)CurvePointIterator_t_get, (setter)NULL, (char *)CurvePointIterator_t_doc, NULL}, {(char *)"u", (getter)CurvePointIterator_u_get, (setter)NULL, (char *)CurvePointIterator_u_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp index 1e5598ddd1c..f589802b0a5 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp @@ -98,7 +98,7 @@ static int Interface0DIterator_init(BPy_Interface0DIterator *self, PyObject *arg return 0; } -static PyObject * Interface0DIterator_iternext(BPy_Interface0DIterator *self) +static PyObject *Interface0DIterator_iternext(BPy_Interface0DIterator *self) { Interface0D *if0D; @@ -154,7 +154,8 @@ static PyObject *Interface0DIterator_u_get(BPy_Interface0DIterator *self, void * } static PyGetSetDef BPy_Interface0DIterator_getseters[] = { - {(char *)"object", (getter)Interface0DIterator_object_get, (setter)NULL, (char *)Interface0DIterator_object_doc, NULL}, + {(char *)"object", (getter)Interface0DIterator_object_get, (setter)NULL, + (char *)Interface0DIterator_object_doc, NULL}, {(char *)"t", (getter)Interface0DIterator_t_get, (setter)NULL, (char *)Interface0DIterator_t_doc, NULL}, {(char *)"u", (getter)Interface0DIterator_u_get, (setter)NULL, (char *)Interface0DIterator_u_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp index 6a03bd47904..889e29b6f42 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp @@ -84,7 +84,7 @@ static int StrokeVertexIterator_init(BPy_StrokeVertexIterator *self, PyObject *a return 0; } -static PyObject * StrokeVertexIterator_iternext(BPy_StrokeVertexIterator *self) +static PyObject *StrokeVertexIterator_iternext(BPy_StrokeVertexIterator *self) { StrokeVertex *sv; @@ -145,7 +145,8 @@ static PyObject *StrokeVertexIterator_u_get(BPy_StrokeVertexIterator *self, void } static PyGetSetDef BPy_StrokeVertexIterator_getseters[] = { - {(char *)"object", (getter)StrokeVertexIterator_object_get, (setter)NULL, (char *)StrokeVertexIterator_object_doc, NULL}, + {(char *)"object", (getter)StrokeVertexIterator_object_get, (setter)NULL, + (char *)StrokeVertexIterator_object_doc, NULL}, {(char *)"t", (getter)StrokeVertexIterator_t_get, (setter)NULL, (char *)StrokeVertexIterator_t_doc, NULL}, {(char *)"u", (getter)StrokeVertexIterator_u_get, (setter)NULL, (char *)StrokeVertexIterator_u_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp index 9e709b12a74..0a0f5d249a4 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp @@ -115,7 +115,8 @@ static PyObject *ViewEdgeIterator_change_orientation(BPy_ViewEdgeIterator *self) } static PyMethodDef BPy_ViewEdgeIterator_methods[] = { - {"change_orientation", (PyCFunction) ViewEdgeIterator_change_orientation, METH_NOARGS, ViewEdgeIterator_change_orientation_doc}, + {"change_orientation", (PyCFunction) ViewEdgeIterator_change_orientation, METH_NOARGS, + ViewEdgeIterator_change_orientation_doc}, {NULL, NULL, 0, NULL} }; @@ -195,7 +196,7 @@ static PyObject *ViewEdgeIterator_begin_get(BPy_ViewEdgeIterator *self, void *UN static int ViewEdgeIterator_begin_set(BPy_ViewEdgeIterator *self, PyObject *value, void *UNUSED(closure)) { - if(!BPy_ViewEdge_Check(value)) { + if (!BPy_ViewEdge_Check(value)) { PyErr_SetString(PyExc_TypeError, "value must be a ViewEdge"); return -1; } @@ -205,9 +206,12 @@ static int ViewEdgeIterator_begin_set(BPy_ViewEdgeIterator *self, PyObject *valu static PyGetSetDef BPy_ViewEdgeIterator_getseters[] = { {(char *)"object", (getter)ViewEdgeIterator_object_get, (setter)NULL, (char *)ViewEdgeIterator_object_doc, NULL}, - {(char *)"current_edge", (getter)ViewEdgeIterator_current_edge_get, (setter)ViewEdgeIterator_current_edge_set, (char *)ViewEdgeIterator_current_edge_doc, NULL}, - {(char *)"orientation", (getter)ViewEdgeIterator_orientation_get, (setter)ViewEdgeIterator_orientation_set, (char *)ViewEdgeIterator_orientation_doc, NULL}, - {(char *)"begin", (getter)ViewEdgeIterator_begin_get, (setter)ViewEdgeIterator_begin_set, (char *)ViewEdgeIterator_begin_doc, NULL}, + {(char *)"current_edge", (getter)ViewEdgeIterator_current_edge_get, (setter)ViewEdgeIterator_current_edge_set, + (char *)ViewEdgeIterator_current_edge_doc, NULL}, + {(char *)"orientation", (getter)ViewEdgeIterator_orientation_get, (setter)ViewEdgeIterator_orientation_set, + (char *)ViewEdgeIterator_orientation_doc, NULL}, + {(char *)"begin", (getter)ViewEdgeIterator_begin_get, (setter)ViewEdgeIterator_begin_set, + (char *)ViewEdgeIterator_begin_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp index 84467466526..d92f3dd2d49 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp @@ -76,7 +76,7 @@ static int orientedViewEdgeIterator_init(BPy_orientedViewEdgeIterator *self, PyO return 0; } -static PyObject * orientedViewEdgeIterator_iternext(BPy_orientedViewEdgeIterator *self) +static PyObject *orientedViewEdgeIterator_iternext(BPy_orientedViewEdgeIterator *self) { ViewVertex::directedViewEdge *dve; @@ -114,7 +114,8 @@ static PyObject *orientedViewEdgeIterator_object_get(BPy_orientedViewEdgeIterato } static PyGetSetDef BPy_orientedViewEdgeIterator_getseters[] = { - {(char *)"object", (getter)orientedViewEdgeIterator_object_get, (setter)NULL, (char *)orientedViewEdgeIterator_object_doc, NULL}, + {(char *)"object", (getter)orientedViewEdgeIterator_object_get, (setter)NULL, + (char *)orientedViewEdgeIterator_object_doc, NULL}, {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h index 84451a29347..0d2846ce158 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h +++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h @@ -47,7 +47,8 @@ extern "C" { extern PyTypeObject orientedViewEdgeIterator_Type; -#define BPy_orientedViewEdgeIterator_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&orientedViewEdgeIterator_Type)) +#define BPy_orientedViewEdgeIterator_Check(v) \ + (PyObject_IsInstance((PyObject *)v, (PyObject *)&orientedViewEdgeIterator_Type)) /*---------------------------Python BPy_orientedViewEdgeIterator structure definition----------*/ typedef struct { -- cgit v1.2.3