mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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>
This commit is contained in:
parent
f20d6187f0
commit
05200f9266
13 changed files with 86 additions and 89 deletions
|
@ -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
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue