summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-09-01 00:24:18 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-09-06 11:48:47 -0700
commit0c374af176f961c45fadb716af55789984d257b6 (patch)
tree78a39af575f71854a33bd9a619ef9c9148c63cd9
parent4eaf6b20bece25516d6ba29e372ac84de690cde7 (diff)
downloadsubsurface-0c374af176f961c45fadb716af55789984d257b6.tar.gz
Map: don't derive MapLocation from QObject
Map location is 1) A plain value type 2) Never passed to QML Make it a simple C++ class. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
-rw-r--r--qt-models/maplocationmodel.h4
-rw-r--r--subsurface-helper.cpp1
2 files changed, 1 insertions, 4 deletions
diff --git a/qt-models/maplocationmodel.h b/qt-models/maplocationmodel.h
index afb7e92ec..cb8252a3a 100644
--- a/qt-models/maplocationmodel.h
+++ b/qt-models/maplocationmodel.h
@@ -10,10 +10,8 @@
#include <QAbstractListModel>
#include <QGeoCoordinate>
-class MapLocation : public QObject
+class MapLocation
{
- Q_OBJECT
-
public:
explicit MapLocation();
explicit MapLocation(struct dive_site *ds, QGeoCoordinate coord, QString name, bool selected);
diff --git a/subsurface-helper.cpp b/subsurface-helper.cpp
index 4d7774953..5671ffc58 100644
--- a/subsurface-helper.cpp
+++ b/subsurface-helper.cpp
@@ -164,6 +164,5 @@ void register_qml_types(QQmlEngine *engine)
REGISTER_TYPE(MapWidgetHelper, "MapWidgetHelper");
REGISTER_TYPE(MapLocationModel, "MapLocationModel");
- REGISTER_TYPE(MapLocation, "MapLocation");
#endif // not SUBSURFACE_TEST_DATA
}