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: remove LOADSYNC* macros

Browse source 
expend LOADSYNC* into DISK_* macros
remove LOADSYNC* from qPrefPrivate.h
update qPrefDisplay to not use LOADSYNC*

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-07-18 22:52:13 +02:00 • committed by Dirk Hohndel
parent 3eae683b57
commit 92ade62260
3 changed files with 33 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/settings/qPrefCloudStorage.cpp
View file

@ -31,6 +31,7 @@ void qPrefCloudStorage::loadSync(bool doSync)
void qPrefCloudStorage::set_cloud_base_url(const QString& value)
{
QString valueGit = value + "/git";
if (value != prefs.cloud_base_url) {
// only free and set if not default
if (prefs.cloud_base_url != default_prefs.cloud_base_url) {
@ -39,14 +40,12 @@ void qPrefCloudStorage::set_cloud_base_url(const QString& value)
}
disk_cloud_base_url(true);
disk_cloud_git_url(true);
emit cloud_base_url_changed(value);
emit cloud_git_url_changed(valueGit);
}
}
void qPrefCloudStorage::disk_cloud_base_url(bool doSync)
{
LOADSYNC_TXT("/cloud_base_url", cloud_base_url);
LOADSYNC_TXT("/cloud_git_url", cloud_git_url);
}
DISK_LOADSYNC_TXT(CloudStorage, "/cloud_base_url", cloud_base_url)
void qPrefCloudStorage::set_cloud_git_url(const QString& value)
{
@ -86,8 +85,12 @@ void qPrefCloudStorage::set_cloud_storage_password(const QString& value)
}
void qPrefCloudStorage::disk_cloud_storage_password(bool doSync)
{
if (!doSync || prefs.save_password_local)
LOADSYNC_TXT("/password", cloud_storage_password);
if (doSync) {
if (prefs.save_password_local)
qPrefPrivate::instance()->setting.setValue(group + "/password", prefs.cloud_storage_password);
} else {
prefs.cloud_storage_password = copy_qstring(qPrefPrivate::instance()->setting.value(group + "/password", default_prefs.cloud_storage_password).toString());
}
}
HANDLE_PREFERENCE_TXT(CloudStorage, "/pin", cloud_storage_pin);
@ -107,5 +110,8 @@ void qPrefCloudStorage::disk_userid(bool doSync)
{
//WARNING: UserId is stored outside of any group, but it belongs to Cloud Storage.
const QString group = QStringLiteral("");
LOADSYNC_TXT("subsurface_webservice_uid", userid);
if (doSync)
qPrefPrivate::instance()->setting.setValue(group + "subsurface_webservice_uid", prefs.userid);
else
prefs.userid = copy_qstring(qPrefPrivate::instance()->setting.value(group + "subsurface_webservice_uid", default_prefs.userid).toString());
}