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 /core | |
| 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 'core')
| -rw-r--r-- | core/cloudstorage.cpp | 6 | ||||
| -rw-r--r-- | core/settings/qPref.cpp | 2 | ||||
| -rw-r--r-- | core/settings/qPref.h | 9 | ||||
| -rw-r--r-- | core/settings/qPrefCloudStorage.h | 9 |
4 files changed, 13 insertions, 13 deletions
diff --git a/core/cloudstorage.cpp b/core/cloudstorage.cpp index 264a7a8a0..001e0acdf 100644 --- a/core/cloudstorage.cpp +++ b/core/cloudstorage.cpp @@ -52,7 +52,7 @@ void CloudStorageAuthenticate::uploadFinished() qPrefCloudStorage csSettings(parent()); if (cloudAuthReply == QLatin1String("[VERIFIED]") || cloudAuthReply == QLatin1String("[OK]")) { - csSettings.set_cloud_verification_status(qPref::CS_VERIFIED); + csSettings.set_cloud_verification_status(qPrefCloudStorage::CS_VERIFIED); /* TODO: Move this to a correct place NotificationWidget *nw = MainWindow::instance()->getNotificationWidget(); if (nw->getNotificationText() == myLastError) @@ -61,7 +61,7 @@ void CloudStorageAuthenticate::uploadFinished() myLastError.clear(); } else if (cloudAuthReply == QLatin1String("[VERIFY]") || cloudAuthReply == QLatin1String("Invalid PIN")) { - csSettings.set_cloud_verification_status(qPref::CS_NEED_TO_VERIFY); + csSettings.set_cloud_verification_status(qPrefCloudStorage::CS_NEED_TO_VERIFY); report_error(qPrintable(tr("Cloud account verification required, enter PIN in preferences"))); } else if (cloudAuthReply == QLatin1String("[PASSWDCHANGED]")) { csSettings.set_cloud_storage_password(cloudNewPassword); @@ -69,7 +69,7 @@ void CloudStorageAuthenticate::uploadFinished() emit passwordChangeSuccessful(); return; } else { - csSettings.set_cloud_verification_status(qPref::CS_INCORRECT_USER_PASSWD); + csSettings.set_cloud_verification_status(qPrefCloudStorage::CS_INCORRECT_USER_PASSWD); myLastError = cloudAuthReply; report_error("%s", qPrintable(cloudAuthReply)); } diff --git a/core/settings/qPref.cpp b/core/settings/qPref.cpp index 61561a188..2a455b4fd 100644 --- a/core/settings/qPref.cpp +++ b/core/settings/qPref.cpp @@ -64,7 +64,7 @@ void qPref::registerQML(QQmlEngine *engine) } // Register special types - qmlRegisterUncreatableType<qPref>("org.subsurfacedivelog.mobile",1,0,"CloudStatus","Enum is not a type"); + qmlRegisterUncreatableType<qPrefCloudStorage>("org.subsurfacedivelog.mobile",1,0,"CloudStatus","Enum is not a type"); qRegisterMetaType<deco_mode>(); qRegisterMetaType<def_file_behavior>(); qRegisterMetaType<taxonomy_category>(); diff --git a/core/settings/qPref.h b/core/settings/qPref.h index e42e2b96b..f13a29274 100644 --- a/core/settings/qPref.h +++ b/core/settings/qPref.h @@ -39,15 +39,6 @@ public: void registerQML(QQmlEngine *engine); public: - enum cloud_status { - CS_UNKNOWN, - CS_INCORRECT_USER_PASSWD, - CS_NEED_TO_VERIFY, - CS_VERIFIED, - CS_NOCLOUD - }; - Q_ENUM(cloud_status); - static const QString canonical_version() { return QString(CANONICAL_VERSION_STRING); } static const QString mobile_version() { return QString(MOBILE_VERSION_STRING); } diff --git a/core/settings/qPrefCloudStorage.h b/core/settings/qPrefCloudStorage.h index 0cb4cc03c..631eaa670 100644 --- a/core/settings/qPrefCloudStorage.h +++ b/core/settings/qPrefCloudStorage.h @@ -27,6 +27,15 @@ public: static void sync() { loadSync(true); } public: + enum cloud_status { + CS_UNKNOWN, + CS_INCORRECT_USER_PASSWD, + CS_NEED_TO_VERIFY, + CS_VERIFIED, + CS_NOCLOUD + }; + Q_ENUM(cloud_status); + static QString cloud_base_url() { return prefs.cloud_base_url; } static QString cloud_git_url() { return prefs.cloud_git_url; } static QString cloud_storage_email() { return prefs.cloud_storage_email; } |