diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2021-04-10 17:40:30 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2021-04-19 12:51:01 -0700 |
| commit | c5eb806adb345e24b13ac4bf106cceb1dc9d3431 (patch) | |
| tree | a071c9dede0640e23dd8032e6b1d0863d85b983e /core/settings | |
| parent | da6395a4a8b68978caf47f98b48a82fabbe1dd20 (diff) | |
| download | subsurface-c5eb806adb345e24b13ac4bf106cceb1dc9d3431.tar.gz | |
cloudstorage: some cleanup of cloud url handling
We know the preference is never empty, so stop testing for this. But
don't maintain two different preferences with basically the same
content. Instead add the '/git' suffix where needed and keep this all in
one place.
Simplify the extraction of the branch name from the cloud URL.
Also a typo fix and a new comment.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/settings')
| -rw-r--r-- | core/settings/qPrefCloudStorage.cpp | 2 | ||||
| -rw-r--r-- | core/settings/qPrefCloudStorage.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/core/settings/qPrefCloudStorage.cpp b/core/settings/qPrefCloudStorage.cpp index 24b73394b..6caf619dd 100644 --- a/core/settings/qPrefCloudStorage.cpp +++ b/core/settings/qPrefCloudStorage.cpp @@ -31,7 +31,6 @@ void qPrefCloudStorage::set_cloud_base_url(const QString &value) // only free and set if not default if (prefs.cloud_base_url != default_prefs.cloud_base_url) { qPrefPrivate::copy_txt(&prefs.cloud_base_url, value); - qPrefPrivate::copy_txt(&prefs.cloud_git_url, value + "/git"); } disk_cloud_base_url(true); @@ -44,7 +43,6 @@ void qPrefCloudStorage::disk_cloud_base_url(bool doSync) qPrefPrivate::propSetValue(keyFromGroupAndName(group, "cloud_base_url"), prefs.cloud_base_url, default_prefs.cloud_base_url); } else { prefs.cloud_base_url = copy_qstring(qPrefPrivate::propValue(keyFromGroupAndName(group, "cloud_base_url"), default_prefs.cloud_base_url).toString()); - qPrefPrivate::copy_txt(&prefs.cloud_git_url, QString(prefs.cloud_base_url) + "/git"); } } diff --git a/core/settings/qPrefCloudStorage.h b/core/settings/qPrefCloudStorage.h index b0d24227a..d30f26ae0 100644 --- a/core/settings/qPrefCloudStorage.h +++ b/core/settings/qPrefCloudStorage.h @@ -9,7 +9,6 @@ class qPrefCloudStorage : public QObject { Q_OBJECT Q_PROPERTY(bool cloud_auto_sync READ cloud_auto_sync WRITE set_cloud_auto_sync NOTIFY cloud_auto_syncChanged) Q_PROPERTY(QString cloud_base_url READ cloud_base_url WRITE set_cloud_base_url NOTIFY cloud_base_urlChanged) - Q_PROPERTY(QString cloud_git_url READ cloud_git_url) Q_PROPERTY(QString cloud_storage_email READ cloud_storage_email WRITE set_cloud_storage_email NOTIFY cloud_storage_emailChanged) Q_PROPERTY(QString cloud_storage_email_encoded READ cloud_storage_email_encoded WRITE set_cloud_storage_email_encoded NOTIFY cloud_storage_email_encodedChanged) Q_PROPERTY(QString cloud_storage_password READ cloud_storage_password WRITE set_cloud_storage_password NOTIFY cloud_storage_passwordChanged) @@ -43,7 +42,6 @@ public: static bool cloud_auto_sync() { return prefs.cloud_auto_sync; } static QString cloud_base_url() { return prefs.cloud_base_url; } - static QString cloud_git_url() { return prefs.cloud_git_url; } static QString cloud_storage_email() { return prefs.cloud_storage_email; } static QString cloud_storage_email_encoded() { return prefs.cloud_storage_email_encoded; } static QString cloud_storage_password() { return prefs.cloud_storage_password; } |