summaryrefslogtreecommitdiffstats
path: root/core/settings/qPref.h
diff options
context:
space:
mode:
authorGravatar jan Iversen <jani@apache.org>2018-06-16 10:08:34 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-07-04 05:32:30 +0800
commit2f951413303e10a80e540cacd0c6c282f8ce82cc (patch)
treed20a09bc203f93b65090727c2e3e68a42e985836 /core/settings/qPref.h
parentd02a03983d91da1d10aac5b0a5d84d15e94e9291 (diff)
downloadsubsurface-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.h')
-rw-r--r--core/settings/qPref.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/settings/qPref.h b/core/settings/qPref.h
index 4170e5e64..f312f328a 100644
--- a/core/settings/qPref.h
+++ b/core/settings/qPref.h
@@ -7,10 +7,10 @@
class qPref : public QObject {
Q_OBJECT
+ Q_ENUMS(cloud_status);
public:
- qPref(QObject *parent = NULL) : QObject(parent) {};
- ~qPref() {};
+ qPref(QObject *parent = NULL);
static qPref *instance();
// Load/Sync local settings (disk) and struct preference
@@ -19,7 +19,6 @@ public:
public:
private:
- static qPref *m_instance;
};
#endif