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/divelistmodel.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/divelistmodel.h')
| -rw-r--r-- | qt-models/divelistmodel.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qt-models/divelistmodel.h b/qt-models/divelistmodel.h index cccece51d..d6eb07463 100644 --- a/qt-models/divelistmodel.h +++ b/qt-models/divelistmodel.h @@ -6,7 +6,6 @@ #include <QSortFilterProxyModel> #include "core/subsurface-qt/DiveObjectHelper.h" -#include "core/singleton.h" class DiveListSortModel : public QSortFilterProxyModel { @@ -29,7 +28,7 @@ private: void updateFilterState(); }; -class DiveListModel : public QAbstractListModel, public SillySingleton<DiveListModel> +class DiveListModel : public QAbstractListModel { Q_OBJECT public: @@ -46,6 +45,7 @@ public: DepthDurationRole, }; + static DiveListModel *instance(); DiveListModel(QObject *parent = 0); void addDive(const QList<dive *> &listOfDives); void addAllDives(); @@ -63,6 +63,8 @@ public: QString startAddDive(); void resetInternalData(); Q_INVOKABLE DiveObjectHelper at(int i); +private: + static DiveListModel *m_instance; }; #endif // DIVELISTMODEL_H |