summaryrefslogtreecommitdiff
path: root/navit/gui/qt5_qml/qml_poi.cpp
diff options
context:
space:
mode:
authorPierre Grandin <grandinp@gmail.com>2019-06-04 10:14:17 -0600
committerPierre Grandin <grandinp@gmail.com>2019-06-04 10:14:17 -0600
commit92a5169423e470e4d1a5f4237cb2112266998d28 (patch)
treebee5f13203e0a0d99c8f6962c82deef9fe772b6e /navit/gui/qt5_qml/qml_poi.cpp
parent5304cda121782db8e1e5e4685ae10780cce36394 (diff)
parentda3e1e0c186dfd6c6566f798811a27d001a7fb1d (diff)
downloadnavit-audio.tar.gz
Merge branch 'trunk' into audioaudio
Diffstat (limited to 'navit/gui/qt5_qml/qml_poi.cpp')
-rw-r--r--navit/gui/qt5_qml/qml_poi.cpp33
1 files changed, 11 insertions, 22 deletions
diff --git a/navit/gui/qt5_qml/qml_poi.cpp b/navit/gui/qt5_qml/qml_poi.cpp
index 93adf2925..8f0a0ab64 100644
--- a/navit/gui/qt5_qml/qml_poi.cpp
+++ b/navit/gui/qt5_qml/qml_poi.cpp
@@ -1,8 +1,7 @@
#include "qml_poi.h"
PoiObject::PoiObject(QObject *parent)
- : QObject(parent)
-{
+ : QObject(parent) {
}
PoiObject::PoiObject(
@@ -12,63 +11,53 @@ PoiObject::PoiObject(
const QString &icon,
struct pcoord &coords,
QObject *parent)
- : QObject(parent), m_name(name), m_type(type), m_icon(icon), m_coords(coords)
-{
+ : QObject(parent), m_name(name), m_type(type), m_icon(icon), m_coords(coords) {
}
-QString PoiObject::name() const
-{
+QString PoiObject::name() const {
return m_name;
}
-void PoiObject::setName(const QString &name)
-{
+void PoiObject::setName(const QString &name) {
if (name != m_name) {
m_name = name;
emit nameChanged();
}
}
-QString PoiObject::type() const
-{
+QString PoiObject::type() const {
return m_type;
}
-void PoiObject::setType(const QString &type)
-{
+void PoiObject::setType(const QString &type) {
if (type != m_type) {
m_type = type;
emit typeChanged();
}
}
-float PoiObject::distance() const
-{
+float PoiObject::distance() const {
return m_distance/1000;
}
-void PoiObject::setDistance(const int distance)
-{
+void PoiObject::setDistance(const int distance) {
if (distance != m_distance) {
m_distance = distance;
emit distanceChanged();
}
}
-void PoiObject::setIcon(const QString &icon)
-{
+void PoiObject::setIcon(const QString &icon) {
if (icon != m_icon) {
m_icon = icon;
emit iconChanged();
}
}
-QString PoiObject::icon() const
-{
+QString PoiObject::icon() const {
return m_icon;
}
-struct pcoord PoiObject::coords() const
-{
+struct pcoord PoiObject::coords() const {
return m_coords;
}