diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-09-22 14:33:33 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-09-25 13:35:30 -0700 |
| commit | 05200f9266a4e8e723450abb281c597a48da2e9f (patch) | |
| tree | 670d7b30f4b77f40e35253243f95fb219d5c7aea /mobile-widgets/qmlprefs.cpp | |
| parent | f20d6187f0135ef3cf7f583785be65012336a99d (diff) | |
| download | subsurface-05200f9266a4e8e723450abb281c597a48da2e9f.tar.gz | |
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 <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'mobile-widgets/qmlprefs.cpp')
| -rw-r--r-- | mobile-widgets/qmlprefs.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/mobile-widgets/qmlprefs.cpp b/mobile-widgets/qmlprefs.cpp index cf7b5ddbb..e415c0e5d 100644 --- a/mobile-widgets/qmlprefs.cpp +++ b/mobile-widgets/qmlprefs.cpp @@ -8,30 +8,13 @@ /*** Global and constructors ***/ -QMLPrefs *QMLPrefs::m_instance = NULL; - QMLPrefs::QMLPrefs() : m_credentialStatus(qPrefCloudStorage::CS_UNKNOWN), m_oldStatus(qPrefCloudStorage::CS_UNKNOWN), m_showPin(false) { - // This strange construct is needed because QMLEngine calls new and that - // cannot be overwritten - if (!m_instance) - m_instance = this; -} - -QMLPrefs::~QMLPrefs() -{ - m_instance = NULL; } -QMLPrefs *QMLPrefs::instance() -{ - return m_instance; -} - - /*** public functions ***/ const QString QMLPrefs::cloudPassword() const { |