Merge branch 'trunk' into audioaudio

1 files changed, 25 insertions, 35 deletions

diff --git a/navit/binding/python/navigation.c b/navit/binding/python/navigation.c
index 75a421d52..b5030b731 100644
--- a/navit/binding/python/navigation.c
+++ b/navit/binding/python/navigation.c
@@ -21,62 +21,52 @@
 #include "navigation.h"
 
 typedef struct {
-	PyObject_HEAD
-	struct navigation *navigation;
+    PyObject_HEAD
+    struct navigation *navigation;
 } navigationObject;
 
-static PyObject *
-navigation_get_map_py(navigationObject *self, PyObject *args)
-{
-	if (!PyArg_ParseTuple(args, ""))
-		return NULL;
-	return map_py_ref(navigation_get_map(self->navigation));
+static PyObject *navigation_get_map_py(navigationObject *self, PyObject *args) {
+    if (!PyArg_ParseTuple(args, ""))
+        return NULL;
+    return map_py_ref(navigation_get_map(self->navigation));
 }
 
 
 
 static PyMethodDef navigation_methods[] = {
-	{"get_map",	(PyCFunction) navigation_get_map_py, METH_VARARGS },
-	{NULL, NULL },
+    {"get_map",	(PyCFunction) navigation_get_map_py, METH_VARARGS },
+    {NULL, NULL },
 };
 
 
-static PyObject *
-navigation_getattr_py(PyObject *self, char *name)
-{
-	return Py_FindMethod(navigation_methods, self, name);
+static PyObject *navigation_getattr_py(PyObject *self, char *name) {
+    return Py_FindMethod(navigation_methods, self, name);
 }
 
-static void
-navigation_destroy_py(navigationObject *self)
-{
+static void navigation_destroy_py(navigationObject *self) {
 }
 
 PyTypeObject navigation_Type = {
-	Obj_HEAD
-	.tp_name="navigation",
-	.tp_basicsize=sizeof(navigationObject),
-	.tp_dealloc=(destructor)navigation_destroy_py,
-	.tp_getattr=navigation_getattr_py,
+    Obj_HEAD
+    .tp_name="navigation",
+    .tp_basicsize=sizeof(navigationObject),
+    .tp_dealloc=(destructor)navigation_destroy_py,
+    .tp_getattr=navigation_getattr_py,
 };
 
-PyObject *
-navigation_py(PyObject *self, PyObject *args)
-{
-	navigationObject *ret;
+PyObject *navigation_py(PyObject *self, PyObject *args) {
+    navigationObject *ret;
 
-	ret=PyObject_NEW(navigationObject, &navigation_Type);
-	return (PyObject *)ret;
+    ret=PyObject_NEW(navigationObject, &navigation_Type);
+    return (PyObject *)ret;
 }
 
-PyObject *
-navigation_py_ref(struct navigation *navigation)
-{
-	navigationObject *ret;
+PyObject *navigation_py_ref(struct navigation *navigation) {
+    navigationObject *ret;
 
-	ret=PyObject_NEW(navigationObject, &navigation_Type);
-	ret->navigation=navigation;
-	return (PyObject *)ret;
+    ret=PyObject_NEW(navigationObject, &navigation_Type);
+    ret->navigation=navigation;
+    return (PyObject *)ret;
 }