diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-01-03 18:03:28 +0100 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2018-01-06 10:46:07 -0800 |
commit | 59526e948aea42b977a3976293fbfdfe561dec97 (patch) | |
tree | a603c538b2bfb54731e9519a0190cd2fffa8da67 /core/subsurface-qt | |
parent | b3901aa8f90499ee2a34efdddc2463105afc53f1 (diff) | |
download | subsurface-59526e948aea42b977a3976293fbfdfe561dec97.tar.gz |
Remove cloud_background_sync preferences option
The preferences flag cloud_background_sync used to be used heavily in
the mobile code, but is not used there anymore. Now, it is accessed
only in one place, but does not do what it actually says: If it is off,
the remote storage is not synced on save (but will be synced on next
load).
Syncing on save can also be prevented by unchecking the "Cloud online"
menu checkbox. Since the latter seems more logical and general
(support for non-cloud remote git repositories), remove the cloud_background_sync
option.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/subsurface-qt')
-rw-r--r-- | core/subsurface-qt/SettingsObjectWrapper.cpp | 17 | ||||
-rw-r--r-- | core/subsurface-qt/SettingsObjectWrapper.h | 4 |
2 files changed, 0 insertions, 21 deletions
diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index e4a9a71d6..7dff976fb 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -983,11 +983,6 @@ short CloudStorageSettings::verificationStatus() const return prefs.cloud_verification_status; } -bool CloudStorageSettings::backgroundSync() const -{ - return prefs.cloud_background_sync; -} - QString CloudStorageSettings::userId() const { return QString(prefs.userid); @@ -1081,17 +1076,6 @@ void CloudStorageSettings::setVerificationStatus(short value) emit verificationStatusChanged(value); } -void CloudStorageSettings::setBackgroundSync(bool value) -{ - if (value == prefs.cloud_background_sync) - return; - QSettings s; - s.beginGroup(group); - s.setValue("cloud_background_sync", value); - prefs.cloud_background_sync = value; - emit backgroundSyncChanged(value); -} - void CloudStorageSettings::setSaveUserIdLocal(bool value) { //TODO: this is not saved on disk? @@ -2300,7 +2284,6 @@ void SettingsObjectWrapper::load() GET_TXT("password", cloud_storage_password); } GET_INT("cloud_verification_status", cloud_verification_status); - GET_BOOL("cloud_background_sync", cloud_background_sync); GET_BOOL("git_local_only", git_local_only); // creating the git url here is simply a convenience when C code wants diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h index 1d56ddf30..a41caae40 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.h +++ b/core/subsurface-qt/SettingsObjectWrapper.h @@ -331,7 +331,6 @@ class CloudStorageSettings : public QObject { Q_PROPERTY(bool git_local_only READ gitLocalOnly WRITE setGitLocalOnly NOTIFY gitLocalOnlyChanged) Q_PROPERTY(bool save_password_local READ savePasswordLocal WRITE setSavePasswordLocal NOTIFY savePasswordLocalChanged) Q_PROPERTY(short verification_status READ verificationStatus WRITE setVerificationStatus NOTIFY verificationStatusChanged) - Q_PROPERTY(bool background_sync READ backgroundSync WRITE setBackgroundSync NOTIFY backgroundSyncChanged) public: CloudStorageSettings(QObject *parent); QString password() const; @@ -343,7 +342,6 @@ public: QString gitUrl() const; bool savePasswordLocal() const; short verificationStatus() const; - bool backgroundSync() const; bool gitLocalOnly() const; bool saveUserIdLocal() const; @@ -357,7 +355,6 @@ public slots: void setGitUrl(const QString& value); void setSavePasswordLocal(bool value); void setVerificationStatus(short value); - void setBackgroundSync(bool value); void setGitLocalOnly(bool value); void setSaveUserIdLocal(bool value); @@ -371,7 +368,6 @@ signals: void gitUrlChanged(const QString& value); void savePasswordLocalChanged(bool value); void verificationStatusChanged(short value); - void backgroundSyncChanged(bool value); void gitLocalOnlyChanged(bool value); void saveUserIdLocalChanged(bool value); |