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.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'qt-models/gpslistmodel.cpp') diff --git a/qt-models/gpslistmodel.cpp b/qt-models/gpslistmodel.cpp index 8d874d67b..8a623bf00 100644 --- a/qt-models/gpslistmodel.cpp +++ b/qt-models/gpslistmodel.cpp @@ -3,11 +3,8 @@ #include "core/qthelper.h" #include -GpsListModel *GpsListModel::m_instance = NULL; - GpsListModel::GpsListModel(QObject *parent) : QAbstractListModel(parent) { - m_instance = this; } void GpsListModel::update() @@ -62,9 +59,3 @@ QHash GpsListModel::roleNames() const roles[GpsLongitudeRole] = "longitude"; return roles; } - -GpsListModel *GpsListModel::instance() -{ - return m_instance; -} - -- cgit v1.2.3-70-g09d2