Code clean-up and fix for typos in docstrings.

7 files changed, 14 insertions, 47 deletions

diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
index 2278dc05a6d..134dfe3d696 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
@@ -113,10 +113,6 @@ static PyObject * AdjacencyIterator_iternext(BPy_AdjacencyIterator *self)
 	return BPy_ViewEdge_from_ViewEdge(*ve);
 }
 
-static PyMethodDef BPy_AdjacencyIterator_methods[] = {
-	{NULL, NULL, 0, NULL}
-};
-
 /*----------------------AdjacencyIterator get/setters ----------------------------*/
 
 PyDoc_STRVAR(AdjacencyIterator_object_doc,
@@ -129,7 +125,6 @@ static PyObject *AdjacencyIterator_object_get(BPy_AdjacencyIterator *self, void
 	ViewEdge *ve = self->a_it->operator*();
 	if (ve)
 		return BPy_ViewEdge_from_ViewEdge(*ve);
-
 	Py_RETURN_NONE;
 }
 
@@ -180,7 +175,7 @@ PyTypeObject AdjacencyIterator_Type = {
 	0,                              /* tp_weaklistoffset */
 	PyObject_SelfIter,              /* tp_iter */
 	(iternextfunc)AdjacencyIterator_iternext, /* tp_iternext */
-	BPy_AdjacencyIterator_methods,  /* tp_methods */
+	0,                              /* tp_methods */
 	0,                              /* tp_members */
 	BPy_AdjacencyIterator_getseters, /* tp_getset */
 	&Iterator_Type,                 /* tp_base */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
index 8234c7d7b06..60a2bb6bc79 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
@@ -67,8 +67,7 @@ PyDoc_STRVAR(CurvePointIterator_doc,
 "   :arg step: A resampling resolution with which the curve is resampled.\n"
 "      If zero, no resampling is done (i.e., the iterator iterates over\n"
 "      initial vertices).\n"
-"   :type step: float\n"
-);
+"   :type step: float");
 
 static int CurvePointIterator_init(BPy_CurvePointIterator *self, PyObject *args, PyObject *kwds)
 {
@@ -96,10 +95,6 @@ static int CurvePointIterator_init(BPy_CurvePointIterator *self, PyObject *args,
 	return 0;
 }
 
-static PyMethodDef BPy_CurvePointIterator_methods[] = {
-	{NULL, NULL, 0, NULL}
-};
-
 /*----------------------CurvePointIterator get/setters ----------------------------*/
 
 PyDoc_STRVAR(CurvePointIterator_object_doc,
@@ -169,7 +164,7 @@ PyTypeObject CurvePointIterator_Type = {
 	0,                              /* tp_weaklistoffset */
 	0,                              /* tp_iter */
 	0,                              /* tp_iternext */
-	BPy_CurvePointIterator_methods, /* tp_methods */
+	0,                              /* tp_methods */
 	0,                              /* tp_members */
 	BPy_CurvePointIterator_getseters, /* tp_getset */
 	&Iterator_Type,                 /* tp_base */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
index 13dd6e98343..1e5598ddd1c 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
@@ -109,7 +109,8 @@ static PyObject * Interface0DIterator_iternext(BPy_Interface0DIterator *self)
 		}
 		self->if0D_it->decrement();
 		if0D = self->if0D_it->operator->();
-	} else {
+	}
+	else {
 		if (self->if0D_it->isEnd()) {
 			PyErr_SetNone(PyExc_StopIteration);
 			return NULL;
@@ -120,10 +121,6 @@ static PyObject * Interface0DIterator_iternext(BPy_Interface0DIterator *self)
 	return Any_BPy_Interface0D_from_Interface0D(*if0D);
 }
 
-static PyMethodDef BPy_Interface0DIterator_methods[] = {
-	{NULL, NULL, 0, NULL}
-};
-
 /*----------------------Interface0DIterator get/setters ----------------------------*/
 
 PyDoc_STRVAR(Interface0DIterator_object_doc,
@@ -193,7 +190,7 @@ PyTypeObject Interface0DIterator_Type = {
 	0,                              /* tp_weaklistoffset */
 	PyObject_SelfIter,              /* tp_iter */
 	(iternextfunc)Interface0DIterator_iternext, /* tp_iternext */
-	BPy_Interface0DIterator_methods, /* tp_methods */
+	0,                              /* tp_methods */
 	0,                              /* tp_members */
 	BPy_Interface0DIterator_getseters, /* tp_getset */
 	&Iterator_Type,                 /* tp_base */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
index 50e3122cb19..5f9740e5709 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
@@ -113,10 +113,6 @@ static int SVertexIterator_init(BPy_SVertexIterator *self, PyObject *args, PyObj
 	return 0;
 }
 
-static PyMethodDef BPy_SVertexIterator_methods[] = {
-	{NULL, NULL, 0, NULL}
-};
-
 /*----------------------SVertexIterator get/setters ----------------------------*/
 
 PyDoc_STRVAR(SVertexIterator_object_doc,
@@ -127,10 +123,8 @@ PyDoc_STRVAR(SVertexIterator_object_doc,
 static PyObject *SVertexIterator_object_get(BPy_SVertexIterator *self, void *UNUSED(closure))
 {
 	SVertex *sv = self->sv_it->operator->();
-
 	if (sv)
 		return BPy_SVertex_from_SVertex(*sv);
-
 	Py_RETURN_NONE;
 }
 
@@ -191,7 +185,7 @@ PyTypeObject SVertexIterator_Type = {
 	0,                              /* tp_weaklistoffset */
 	0,                              /* tp_iter */
 	0,                              /* tp_iternext */
-	BPy_SVertexIterator_methods,    /* tp_methods */
+	0,                              /* tp_methods */
 	0,                              /* tp_members */
 	BPy_SVertexIterator_getseters,  /* tp_getset */
 	&Iterator_Type,                 /* tp_base */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
index 418530f222b..6a03bd47904 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
@@ -95,7 +95,8 @@ static PyObject * StrokeVertexIterator_iternext(BPy_StrokeVertexIterator *self)
 		}
 		self->sv_it->decrement();
 		sv = self->sv_it->operator->();
-	} else {
+	}
+	else {
 		if (self->sv_it->isEnd()) {
 			PyErr_SetNone(PyExc_StopIteration);
 			return NULL;
@@ -106,10 +107,6 @@ static PyObject * StrokeVertexIterator_iternext(BPy_StrokeVertexIterator *self)
 	return BPy_StrokeVertex_from_StrokeVertex(*sv);
 }
 
-static PyMethodDef BPy_StrokeVertexIterator_methods[] = {
-	{NULL, NULL, 0, NULL}
-};
-
 /*----------------------StrokeVertexIterator get/setters ----------------------------*/
 
 PyDoc_STRVAR(StrokeVertexIterator_object_doc,
@@ -121,11 +118,9 @@ static PyObject *StrokeVertexIterator_object_get(BPy_StrokeVertexIterator *self,
 {
 	if (!self->reversed && self->sv_it->isEnd())
 		Py_RETURN_NONE;
-
 	StrokeVertex *sv = self->sv_it->operator->();
 	if (sv)
 		return BPy_StrokeVertex_from_StrokeVertex(*sv);
-
 	Py_RETURN_NONE;
 }
 
@@ -186,7 +181,7 @@ PyTypeObject StrokeVertexIterator_Type = {
 	0,                              /* tp_weaklistoffset */
 	PyObject_SelfIter,              /* tp_iter */
 	(iternextfunc)StrokeVertexIterator_iternext, /* tp_iternext */
-	BPy_StrokeVertexIterator_methods, /* tp_methods */
+	0,                              /* tp_methods */
 	0,                              /* tp_members */
 	BPy_StrokeVertexIterator_getseters, /* tp_getset */
 	&Iterator_Type,                 /* tp_base */
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
index 0d01e131ae7..9e709b12a74 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
@@ -34,7 +34,6 @@
 #include "../BPy_Convert.h"
 #include "../Interface1D/BPy_ViewEdge.h"
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -112,7 +111,6 @@ PyDoc_STRVAR(ViewEdgeIterator_change_orientation_doc,
 static PyObject *ViewEdgeIterator_change_orientation(BPy_ViewEdgeIterator *self)
 {
 	self->ve_it->changeOrientation();
-	
 	Py_RETURN_NONE;
 }
 
@@ -133,7 +131,6 @@ static PyObject *ViewEdgeIterator_object_get(BPy_ViewEdgeIterator *self, void *U
 	ViewEdge *ve = self->ve_it->operator*();
 	if (ve)
 		return BPy_ViewEdge_from_ViewEdge(*ve);
-
 	Py_RETURN_NONE;
 }
 
@@ -147,7 +144,6 @@ static PyObject *ViewEdgeIterator_current_edge_get(BPy_ViewEdgeIterator *self, v
 	ViewEdge *ve = self->ve_it->getCurrentEdge();
 	if (ve)
 		return BPy_ViewEdge_from_ViewEdge(*ve);
-
 	Py_RETURN_NONE;}
 
 static int ViewEdgeIterator_current_edge_set(BPy_ViewEdgeIterator *self, PyObject *value, void *UNUSED(closure))
@@ -194,7 +190,6 @@ static PyObject *ViewEdgeIterator_begin_get(BPy_ViewEdgeIterator *self, void *UN
 	ViewEdge *ve = self->ve_it->getBegin();
 	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 b71c481a1c5..84467466526 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
@@ -87,7 +87,8 @@ static PyObject * orientedViewEdgeIterator_iternext(BPy_orientedViewEdgeIterator
 		}
 		self->ove_it->decrement();
 		dve = self->ove_it->operator->();
-	} else {
+	}
+	else {
 		if (self->ove_it->isEnd()) {
 			PyErr_SetNone(PyExc_StopIteration);
 			return NULL;
@@ -98,10 +99,6 @@ static PyObject * orientedViewEdgeIterator_iternext(BPy_orientedViewEdgeIterator
 	return BPy_directedViewEdge_from_directedViewEdge(*dve);
 }
 
-static PyMethodDef BPy_orientedViewEdgeIterator_methods[] = {
-	{NULL, NULL, 0, NULL}
-};
-
 /*----------------------orientedViewEdgeIterator get/setters ----------------------------*/
 
 PyDoc_STRVAR(orientedViewEdgeIterator_object_doc,
@@ -114,7 +111,6 @@ PyDoc_STRVAR(orientedViewEdgeIterator_object_doc,
 static PyObject *orientedViewEdgeIterator_object_get(BPy_orientedViewEdgeIterator *self, void *UNUSED(closure))
 {
 	return BPy_directedViewEdge_from_directedViewEdge(self->ove_it->operator*());
-
 }
 
 static PyGetSetDef BPy_orientedViewEdgeIterator_getseters[] = {
@@ -145,14 +141,14 @@ PyTypeObject orientedViewEdgeIterator_Type = {
 	0,                              /* tp_setattro */
 	0,                              /* tp_as_buffer */
 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
-	orientedViewEdgeIterator_doc, /* tp_doc */
+	orientedViewEdgeIterator_doc,   /* tp_doc */
 	0,                              /* tp_traverse */
 	0,                              /* tp_clear */
 	0,                              /* tp_richcompare */
 	0,                              /* tp_weaklistoffset */
 	PyObject_SelfIter,              /* tp_iter */
 	(iternextfunc)orientedViewEdgeIterator_iternext, /* tp_iternext */
-	BPy_orientedViewEdgeIterator_methods, /* tp_methods */
+	0,                              /* tp_methods */
 	0,                              /* tp_members */
 	BPy_orientedViewEdgeIterator_getseters, /* tp_getset */
 	&Iterator_Type,                 /* tp_base */