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: correct cloudstorage.cpp to use static qPrefCloudStorage functions.

Browse source 
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:
jan Iversen 2019-11-23 17:34:13 +01:00 • committed by Dirk Hohndel
parent a4ea0f62af
commit d0dcc7b32a
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/cloudstorage.cpp
View file

@ -50,10 +50,9 @@ void CloudStorageAuthenticate::uploadFinished()
QString cloudAuthReply(reply->readAll()); QString cloudAuthReply(reply->readAll());
qDebug() << "Completed connection with cloud storage backend, response" << cloudAuthReply; qDebug() << "Completed connection with cloud storage backend, response" << cloudAuthReply;
qPrefCloudStorage csSettings(parent());
if (cloudAuthReply == QLatin1String("[VERIFIED]") || cloudAuthReply == QLatin1String("[OK]")) { 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 /* TODO: Move this to a correct place
NotificationWidget *nw = MainWindow::instance()->getNotificationWidget(); NotificationWidget *nw = MainWindow::instance()->getNotificationWidget();
if (nw->getNotificationText() == myLastError) if (nw->getNotificationText() == myLastError)
@ -62,15 +61,15 @@ void CloudStorageAuthenticate::uploadFinished()
myLastError.clear(); myLastError.clear();
} else if (cloudAuthReply == QLatin1String("[VERIFY]") || } else if (cloudAuthReply == QLatin1String("[VERIFY]") ||
cloudAuthReply == QLatin1String("Invalid PIN")) { 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"))); report_error(qPrintable(tr("Cloud account verification required, enter PIN in preferences")));
} else if (cloudAuthReply == QLatin1String("[PASSWDCHANGED]")) { } else if (cloudAuthReply == QLatin1String("[PASSWDCHANGED]")) {
csSettings.set_cloud_storage_password(cloudNewPassword); qPrefCloudStorage::set_cloud_storage_password(cloudNewPassword);
cloudNewPassword.clear(); cloudNewPassword.clear();
emit passwordChangeSuccessful(); emit passwordChangeSuccessful();
return; return;
} else { } else {
csSettings.set_cloud_verification_status(qPrefCloudStorage::CS_INCORRECT_USER_PASSWD); qPrefCloudStorage::set_cloud_verification_status(qPrefCloudStorage::CS_INCORRECT_USER_PASSWD);
myLastError = cloudAuthReply; myLastError = cloudAuthReply;
report_error("%s", qPrintable(cloudAuthReply)); report_error("%s", qPrintable(cloudAuthReply));
} }