Merge branch 'trunk' into audioaudio

1 files changed, 6 insertions, 12 deletions

diff --git a/navit/gui/qt5_qml/qml_map.cpp b/navit/gui/qt5_qml/qml_map.cpp
index 0f38a4768..5a12a29b7 100644
--- a/navit/gui/qt5_qml/qml_map.cpp
+++ b/navit/gui/qt5_qml/qml_map.cpp
@@ -1,35 +1,29 @@
 #include "qml_map.h"
 
 MapObject::MapObject(QObject *parent)
-    : QObject(parent)
-{
+    : QObject(parent) {
 }
 
 MapObject::MapObject(const QString &name, const bool &active, QObject *parent)
-    : QObject(parent), m_name(name), m_active(active)
-{
+    : QObject(parent), m_name(name), m_active(active) {
 }
 
-QString MapObject::name() const
-{
+QString MapObject::name() const {
     return m_name;
 }
 
-void MapObject::setName(const QString &name)
-{
+void MapObject::setName(const QString &name) {
     if (name != m_name) {
         m_name = name;
         emit nameChanged();
     }
 }
 
-bool MapObject::active() const
-{
+bool MapObject::active() const {
     return m_active;
 }
 
-void MapObject::setActive(const bool &active)
-{
+void MapObject::setActive(const bool &active) {
     if (active != m_active) {
         m_active = active;
         emit activeChanged();