diff options
| author |  jan Iversen <jani@apache.org> | 2018-09-02 16:22:16 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-09-11 17:25:00 -0700 |
| commit | 684e334fb6098e604a91d140c1e2ea0883dff081 (patch) | |
| tree | 99dd5050bb53385125aa5fa6dc69514acbc2b40e /mobile-widgets/qmlprefs.cpp | |
| parent | 4d57b52062ab902dee8d82e453eda586ce78ab3e (diff) | |
| download | subsurface-684e334fb6098e604a91d140c1e2ea0883dff081.tar.gz | |
core: declare cloud_status in qPrefCloudStorage
qml declaration of cloud_status (defined in pref.h) does not
belong in qPref.h but in qPrefCloudStorage
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'mobile-widgets/qmlprefs.cpp')
| -rw-r--r-- | mobile-widgets/qmlprefs.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mobile-widgets/qmlprefs.cpp b/mobile-widgets/qmlprefs.cpp index 145ddf91f..8fd6811c8 100644 --- a/mobile-widgets/qmlprefs.cpp +++ b/mobile-widgets/qmlprefs.cpp @@ -11,10 +11,10 @@ QMLPrefs *QMLPrefs::m_instance = NULL; QMLPrefs::QMLPrefs() : - m_credentialStatus(qPref::CS_UNKNOWN), + m_credentialStatus(qPrefCloudStorage::CS_UNKNOWN), m_developer(false), m_distanceThreshold(1000), - m_oldStatus(qPref::CS_UNKNOWN), + m_oldStatus(qPrefCloudStorage::CS_UNKNOWN), m_showPin(false), m_timeThreshold(60) { @@ -69,16 +69,16 @@ void QMLPrefs::setCloudUserName(const QString &cloudUserName) emit cloudUserNameChanged(); } -qPref::cloud_status QMLPrefs::credentialStatus() const +qPrefCloudStorage::cloud_status QMLPrefs::credentialStatus() const { return m_credentialStatus; } -void QMLPrefs::setCredentialStatus(const qPref::cloud_status value) +void QMLPrefs::setCredentialStatus(const qPrefCloudStorage::cloud_status value) { if (m_credentialStatus != value) { setOldStatus(m_credentialStatus); - if (value == qPref::CS_NOCLOUD) { + if (value == qPrefCloudStorage::CS_NOCLOUD) { QMLManager::instance()->appendTextToLog("Switching to no cloud mode"); set_filename(NOCLOUD_LOCALSTORAGE); clearCredentials(); @@ -105,12 +105,12 @@ void QMLPrefs::setDistanceThreshold(int distance) emit distanceThresholdChanged(); } -qPref::cloud_status QMLPrefs::oldStatus() const +qPrefCloudStorage::cloud_status QMLPrefs::oldStatus() const { return m_oldStatus; } -void QMLPrefs::setOldStatus(const qPref::cloud_status value) +void QMLPrefs::setOldStatus(const qPrefCloudStorage::cloud_status value) { if (m_oldStatus != value) { m_oldStatus = value; @@ -172,7 +172,7 @@ void QMLPrefs::cancelCredentialsPinSetup() * cloud account, so the name is not perfect. */ - setCredentialStatus(qPref::CS_UNKNOWN); + setCredentialStatus(qPrefCloudStorage::CS_UNKNOWN); qPrefCloudStorage::set_cloud_storage_email(m_cloudUserName); qPrefCloudStorage::set_cloud_storage_password(m_cloudPassword); qPrefCloudStorage::set_cloud_verification_status(m_credentialStatus); |