From 06c51df4dbbba27d273514d922e20f89e5a1e025 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Sat, 16 Feb 2013 14:22:34 +0000 Subject: Made code style clean-up and fixed a typo in a docstring. --- .../Iterator/BPy_ChainSilhouetteIterator.cpp | 41 +++++++++++----------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp') diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp index caf43a800c5..efc64913932 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp @@ -14,7 +14,7 @@ extern "C" { // ChainSilhouetteIterator (bool iRestrictToSelection=true, ViewEdge *begin=NULL, bool orientation=true) // ChainSilhouetteIterator (const ChainSilhouetteIterator &brother) -static char ChainSilhouetteIterator___doc__[] = +PyDoc_STRVAR(ChainSilhouetteIterator_doc, "Class hierarchy: :class:`Iterator` > :class:`ViewEdgeIterator` > :class:`ChainingIterator` > :class:`ChainSilhouetteIterator`\n" "\n" "A ViewEdge Iterator used to follow ViewEdges the most naturally. For\n" @@ -45,40 +45,39 @@ static char ChainSilhouetteIterator___doc__[] = " Copy constructor.\n" "\n" " :arg brother: A ChainSilhouetteIterator object.\n" -" :type brother: :class:`ChainSilhouetteIterator`\n"; +" :type brother: :class:`ChainSilhouetteIterator`"); -static int ChainSilhouetteIterator___init__(BPy_ChainSilhouetteIterator *self, PyObject *args ) -{ +static int ChainSilhouetteIterator_init(BPy_ChainSilhouetteIterator *self, PyObject *args) +{ PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0; - if (!( PyArg_ParseTuple(args, "|OOO", &obj1, &obj2, &obj3) )) - return -1; + if (!(PyArg_ParseTuple(args, "|OOO", &obj1, &obj2, &obj3))) + return -1; + + if (obj1 && BPy_ChainSilhouetteIterator_Check(obj1)) { + self->cs_it = new ChainSilhouetteIterator(*(((BPy_ChainSilhouetteIterator *)obj1)->cs_it)); - if( obj1 && BPy_ChainSilhouetteIterator_Check(obj1) ) { - self->cs_it = new ChainSilhouetteIterator(*( ((BPy_ChainSilhouetteIterator *) obj1)->cs_it )); - } else { - bool restrictToSelection = ( obj1 ) ? bool_from_PyBool(obj1) : true; + bool restrictToSelection = (obj1) ? bool_from_PyBool(obj1) : true; ViewEdge *begin; - if ( !obj2 || obj2 == Py_None ) + if (!obj2 || obj2 == Py_None) begin = NULL; - else if ( BPy_ViewEdge_Check(obj2) ) - begin = ((BPy_ViewEdge *) obj2)->ve; + else if (BPy_ViewEdge_Check(obj2)) + begin = ((BPy_ViewEdge *)obj2)->ve; else { PyErr_SetString(PyExc_TypeError, "2nd argument must be either a ViewEdge object or None"); return -1; } - bool orientation = ( obj3 ) ? bool_from_PyBool(obj3) : true; - - self->cs_it = new ChainSilhouetteIterator( restrictToSelection, begin, orientation); + bool orientation = (obj3) ? bool_from_PyBool(obj3) : true; + + self->cs_it = new ChainSilhouetteIterator(restrictToSelection, begin, orientation); } - + self->py_c_it.c_it = self->cs_it; self->py_c_it.py_ve_it.ve_it = self->cs_it; self->py_c_it.py_ve_it.py_it.it = self->cs_it; - + return 0; - } /*-----------------------BPy_ChainSilhouetteIterator type definition ------------------------------*/ @@ -104,7 +103,7 @@ PyTypeObject ChainSilhouetteIterator_Type = { 0, /* tp_setattro */ 0, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - ChainSilhouetteIterator___doc__, /* tp_doc */ + ChainSilhouetteIterator_doc, /* tp_doc */ 0, /* tp_traverse */ 0, /* tp_clear */ 0, /* tp_richcompare */ @@ -119,7 +118,7 @@ PyTypeObject ChainSilhouetteIterator_Type = { 0, /* tp_descr_get */ 0, /* tp_descr_set */ 0, /* tp_dictoffset */ - (initproc)ChainSilhouetteIterator___init__, /* tp_init */ + (initproc)ChainSilhouetteIterator_init, /* tp_init */ 0, /* tp_alloc */ 0, /* tp_new */ }; -- cgit v1.2.3