diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2019-09-27 16:26:54 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2019-09-27 16:26:58 -0700 |
| commit | 9ae7040a91c3e3e0606d7abe085ef6da47efd6d2 (patch) | |
| tree | de120b115df95fb96d945581aca41cd8c760263c /qt-models/gpslistmodel.h | |
| parent | 400b218f769320221567b7b66f39c33126a7d2e1 (diff) | |
| download | subsurface-9ae7040a91c3e3e0606d7abe085ef6da47efd6d2.tar.gz | |
Revert the singleton PR
It turns out that this isn't working the way it was intended to.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-models/gpslistmodel.h')
| -rw-r--r-- | qt-models/gpslistmodel.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/qt-models/gpslistmodel.h b/qt-models/gpslistmodel.h index a49855a4d..a1c82e5d6 100644 --- a/qt-models/gpslistmodel.h +++ b/qt-models/gpslistmodel.h @@ -3,10 +3,10 @@ #define GPSLISTMODEL_H #include "core/gpslocation.h" -#include "core/singleton.h" +#include <QObject> #include <QAbstractListModel> -class GpsListModel : public QAbstractListModel, public SillySingleton<GpsListModel> +class GpsListModel : public QAbstractListModel { Q_OBJECT public: @@ -19,14 +19,16 @@ public: GpsWhenRole }; + static GpsListModel *instance(); GpsListModel(QObject *parent = 0); void clear(); int rowCount(const QModelIndex &parent = QModelIndex()) const; QHash<int, QByteArray> roleNames() const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - void update(QVector<gpsTracker> trackers); + void update(); private: QVector<gpsTracker> m_gpsFixes; + static GpsListModel *m_instance; }; #endif // GPSLISTMODEL_H |