mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: make qPref::cloud_status the only version of the enum

Browse source 
add enum to qPref and remove elsewhere
update source core to reference qPref.

the enum cannot be in pref.h because it is to be used in qml and Q_ENUM
need the enum to be defined as part of the class

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-07-05 20:37:53 +02:00 • committed by Dirk Hohndel
parent 7103f36c7c
commit 8d66633fe7
14 changed files with 90 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

25
mobile-widgets/qmlprefs.h
View file

@ -8,7 +8,6 @@
class QMLPrefs : public QObject {
Q_OBJECT
Q_ENUM(cloud_status)
Q_PROPERTY(QString cloudPassword
MEMBER m_cloudPassword
WRITE setCloudPassword
@ -21,7 +20,7 @@ class QMLPrefs : public QObject {
MEMBER m_cloudUserName
WRITE setCloudUserName
NOTIFY cloudUserNameChanged)
Q_PROPERTY(cloud_status credentialStatus
Q_PROPERTY(qPref::cloud_status credentialStatus
MEMBER m_credentialStatus
WRITE setCredentialStatus
NOTIFY credentialStatusChanged)
@ -37,7 +36,7 @@ class QMLPrefs : public QObject {
MEMBER m_showPin
WRITE setShowPin
NOTIFY showPinChanged)
Q_PROPERTY(cloud_status oldStatus
Q_PROPERTY(qPref::cloud_status oldStatus
MEMBER m_oldStatus
WRITE setOldStatus
NOTIFY oldStatusChanged)
@ -51,14 +50,6 @@ class QMLPrefs : public QObject {
NOTIFY timeThresholdChanged)
public:
enum cloud_status {
CS_UNKNOWN,
CS_INCORRECT_USER_PASSWD,
CS_NEED_TO_VERIFY,
CS_VERIFIED,
CS_NOCLOUD
};
QMLPrefs();
~QMLPrefs();
@ -73,16 +64,16 @@ public:
const QString cloudUserName() const;
void setCloudUserName(const QString &cloudUserName);
cloud_status credentialStatus() const;
void setCredentialStatus(const cloud_status value);
qPref::cloud_status credentialStatus() const;
void setCredentialStatus(const qPref::cloud_status value);
void setDeveloper(bool value);
int distanceThreshold() const;
void setDistanceThreshold(int distance);
cloud_status oldStatus() const;
void setOldStatus(const cloud_status value);
qPref::cloud_status oldStatus() const;
void setOldStatus(const qPref::cloud_status value);
bool showPin() const;
void setShowPin(bool enable);
@ -101,11 +92,11 @@ private:
QString m_cloudPassword;
QString m_cloudPin;
QString m_cloudUserName;
cloud_status m_credentialStatus;
qPref::cloud_status m_credentialStatus;
bool m_developer;
int m_distanceThreshold;
static QMLPrefs *m_instance;
cloud_status m_oldStatus;
qPref::cloud_status m_oldStatus;
bool m_showPin;
int m_timeThreshold;