diff options
| author |  Joakim Bygdell <j.bygdell@gmail.com> | 2017-02-04 17:55:25 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-02-05 12:29:51 -0800 |
| commit | 0277d5aacc27893220c5914778896d2b4d14aa82 (patch) | |
| tree | bab2fae1f52703d437e7763cdac5e12c2ef0fd7e /mobile-widgets/qmlmanager.cpp | |
| parent | 12c33a038f1e2f33b7b0e09e0394684115e630ea (diff) | |
| download | subsurface-0277d5aacc27893220c5914778896d2b4d14aa82.tar.gz | |
Merge informational_prefs into git_prefs
There is no need to have two variables for the same purpose.
[Dirk Hohndel: changed to keep the two separate functions as otherwise
we no longer parse existing repos successfully]
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'mobile-widgets/qmlmanager.cpp')
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index 422320fdc..a2a635a1b 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -151,10 +151,10 @@ void QMLManager::openLocalThenRemote(QString url) // if we can load from the cache, we know that we have at least a valid email if (credentialStatus() == UNKNOWN) setCredentialStatus(VALID_EMAIL); - prefs.unit_system = informational_prefs.unit_system; - if (informational_prefs.unit_system == IMPERIAL) - informational_prefs.units = IMPERIAL_units; - prefs.units = informational_prefs.units; + prefs.unit_system = git_prefs.unit_system; + if (git_prefs.unit_system == IMPERIAL) + git_prefs.units = IMPERIAL_units; + prefs.units = git_prefs.units; prefs.tankbar = git_prefs.tankbar; prefs.dcceiling = git_prefs.dcceiling; process_dives(false, false); @@ -538,10 +538,10 @@ void QMLManager::revertToNoCloudIfNeeded() void QMLManager::consumeFinishedLoad(timestamp_t currentDiveTimestamp) { - prefs.unit_system = informational_prefs.unit_system; - if (informational_prefs.unit_system == IMPERIAL) - informational_prefs.units = IMPERIAL_units; - prefs.units = informational_prefs.units; + prefs.unit_system = git_prefs.unit_system; + if (git_prefs.unit_system == IMPERIAL) + git_prefs.units = IMPERIAL_units; + prefs.units = git_prefs.units; prefs.tankbar = git_prefs.tankbar; prefs.dcceiling = git_prefs.dcceiling; DiveListModel::instance()->clear(); |