mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: correct cloudstorage.cpp to use static qPrefCloudStorage functions.
qPrefCloudStorage set/get functions are static. remove creation of qPrefCloudStorage instance, reference static functions. Signed-off-by: Jan Iversen <jan@casacondor.com>
This commit is contained in:
parent
a4ea0f62af
commit
d0dcc7b32a
1 changed files with 4 additions and 5 deletions
|
@ -50,10 +50,9 @@ void CloudStorageAuthenticate::uploadFinished()
|
|||
|
||||
QString cloudAuthReply(reply->readAll());
|
||||
qDebug() << "Completed connection with cloud storage backend, response" << cloudAuthReply;
|
||||
qPrefCloudStorage csSettings(parent());
|
||||
|
||||
if (cloudAuthReply == QLatin1String("[VERIFIED]") || cloudAuthReply == QLatin1String("[OK]")) {
|
||||
csSettings.set_cloud_verification_status(qPrefCloudStorage::CS_VERIFIED);
|
||||
qPrefCloudStorage::set_cloud_verification_status(qPrefCloudStorage::CS_VERIFIED);
|
||||
/* TODO: Move this to a correct place
|
||||
NotificationWidget *nw = MainWindow::instance()->getNotificationWidget();
|
||||
if (nw->getNotificationText() == myLastError)
|
||||
|
@ -62,15 +61,15 @@ void CloudStorageAuthenticate::uploadFinished()
|
|||
myLastError.clear();
|
||||
} else if (cloudAuthReply == QLatin1String("[VERIFY]") ||
|
||||
cloudAuthReply == QLatin1String("Invalid PIN")) {
|
||||
csSettings.set_cloud_verification_status(qPrefCloudStorage::CS_NEED_TO_VERIFY);
|
||||
qPrefCloudStorage::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);
|
||||
qPrefCloudStorage::set_cloud_storage_password(cloudNewPassword);
|
||||
cloudNewPassword.clear();
|
||||
emit passwordChangeSuccessful();
|
||||
return;
|
||||
} else {
|
||||
csSettings.set_cloud_verification_status(qPrefCloudStorage::CS_INCORRECT_USER_PASSWD);
|
||||
qPrefCloudStorage::set_cloud_verification_status(qPrefCloudStorage::CS_INCORRECT_USER_PASSWD);
|
||||
myLastError = cloudAuthReply;
|
||||
report_error("%s", qPrintable(cloudAuthReply));
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue