From d8dbd49a2f23b7637f05fc058f39bdf6ab706624 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 31 May 2019 22:51:19 +1000 Subject: Cleanup: style, use braces in source/ Automated using clang-tidy. --- .../intern/python/Iterator/BPy_AdjacencyIterator.cpp | 6 ++++-- .../intern/python/Iterator/BPy_ChainPredicateIterator.cpp | 3 ++- .../python/Iterator/BPy_ChainSilhouetteIterator.cpp | 3 ++- .../intern/python/Iterator/BPy_ChainingIterator.cpp | 15 ++++++++++----- .../intern/python/Iterator/BPy_CurvePointIterator.cpp | 6 ++++-- .../intern/python/Iterator/BPy_Interface0DIterator.cpp | 6 ++++-- .../intern/python/Iterator/BPy_SVertexIterator.cpp | 9 ++++++--- .../intern/python/Iterator/BPy_StrokeVertexIterator.cpp | 9 ++++++--- .../intern/python/Iterator/BPy_ViewEdgeIterator.cpp | 12 ++++++++---- .../python/Iterator/BPy_orientedViewEdgeIterator.cpp | 6 ++++-- 10 files changed, 50 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 6b23ffadffb..4264e96afc3 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp @@ -121,8 +121,9 @@ static PyObject *AdjacencyIterator_iternext(BPy_AdjacencyIterator *self) PyErr_SetNone(PyExc_StopIteration); return NULL; } - if (self->at_start) + if (self->at_start) { self->at_start = false; + } else { self->a_it->increment(); if (self->a_it->isEnd()) { @@ -148,8 +149,9 @@ static PyObject *AdjacencyIterator_object_get(BPy_AdjacencyIterator *self, void return NULL; } ViewEdge *ve = self->a_it->operator*(); - if (ve) + if (ve) { return BPy_ViewEdge_from_ViewEdge(*ve); + } Py_RETURN_NONE; } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp index 189d41e78a3..28b8e9d7c0a 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.cpp @@ -85,8 +85,9 @@ PyDoc_STRVAR(ChainPredicateIterator_doc, static int check_begin(PyObject *obj, void *v) { - if (obj != NULL && obj != Py_None && !BPy_ViewEdge_Check(obj)) + if (obj != NULL && obj != Py_None && !BPy_ViewEdge_Check(obj)) { return 0; + } *((PyObject **)v) = obj; return 1; } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp index d72e830e293..401959be0c0 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.cpp @@ -72,8 +72,9 @@ PyDoc_STRVAR(ChainSilhouetteIterator_doc, static int check_begin(PyObject *obj, void *v) { - if (obj != NULL && obj != Py_None && !BPy_ViewEdge_Check(obj)) + if (obj != NULL && obj != Py_None && !BPy_ViewEdge_Check(obj)) { return 0; + } *((PyObject **)v) = obj; return 1; } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp index 370ef23d8ef..b2042107453 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp @@ -73,8 +73,9 @@ PyDoc_STRVAR( static int check_begin(PyObject *obj, void *v) { - if (obj != NULL && obj != Py_None && !BPy_ViewEdge_Check(obj)) + if (obj != NULL && obj != Py_None && !BPy_ViewEdge_Check(obj)) { return 0; + } *((PyObject **)v) = obj; return 1; } @@ -166,10 +167,12 @@ static PyObject *ChainingIterator_traverse(BPy_ChainingIterator *self, return NULL; } if (!PyArg_ParseTupleAndKeywords( - args, kwds, "O!", (char **)kwlist, &AdjacencyIterator_Type, &py_a_it)) + args, kwds, "O!", (char **)kwlist, &AdjacencyIterator_Type, &py_a_it)) { return NULL; - if (((BPy_AdjacencyIterator *)py_a_it)->a_it) + } + if (((BPy_AdjacencyIterator *)py_a_it)->a_it) { self->c_it->traverse(*(((BPy_AdjacencyIterator *)py_a_it)->a_it)); + } Py_RETURN_NONE; } @@ -196,8 +199,9 @@ static PyObject *ChainingIterator_object_get(BPy_ChainingIterator *self, void *U return NULL; } ViewEdge *ve = self->c_it->operator*(); - if (ve) + if (ve) { return BPy_ViewEdge_from_ViewEdge(*ve); + } Py_RETURN_NONE; } @@ -211,8 +215,9 @@ static PyObject *ChainingIterator_next_vertex_get(BPy_ChainingIterator *self, void *UNUSED(closure)) { ViewVertex *v = self->c_it->getVertex(); - if (v) + if (v) { return Any_BPy_ViewVertex_from_ViewVertex(*v); + } Py_RETURN_NONE; } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp index 5b287433c13..b33ebc0f4ef 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp @@ -67,11 +67,13 @@ static int CurvePointIterator_init(BPy_CurvePointIterator *self, PyObject *args, if (PyArg_ParseTupleAndKeywords( args, kwds, "|O!", (char **)kwlist_1, &CurvePointIterator_Type, &brother)) { - if (!brother) + if (!brother) { self->cp_it = new CurveInternal::CurvePointIterator(); - else + } + else { self->cp_it = new CurveInternal::CurvePointIterator( *(((BPy_CurvePointIterator *)brother)->cp_it)); + } } else if (PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, kwds, "f", (char **)kwlist_2, &step)) { self->cp_it = new CurveInternal::CurvePointIterator(step); diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp index 6218541df9b..13a981920f3 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp @@ -55,12 +55,14 @@ PyDoc_STRVAR(Interface0DIterator_doc, static int convert_nested_it(PyObject *obj, void *v) { - if (!obj || !BPy_Iterator_Check(obj)) + if (!obj || !BPy_Iterator_Check(obj)) { return 0; + } Interface0DIteratorNested *nested_it = dynamic_cast( ((BPy_Iterator *)obj)->it); - if (!nested_it) + if (!nested_it) { return 0; + } *((Interface0DIteratorNested **)v) = nested_it; return 1; } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp index 2a860976d7f..260776e8965 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp @@ -75,10 +75,12 @@ static int SVertexIterator_init(BPy_SVertexIterator *self, PyObject *args, PyObj if (PyArg_ParseTupleAndKeywords( args, kwds, "|O!", (char **)kwlist_1, &SVertexIterator_Type, &obj1)) { - if (!obj1) + if (!obj1) { self->sv_it = new ViewEdgeInternal::SVertexIterator(); - else + } + else { self->sv_it = new ViewEdgeInternal::SVertexIterator(*(((BPy_SVertexIterator *)obj1)->sv_it)); + } } else if (PyErr_Clear(), PyArg_ParseTupleAndKeywords(args, @@ -122,8 +124,9 @@ static PyObject *SVertexIterator_object_get(BPy_SVertexIterator *self, void *UNU return NULL; } SVertex *sv = self->sv_it->operator->(); - if (sv) + if (sv) { return BPy_SVertex_from_SVertex(*sv); + } Py_RETURN_NONE; } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp index 5727ac2e461..70de25aaf84 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp @@ -77,11 +77,13 @@ static int StrokeVertexIterator_init(BPy_StrokeVertexIterator *self, else if (PyErr_Clear(), PyArg_ParseTupleAndKeywords( args, kwds, "|O!", (char **)kwlist_2, &Stroke_Type, &stroke)) { - if (!stroke) + if (!stroke) { self->sv_it = new StrokeInternal::StrokeVertexIterator(); - else + } + else { self->sv_it = new StrokeInternal::StrokeVertexIterator( ((BPy_Stroke *)stroke)->s->strokeVerticesBegin()); + } self->reversed = false; self->at_start = true; } @@ -225,8 +227,9 @@ static PyObject *StrokeVertexIterator_object_get(BPy_StrokeVertexIterator *self, return NULL; } StrokeVertex *sv = self->sv_it->operator->(); - if (sv) + if (sv) { return BPy_StrokeVertex_from_StrokeVertex(*sv); + } Py_RETURN_NONE; } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp index 525df5dd89b..df56cbe822e 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp @@ -61,8 +61,9 @@ PyDoc_STRVAR(ViewEdgeIterator_doc, static int check_begin(PyObject *obj, void *v) { - if (obj != NULL && obj != Py_None && !BPy_ViewEdge_Check(obj)) + if (obj != NULL && obj != Py_None && !BPy_ViewEdge_Check(obj)) { return 0; + } *((PyObject **)v) = obj; return 1; } @@ -126,8 +127,9 @@ static PyObject *ViewEdgeIterator_object_get(BPy_ViewEdgeIterator *self, void *U return NULL; } ViewEdge *ve = self->ve_it->operator*(); - if (ve) + if (ve) { return BPy_ViewEdge_from_ViewEdge(*ve); + } Py_RETURN_NONE; } @@ -140,8 +142,9 @@ static PyObject *ViewEdgeIterator_current_edge_get(BPy_ViewEdgeIterator *self, void *UNUSED(closure)) { ViewEdge *ve = self->ve_it->getCurrentEdge(); - if (ve) + if (ve) { return BPy_ViewEdge_from_ViewEdge(*ve); + } Py_RETURN_NONE; } @@ -192,8 +195,9 @@ PyDoc_STRVAR(ViewEdgeIterator_begin_doc, static PyObject *ViewEdgeIterator_begin_get(BPy_ViewEdgeIterator *self, void *UNUSED(closure)) { ViewEdge *ve = self->ve_it->getBegin(); - if (ve) + if (ve) { return BPy_ViewEdge_from_ViewEdge(*ve); + } Py_RETURN_NONE; } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp index 21e3e821214..821a92184d1 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp @@ -57,8 +57,9 @@ static int orientedViewEdgeIterator_init(BPy_orientedViewEdgeIterator *self, PyObject *brother = 0; if (!PyArg_ParseTupleAndKeywords( - args, kwds, "|O!", (char **)kwlist, &orientedViewEdgeIterator_Type, &brother)) + args, kwds, "|O!", (char **)kwlist, &orientedViewEdgeIterator_Type, &brother)) { return -1; + } if (!brother) { self->ove_it = new ViewVertexInternal::orientedViewEdgeIterator(); self->at_start = true; @@ -95,8 +96,9 @@ static PyObject *orientedViewEdgeIterator_iternext(BPy_orientedViewEdgeIterator PyErr_SetNone(PyExc_StopIteration); return NULL; } - if (self->at_start) + if (self->at_start) { self->at_start = false; + } else { self->ove_it->increment(); if (self->ove_it->isEnd()) { -- cgit v1.2.3