From 9ae7040a91c3e3e0606d7abe085ef6da47efd6d2 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Fri, 27 Sep 2019 16:26:54 -0700
Subject: 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>
---
 qt-models/divelistmodel.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'qt-models/divelistmodel.h')

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
-- 
cgit v1.2.3-70-g09d2