From e7ff22ce901102589173f7a7dc3e4ddbb030655f Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Wed, 6 Jun 2018 22:53:52 +0200 Subject: clang format for gui related files --- gui/emb.cc | 136 ++++++++++++++++++++++++++++--------------------------------- 1 file changed, 62 insertions(+), 74 deletions(-) (limited to 'gui/emb.cc') diff --git a/gui/emb.cc b/gui/emb.cc index 59915111..2e3379d5 100644 --- a/gui/emb.cc +++ b/gui/emb.cc @@ -6,27 +6,24 @@ // // Blog article: http://mateusz.loskot.net/?p=2819 +#include "emb.h" +#include #include #include #include -#include -#include "emb.h" -namespace emb -{ +namespace emb { struct Stdout { - PyObject_HEAD - stdout_write_type write; + PyObject_HEAD stdout_write_type write; }; -PyObject* Stdout_write(PyObject* self, PyObject* args) +PyObject *Stdout_write(PyObject *self, PyObject *args) { std::size_t written(0); - Stdout* selfimpl = reinterpret_cast(self); - if (selfimpl->write) - { - char* data; + Stdout *selfimpl = reinterpret_cast(self); + if (selfimpl->write) { + char *data; if (!PyArg_ParseTuple(args, "s", &data)) return 0; @@ -37,70 +34,65 @@ PyObject* Stdout_write(PyObject* self, PyObject* args) return PyLong_FromSize_t(written); } -PyObject* Stdout_flush(PyObject* self, PyObject* args) +PyObject *Stdout_flush(PyObject *self, PyObject *args) { // no-op return Py_BuildValue(""); } -PyMethodDef Stdout_methods[] = -{ - {"write", Stdout_write, METH_VARARGS, "sys.stdout.write"}, - {"flush", Stdout_flush, METH_VARARGS, "sys.stdout.write"}, - {0, 0, 0, 0} // sentinel +PyMethodDef Stdout_methods[] = { + {"write", Stdout_write, METH_VARARGS, "sys.stdout.write"}, + {"flush", Stdout_flush, METH_VARARGS, "sys.stdout.write"}, + {0, 0, 0, 0} // sentinel }; -PyTypeObject StdoutType = -{ - PyVarObject_HEAD_INIT(0, 0) - "emb.StdoutType", /* tp_name */ - sizeof(Stdout), /* 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 */ - Py_TPFLAGS_DEFAULT, /* tp_flags */ - "emb.Stdout objects", /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - Stdout_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ +PyTypeObject StdoutType = { + PyVarObject_HEAD_INIT(0, 0) "emb.StdoutType", /* tp_name */ + sizeof(Stdout), /* 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 */ + Py_TPFLAGS_DEFAULT, /* tp_flags */ + "emb.Stdout objects", /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + Stdout_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ }; -PyModuleDef embmodule = -{ - PyModuleDef_HEAD_INIT, - "emb", 0, -1, 0, +PyModuleDef embmodule = { + PyModuleDef_HEAD_INIT, "emb", 0, -1, 0, }; // Internal state -PyObject* g_stdout; -PyObject* g_stdout_saved; +PyObject *g_stdout; +PyObject *g_stdout_saved; PyMODINIT_FUNC PyInit_emb(void) { @@ -111,24 +103,23 @@ PyMODINIT_FUNC PyInit_emb(void) if (PyType_Ready(&StdoutType) < 0) return 0; - PyObject* m = PyModule_Create(&embmodule); - if (m) - { + PyObject *m = PyModule_Create(&embmodule); + if (m) { Py_INCREF(&StdoutType); - PyModule_AddObject(m, "Stdout", reinterpret_cast(&StdoutType)); + PyModule_AddObject(m, "Stdout", + reinterpret_cast(&StdoutType)); } return m; } void set_stdout(stdout_write_type write) { - if (!g_stdout) - { + if (!g_stdout) { g_stdout_saved = PySys_GetObject("stdout"); // borrowed g_stdout = StdoutType.tp_new(&StdoutType, 0, 0); } - Stdout* impl = reinterpret_cast(g_stdout); + Stdout *impl = reinterpret_cast(g_stdout); impl->write = write; PySys_SetObject("stdout", g_stdout); } @@ -142,9 +133,6 @@ void reset_stdout() g_stdout = 0; } -void append_inittab() -{ - PyImport_AppendInittab("emb", emb::PyInit_emb); -} +void append_inittab() { PyImport_AppendInittab("emb", emb::PyInit_emb); } } // namespace emb -- cgit v1.2.3