diff options
author | jan Iversen <jani@apache.org> | 2018-06-16 10:08:34 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2018-07-04 05:32:30 +0800 |
commit | 2f951413303e10a80e540cacd0c6c282f8ce82cc (patch) | |
tree | d20a09bc203f93b65090727c2e3e68a42e985836 /core/settings/qPref.cpp | |
parent | d02a03983d91da1d10aac5b0a5d84d15e94e9291 (diff) | |
download | subsurface-2f951413303e10a80e540cacd0c6c282f8ce82cc.tar.gz |
core: remove double definition of enum cloud_storage_status
Remove cloud_storage_status from qmlprefs.h.
usage to qPref::
enum cloud_storage_status is not used from C, but only from C++, and
having the same structure defined multiple times is a maintenance
challenge.
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'core/settings/qPref.cpp')
-rw-r--r-- | core/settings/qPref.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/settings/qPref.cpp b/core/settings/qPref.cpp index b703c1fcb..791ec44b8 100644 --- a/core/settings/qPref.cpp +++ b/core/settings/qPref.cpp @@ -2,17 +2,16 @@ #include "qPref_private.h" #include "qPref.h" - -qPref *qPref::m_instance = NULL; +qPref::qPref(QObject *parent) : + QObject(parent) +{ +} qPref *qPref::instance() { - if (!m_instance) - m_instance = new qPref; - return m_instance; +static qPref *self = new qPref; + return self; } - - void qPref::loadSync(bool doSync) { } |