Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/freestyle/intern/python/BPy_Id.cpp
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_Id.cpp')
-rw-r--r--source/blender/freestyle/intern/python/BPy_Id.cpp245
1 files changed, 122 insertions, 123 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp
index fb47874cd97..4e2500a4b3d 100644
--- a/source/blender/freestyle/intern/python/BPy_Id.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Id.cpp
@@ -31,181 +31,180 @@ extern "C" {
//-------------------MODULE INITIALIZATION--------------------------------
int Id_Init(PyObject *module)
{
- if (module == NULL)
- return -1;
+ if (module == NULL)
+ return -1;
- if (PyType_Ready(&Id_Type) < 0)
- return -1;
+ if (PyType_Ready(&Id_Type) < 0)
+ return -1;
- Py_INCREF(&Id_Type);
- PyModule_AddObject(module, "Id", (PyObject *)&Id_Type);
- return 0;
+ Py_INCREF(&Id_Type);
+ PyModule_AddObject(module, "Id", (PyObject *)&Id_Type);
+ return 0;
}
//------------------------INSTANCE METHODS ----------------------------------
PyDoc_STRVAR(Id_doc,
-"Class for representing an object Id.\n"
-"\n"
-".. method:: __init__(first=0, second=0)\n"
-"\n"
-" Build the Id from two numbers.\n"
-"\n"
-" :arg first: The first number.\n"
-" :type first: int\n"
-" :arg second: The second number.\n"
-" :type second: int\n"
-"\n"
-".. method:: __init__(brother)\n"
-"\n"
-" Copy constructor.\n"
-"\n"
-" :arg brother: An Id object.\n"
-" :type brother: :class:`Id`");
+ "Class for representing an object Id.\n"
+ "\n"
+ ".. method:: __init__(first=0, second=0)\n"
+ "\n"
+ " Build the Id from two numbers.\n"
+ "\n"
+ " :arg first: The first number.\n"
+ " :type first: int\n"
+ " :arg second: The second number.\n"
+ " :type second: int\n"
+ "\n"
+ ".. method:: __init__(brother)\n"
+ "\n"
+ " Copy constructor.\n"
+ "\n"
+ " :arg brother: An Id object.\n"
+ " :type brother: :class:`Id`");
static int Id_init(BPy_Id *self, PyObject *args, PyObject *kwds)
{
- static const char *kwlist_1[] = {"brother", NULL};
- static const char *kwlist_2[] = {"first", "second", NULL};
- PyObject *brother;
- int first = 0, second = 0;
-
- if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist_1, &Id_Type, &brother)) {
- self->id = new Id(*(((BPy_Id *)brother)->id));
- }
- else if (PyErr_Clear(),
- PyArg_ParseTupleAndKeywords(args, kwds, "|ii", (char **)kwlist_2, &first, &second))
- {
- self->id = new Id(first, second);
- }
- else {
- PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
- return -1;
- }
- return 0;
+ static const char *kwlist_1[] = {"brother", NULL};
+ static const char *kwlist_2[] = {"first", "second", NULL};
+ PyObject *brother;
+ int first = 0, second = 0;
+
+ if (PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist_1, &Id_Type, &brother)) {
+ self->id = new Id(*(((BPy_Id *)brother)->id));
+ }
+ else if (PyErr_Clear(),
+ PyArg_ParseTupleAndKeywords(args, kwds, "|ii", (char **)kwlist_2, &first, &second)) {
+ self->id = new Id(first, second);
+ }
+ else {
+ PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
+ return -1;
+ }
+ return 0;
}
static void Id_dealloc(BPy_Id *self)
{
- delete self->id;
- Py_TYPE(self)->tp_free((PyObject *)self);
+ delete self->id;
+ Py_TYPE(self)->tp_free((PyObject *)self);
}
static PyObject *Id_repr(BPy_Id *self)
{
- return PyUnicode_FromFormat("[ first: %i, second: %i ](BPy_Id)", self->id->getFirst(), self->id->getSecond());
+ return PyUnicode_FromFormat(
+ "[ first: %i, second: %i ](BPy_Id)", self->id->getFirst(), self->id->getSecond());
}
static PyObject *Id_RichCompare(BPy_Id *o1, BPy_Id *o2, int opid)
{
- switch (opid) {
- case Py_LT:
- return PyBool_from_bool(o1->id->operator<(*(o2->id)));
- case Py_LE:
- return PyBool_from_bool(o1->id->operator<(*(o2->id)) || o1->id->operator==(*(o2->id)));
- case Py_EQ:
- return PyBool_from_bool(o1->id->operator==(*(o2->id)));
- case Py_NE:
- return PyBool_from_bool(o1->id->operator!=(*(o2->id)));
- case Py_GT:
- return PyBool_from_bool(!(o1->id->operator<(*(o2->id)) || o1->id->operator==(*(o2->id))));
- case Py_GE:
- return PyBool_from_bool(!(o1->id->operator<(*(o2->id))));
- }
- Py_RETURN_NONE;
+ switch (opid) {
+ case Py_LT:
+ return PyBool_from_bool(o1->id->operator<(*(o2->id)));
+ case Py_LE:
+ return PyBool_from_bool(o1->id->operator<(*(o2->id)) || o1->id->operator==(*(o2->id)));
+ case Py_EQ:
+ return PyBool_from_bool(o1->id->operator==(*(o2->id)));
+ case Py_NE:
+ return PyBool_from_bool(o1->id->operator!=(*(o2->id)));
+ case Py_GT:
+ return PyBool_from_bool(!(o1->id->operator<(*(o2->id)) || o1->id->operator==(*(o2->id))));
+ case Py_GE:
+ return PyBool_from_bool(!(o1->id->operator<(*(o2->id))));
+ }
+ Py_RETURN_NONE;
}
/*----------------------Id get/setters ----------------------------*/
PyDoc_STRVAR(Id_first_doc,
-"The first number constituting the Id.\n"
-"\n"
-":type: int");
+ "The first number constituting the Id.\n"
+ "\n"
+ ":type: int");
static PyObject *Id_first_get(BPy_Id *self, void *UNUSED(closure))
{
- return PyLong_FromLong(self->id->getFirst());
+ return PyLong_FromLong(self->id->getFirst());
}
static int Id_first_set(BPy_Id *self, PyObject *value, void *UNUSED(closure))
{
- int scalar;
- if ((scalar = PyLong_AsLong(value)) == -1 && PyErr_Occurred()) {
- PyErr_SetString(PyExc_TypeError, "value must be an integer");
- return -1;
- }
- self->id->setFirst(scalar);
- return 0;
+ int scalar;
+ if ((scalar = PyLong_AsLong(value)) == -1 && PyErr_Occurred()) {
+ PyErr_SetString(PyExc_TypeError, "value must be an integer");
+ return -1;
+ }
+ self->id->setFirst(scalar);
+ return 0;
}
PyDoc_STRVAR(Id_second_doc,
-"The second number constituting the Id.\n"
-"\n"
-":type: int");
+ "The second number constituting the Id.\n"
+ "\n"
+ ":type: int");
static PyObject *Id_second_get(BPy_Id *self, void *UNUSED(closure))
{
- return PyLong_FromLong(self->id->getSecond());
+ return PyLong_FromLong(self->id->getSecond());
}
static int Id_second_set(BPy_Id *self, PyObject *value, void *UNUSED(closure))
{
- int scalar;
- if ((scalar = PyLong_AsLong(value)) == -1 && PyErr_Occurred()) {
- PyErr_SetString(PyExc_TypeError, "value must be an integer");
- return -1;
- }
- self->id->setSecond(scalar);
- return 0;
+ int scalar;
+ if ((scalar = PyLong_AsLong(value)) == -1 && PyErr_Occurred()) {
+ PyErr_SetString(PyExc_TypeError, "value must be an integer");
+ return -1;
+ }
+ self->id->setSecond(scalar);
+ return 0;
}
static PyGetSetDef BPy_Id_getseters[] = {
- {(char *)"first", (getter)Id_first_get, (setter)Id_first_set, (char *)Id_first_doc, NULL},
- {(char *)"second", (getter)Id_second_get, (setter)Id_second_set, (char *)Id_second_doc, NULL},
- {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
+ {(char *)"first", (getter)Id_first_get, (setter)Id_first_set, (char *)Id_first_doc, NULL},
+ {(char *)"second", (getter)Id_second_get, (setter)Id_second_set, (char *)Id_second_doc, NULL},
+ {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
};
/*-----------------------BPy_Id type definition ------------------------------*/
PyTypeObject Id_Type = {
- PyVarObject_HEAD_INIT(NULL, 0)
- "Id", /* tp_name */
- sizeof(BPy_Id), /* tp_basicsize */
- 0, /* tp_itemsize */
- (destructor)Id_dealloc, /* tp_dealloc */
- 0, /* tp_print */
- 0, /* tp_getattr */
- 0, /* tp_setattr */
- 0, /* tp_reserved */
- (reprfunc)Id_repr, /* 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 */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- Id_doc, /* tp_doc */
- 0, /* tp_traverse */
- 0, /* tp_clear */
- (richcmpfunc)Id_RichCompare, /* tp_richcompare */
- 0, /* tp_weaklistoffset */
- 0, /* tp_iter */
- 0, /* tp_iternext */
- 0, /* tp_methods */
- 0, /* tp_members */
- BPy_Id_getseters, /* tp_getset */
- 0, /* tp_base */
- 0, /* tp_dict */
- 0, /* tp_descr_get */
- 0, /* tp_descr_set */
- 0, /* tp_dictoffset */
- (initproc)Id_init, /* tp_init */
- 0, /* tp_alloc */
- PyType_GenericNew, /* tp_new */
+ PyVarObject_HEAD_INIT(NULL, 0) "Id", /* tp_name */
+ sizeof(BPy_Id), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ (destructor)Id_dealloc, /* tp_dealloc */
+ 0, /* tp_print */
+ 0, /* tp_getattr */
+ 0, /* tp_setattr */
+ 0, /* tp_reserved */
+ (reprfunc)Id_repr, /* 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 */
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
+ Id_doc, /* tp_doc */
+ 0, /* tp_traverse */
+ 0, /* tp_clear */
+ (richcmpfunc)Id_RichCompare, /* tp_richcompare */
+ 0, /* tp_weaklistoffset */
+ 0, /* tp_iter */
+ 0, /* tp_iternext */
+ 0, /* tp_methods */
+ 0, /* tp_members */
+ BPy_Id_getseters, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ (initproc)Id_init, /* tp_init */
+ 0, /* tp_alloc */
+ PyType_GenericNew, /* tp_new */
};
///////////////////////////////////////////////////////////////////////////////////////////