From 05200f9266a4e8e723450abb281c597a48da2e9f Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 22 Sep 2019 14:33:33 +0200 Subject: Cleanup: unify idiosyncratic singletons The way we handle singletons in QML, QML insists on allocating the objects. This leads to a very idiosyncratic way of handling singletons: The global instance pointer is set in the constructor. Unify all these by implementing a "SillySingleton" template. All of the weird singleton-classes can derive from this template and don't have to bother with reimplementing the instance() function with all the safety-checks, etc. This serves firstly as documentation but also improves debugging as we will now see wanted and unwanted creation and destruction of these weird singletons. Signed-off-by: Berthold Stoeger --- qt-models/gpslistmodel.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'qt-models/gpslistmodel.h') diff --git a/qt-models/gpslistmodel.h b/qt-models/gpslistmodel.h index a1c82e5d6..14145d065 100644 --- a/qt-models/gpslistmodel.h +++ b/qt-models/gpslistmodel.h @@ -3,10 +3,10 @@ #define GPSLISTMODEL_H #include "core/gpslocation.h" -#include +#include "core/singleton.h" #include -class GpsListModel : public QAbstractListModel +class GpsListModel : public QAbstractListModel, public SillySingleton { Q_OBJECT public: @@ -19,7 +19,6 @@ public: GpsWhenRole }; - static GpsListModel *instance(); GpsListModel(QObject *parent = 0); void clear(); int rowCount(const QModelIndex &parent = QModelIndex()) const; @@ -28,7 +27,6 @@ public: void update(); private: QVector m_gpsFixes; - static GpsListModel *m_instance; }; #endif // GPSLISTMODEL_H -- cgit v1.2.3-70-g09d2