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

mobile-widgets: remove QSettings

Browse source 
update qmlprefs and qmlmanager to use qPref

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-19 00:31:46 +02:00 • committed by Dirk Hohndel
parent b7a1bb670c
commit da6e8a4cd5
2 changed files with 12 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

26
mobile-widgets/qmlmanager.cpp
View file

@ -2,7 +2,6 @@
#include "qmlmanager.h" #include "qmlmanager.h"
#include "qmlprefs.h" #include "qmlprefs.h"
#include <QUrl> #include <QUrl>
#include <QSettings>
#include <QDebug> #include <QDebug>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QAuthenticator> #include <QAuthenticator>
@ -433,7 +432,6 @@ void QMLManager::savePreferences()
void QMLManager::saveCloudCredentials() void QMLManager::saveCloudCredentials()
{ {
QSettings s;
bool cloudCredentialsChanged = false; bool cloudCredentialsChanged = false;
// make sure we only have letters, numbers, and +-_. in password and email address // make sure we only have letters, numbers, and +-_. in password and email address
QRegularExpression regExp("^[a-zA-Z0-9@.+_-]+$"); QRegularExpression regExp("^[a-zA-Z0-9@.+_-]+$");
@ -452,11 +450,9 @@ void QMLManager::saveCloudCredentials()
return; return;
} }
} }
s.beginGroup("CloudStorage"); qPrefCloudStorage::set_cloud_storage_email(QMLPrefs::instance()->cloudUserName());
s.setValue("email", QMLPrefs::instance()->cloudUserName()); qPrefCloudStorage::set_cloud_storage_password(QMLPrefs::instance()->cloudPassword());
s.setValue("password", QMLPrefs::instance()->cloudPassword()); qPrefCloudStorage::set_cloud_verification_status(QMLPrefs::instance()->credentialStatus());
s.setValue("cloud_verification_status", QMLPrefs::instance()->credentialStatus());
s.sync();
if (!same_string(prefs.cloud_storage_email, if (!same_string(prefs.cloud_storage_email,
qPrintable(QMLPrefs::instance()->cloudUserName()))) { qPrintable(QMLPrefs::instance()->cloudUserName()))) {
free((void *)prefs.cloud_storage_email); free((void *)prefs.cloud_storage_email);
@ -637,9 +633,7 @@ void QMLManager::retrieveUserid()
// overwrite the existing userid // overwrite the existing userid
free((void *)prefs.userid); free((void *)prefs.userid);
prefs.userid = copy_qstring(userid); prefs.userid = copy_qstring(userid);
QSettings s; qPrefCloudStorage::set_userid(prefs.userid);
s.setValue("subsurface_webservice_uid", prefs.userid);
s.sync();
} }
QMLPrefs::instance()->setCredentialStatus(qPref::CS_VERIFIED); QMLPrefs::instance()->setCredentialStatus(qPref::CS_VERIFIED);
setStartPageText(tr("Cloud credentials valid, loading dives...")); setStartPageText(tr("Cloud credentials valid, loading dives..."));
@ -1465,16 +1459,12 @@ void QMLManager::setVerboseEnabled(bool verboseMode)
void QMLManager::syncLoadFromCloud() void QMLManager::syncLoadFromCloud()
{ {
QSettings s; m_loadFromCloud = qPrefCloudStorage::loadFromCloud(prefs.cloud_storage_email);
QString cloudMarker = QLatin1Literal("loadFromCloud") + QString(prefs.cloud_storage_email);
m_loadFromCloud = s.contains(cloudMarker) && s.value(cloudMarker).toBool();
} }
void QMLManager::setLoadFromCloud(bool done) void QMLManager::setLoadFromCloud(bool done)
{ {
QSettings s; qPrefCloudStorage::set_loadFromCloud(prefs.cloud_storage_email, done);
QString cloudMarker = QLatin1Literal("loadFromCloud") + QString(prefs.cloud_storage_email);
s.setValue(cloudMarker, done);
m_loadFromCloud = done; m_loadFromCloud = done;
emit loadFromCloudChanged(); emit loadFromCloudChanged();
} }
@ -1536,9 +1526,7 @@ void QMLManager::setSyncToCloud(bool status)
{ {
m_syncToCloud = status; m_syncToCloud = status;
prefs.git_local_only = !status; prefs.git_local_only = !status;
QSettings s; qPrefCloudStorage::set_git_local_only(prefs.git_local_only);
s.beginGroup("CloudStorage");
s.setValue("git_local_only", prefs.git_local_only);
emit syncToCloudChanged(); emit syncToCloudChanged();
} }

17
mobile-widgets/qmlprefs.cpp
View file

@ -143,16 +143,12 @@ void QMLPrefs::setTimeThreshold(int time)
const QString QMLPrefs::theme() const const QString QMLPrefs::theme() const
{ {
QSettings s; return qPrefDisplay::theme();
s.beginGroup("Theme");
return s.value("currentTheme", "Blue").toString();
} }
void QMLPrefs::setTheme(QString theme) void QMLPrefs::setTheme(QString theme)
{ {
QSettings s; qPrefDisplay::set_theme(theme);
s.beginGroup("Theme");
s.setValue("currentTheme", theme);
emit themeChanged(); emit themeChanged();
} }
@ -175,14 +171,11 @@ void QMLPrefs::cancelCredentialsPinSetup()
* Notice that this function is also used to switch to a different * Notice that this function is also used to switch to a different
* cloud account, so the name is not perfect. * cloud account, so the name is not perfect.
*/ */
QSettings s;
setCredentialStatus(qPref::CS_UNKNOWN); setCredentialStatus(qPref::CS_UNKNOWN);
s.beginGroup("CloudStorage"); qPrefCloudStorage::set_cloud_storage_email(m_cloudUserName);
s.setValue("email", m_cloudUserName); qPrefCloudStorage::set_cloud_storage_password(m_cloudPassword);
s.setValue("password", m_cloudPassword); qPrefCloudStorage::set_cloud_verification_status(m_credentialStatus);
s.setValue("cloud_verification_status", m_credentialStatus);
s.sync();
QMLManager::instance()->setStartPageText(tr("Starting...")); QMLManager::instance()->setStartPageText(tr("Starting..."));
setShowPin(false); setShowPin(false);