diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-11-06 19:49:09 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-11-06 20:08:25 +0300 |
commit | 16732def37c5a66f3ea28dbe247b09cc6bca6677 (patch) | |
tree | 5d14f5c920a1411e336bd80b12becbb3f73de19a /source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp | |
parent | 88926375a0e4e45f72c87b9e487c060ddd3c9216 (diff) |
Cleanup: Clang-Tidy modernize-use-nullptr
Replace `NULL` with `nullptr` in C++ code.
No functional changes.
Diffstat (limited to 'source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp index d24e1dc527d..74c50de5969 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp @@ -69,7 +69,7 @@ PyDoc_STRVAR( static int check_begin(PyObject *obj, void *v) { - if (obj != NULL && obj != Py_None && !BPy_ViewEdge_Check(obj)) { + if (obj != nullptr && obj != Py_None && !BPy_ViewEdge_Check(obj)) { return 0; } *((PyObject **)v) = obj; @@ -78,17 +78,17 @@ static int check_begin(PyObject *obj, void *v) static int ChainingIterator___init__(BPy_ChainingIterator *self, PyObject *args, PyObject *kwds) { - static const char *kwlist_1[] = {"brother", NULL}; + static const char *kwlist_1[] = {"brother", nullptr}; static const char *kwlist_2[] = { - "restrict_to_selection", "restrict_to_unvisited", "begin", "orientation", NULL}; - PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0, *obj4 = 0; + "restrict_to_selection", "restrict_to_unvisited", "begin", "orientation", nullptr}; + PyObject *obj1 = nullptr, *obj2 = nullptr, *obj3 = nullptr, *obj4 = nullptr; if (PyArg_ParseTupleAndKeywords( args, kwds, "O!", (char **)kwlist_1, &ChainingIterator_Type, &obj1)) { self->c_it = new ChainingIterator(*(((BPy_ChainingIterator *)obj1)->c_it)); } else if ((void)PyErr_Clear(), - (void)(obj1 = obj2 = obj3 = obj4 = 0), + (void)(obj1 = obj2 = obj3 = obj4 = nullptr), PyArg_ParseTupleAndKeywords(args, kwds, "|O!O!O&O!", @@ -103,7 +103,7 @@ static int ChainingIterator___init__(BPy_ChainingIterator *self, PyObject *args, &obj4)) { bool restrict_to_selection = (!obj1) ? true : bool_from_PyBool(obj1); bool restrict_to_unvisited = (!obj2) ? true : bool_from_PyBool(obj2); - ViewEdge *begin = (!obj3 || obj3 == Py_None) ? NULL : ((BPy_ViewEdge *)obj3)->ve; + ViewEdge *begin = (!obj3 || obj3 == Py_None) ? nullptr : ((BPy_ViewEdge *)obj3)->ve; bool orientation = (!obj4) ? true : bool_from_PyBool(obj4); self->c_it = new ChainingIterator( restrict_to_selection, restrict_to_unvisited, begin, orientation); @@ -131,7 +131,7 @@ static PyObject *ChainingIterator_init(BPy_ChainingIterator *self) { if (typeid(*(self->c_it)) == typeid(ChainingIterator)) { PyErr_SetString(PyExc_TypeError, "init() method not properly overridden"); - return NULL; + return nullptr; } self->c_it->init(); Py_RETURN_NONE; @@ -155,16 +155,16 @@ static PyObject *ChainingIterator_traverse(BPy_ChainingIterator *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"it", NULL}; + static const char *kwlist[] = {"it", nullptr}; PyObject *py_a_it; if (typeid(*(self->c_it)) == typeid(ChainingIterator)) { PyErr_SetString(PyExc_TypeError, "traverse() method not properly overridden"); - return NULL; + return nullptr; } if (!PyArg_ParseTupleAndKeywords( args, kwds, "O!", (char **)kwlist, &AdjacencyIterator_Type, &py_a_it)) { - return NULL; + return nullptr; } if (((BPy_AdjacencyIterator *)py_a_it)->a_it) { self->c_it->traverse(*(((BPy_AdjacencyIterator *)py_a_it)->a_it)); @@ -178,7 +178,7 @@ static PyMethodDef BPy_ChainingIterator_methods[] = { (PyCFunction)ChainingIterator_traverse, METH_VARARGS | METH_KEYWORDS, ChainingIterator_traverse_doc}, - {NULL, NULL, 0, NULL}, + {nullptr, nullptr, 0, nullptr}, }; /*----------------------ChainingIterator get/setters ----------------------------*/ @@ -192,7 +192,7 @@ static PyObject *ChainingIterator_object_get(BPy_ChainingIterator *self, void *U { if (self->c_it->isEnd()) { PyErr_SetString(PyExc_RuntimeError, "iteration has stopped"); - return NULL; + return nullptr; } ViewEdge *ve = self->c_it->operator*(); if (ve) { @@ -232,62 +232,62 @@ static PyObject *ChainingIterator_is_incrementing_get(BPy_ChainingIterator *self static PyGetSetDef BPy_ChainingIterator_getseters[] = { {"object", (getter)ChainingIterator_object_get, - (setter)NULL, + (setter)nullptr, ChainingIterator_object_doc, - NULL}, + nullptr}, {"next_vertex", (getter)ChainingIterator_next_vertex_get, - (setter)NULL, + (setter)nullptr, ChainingIterator_next_vertex_doc, - NULL}, + nullptr}, {"is_incrementing", (getter)ChainingIterator_is_incrementing_get, - (setter)NULL, + (setter)nullptr, ChainingIterator_is_incrementing_doc, - NULL}, - {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ + nullptr}, + {nullptr, nullptr, nullptr, nullptr, nullptr} /* Sentinel */ }; /*-----------------------BPy_ChainingIterator type definition ------------------------------*/ PyTypeObject ChainingIterator_Type = { - PyVarObject_HEAD_INIT(NULL, 0) "ChainingIterator", /* tp_name */ + PyVarObject_HEAD_INIT(nullptr, 0) "ChainingIterator", /* tp_name */ sizeof(BPy_ChainingIterator), /* tp_basicsize */ 0, /* tp_itemsize */ - 0, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ + nullptr, /* tp_dealloc */ + nullptr, /* tp_print */ + nullptr, /* tp_getattr */ + nullptr, /* tp_setattr */ + nullptr, /* tp_reserved */ + nullptr, /* tp_repr */ + nullptr, /* tp_as_number */ + nullptr, /* tp_as_sequence */ + nullptr, /* tp_as_mapping */ + nullptr, /* tp_hash */ + nullptr, /* tp_call */ + nullptr, /* tp_str */ + nullptr, /* tp_getattro */ + nullptr, /* tp_setattro */ + nullptr, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ ChainingIterator_doc, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ + nullptr, /* tp_traverse */ + nullptr, /* tp_clear */ + nullptr, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ + nullptr, /* tp_iter */ + nullptr, /* tp_iternext */ BPy_ChainingIterator_methods, /* tp_methods */ - 0, /* tp_members */ + nullptr, /* tp_members */ BPy_ChainingIterator_getseters, /* tp_getset */ &ViewEdgeIterator_Type, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ + nullptr, /* tp_dict */ + nullptr, /* tp_descr_get */ + nullptr, /* tp_descr_set */ 0, /* tp_dictoffset */ (initproc)ChainingIterator___init__, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ + nullptr, /* tp_alloc */ + nullptr, /* tp_new */ }; /////////////////////////////////////////////////////////////////////////////////////////// |