From 8d66633fe798f6c45978ea1b0d47aa04625d4ac5 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Thu, 5 Jul 2018 20:37:53 +0200 Subject: core: make qPref::cloud_status the only version of the enum 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 --- core/cloudstorage.cpp | 6 +++--- core/pref.h | 8 -------- core/settings/qPref.h | 8 ++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'core') diff --git a/core/cloudstorage.cpp b/core/cloudstorage.cpp index 68b81fbbf..8c4da4791 100644 --- a/core/cloudstorage.cpp +++ b/core/cloudstorage.cpp @@ -52,7 +52,7 @@ void CloudStorageAuthenticate::uploadFinished() CloudStorageSettings csSettings(parent()); if (cloudAuthReply == QLatin1String("[VERIFIED]") || cloudAuthReply == QLatin1String("[OK]")) { - csSettings.setVerificationStatus(CS_VERIFIED); + csSettings.setVerificationStatus(qPref::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.setVerificationStatus(CS_NEED_TO_VERIFY); + csSettings.setVerificationStatus(qPref::CS_NEED_TO_VERIFY); report_error(qPrintable(tr("Cloud account verification required, enter PIN in preferences"))); } else if (cloudAuthReply == QLatin1String("[PASSWDCHANGED]")) { free((void *)prefs.cloud_storage_password); @@ -70,7 +70,7 @@ void CloudStorageAuthenticate::uploadFinished() emit passwordChangeSuccessful(); return; } else { - csSettings.setVerificationStatus(CS_INCORRECT_USER_PASSWD); + csSettings.setVerificationStatus(qPref::CS_INCORRECT_USER_PASSWD); myLastError = cloudAuthReply; report_error("%s", qPrintable(cloudAuthReply)); } diff --git a/core/pref.h b/core/pref.h index fb84856a4..bae7992fe 100644 --- a/core/pref.h +++ b/core/pref.h @@ -213,14 +213,6 @@ enum def_file_behavior { CLOUD_DEFAULT_FILE }; -enum cloud_status { - CS_UNKNOWN, - CS_INCORRECT_USER_PASSWD, - CS_NEED_TO_VERIFY, - CS_VERIFIED, - CS_NOCLOUD -}; - extern struct preferences prefs, default_prefs, git_prefs; extern const char *system_divelist_default_font; diff --git a/core/settings/qPref.h b/core/settings/qPref.h index 002f66608..44dc6e075 100644 --- a/core/settings/qPref.h +++ b/core/settings/qPref.h @@ -20,6 +20,14 @@ public: void loadSync(bool doSync); public: + enum cloud_status { + CS_UNKNOWN, + CS_INCORRECT_USER_PASSWD, + CS_NEED_TO_VERIFY, + CS_VERIFIED, + CS_NOCLOUD + }; + private: }; -- cgit v1.2.3-70-g09d2