diff options
| author |  jan Iversen <jani@apache.org> | 2018-07-22 16:19:22 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-07-25 08:35:04 -0700 |
| commit | 3d6848b22c9fb64a99bb3dec535431a6cab09ad9 (patch) | |
| tree | c1a7aedcf02120c9ea0031194b1cef2d15db97fe /core/divecomputer.cpp | |
| parent | 98820cf970335523b4cd2a84a025c12b5480e0aa (diff) | |
| download | subsurface-3d6848b22c9fb64a99bb3dec535431a6cab09ad9.tar.gz | |
core: activate qPrefDiveComputer
remove DiveComputer from SettingsObjectWrapper and reference qPrefDiveComputer
update files using SettingsObjectWrapper/DiveComputer to use qPrefDiveComputer
this activated qPrefDiveComputer and removed the similar class from
SettingsObjectWrapper.
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'core/divecomputer.cpp')
| -rw-r--r-- | core/divecomputer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/divecomputer.cpp b/core/divecomputer.cpp index b3f01fb78..5a6353f1f 100644 --- a/core/divecomputer.cpp +++ b/core/divecomputer.cpp @@ -125,13 +125,13 @@ extern "C" void call_for_each_dc (void *f, void (*callback)(void *, const char * extern "C" int is_default_dive_computer(const char *vendor, const char *product) { auto dc = SettingsObjectWrapper::instance()->dive_computer_settings; - return dc->dc_vendor() == vendor && dc->dc_product() == product; + return dc->vendor() == vendor && dc->product() == product; } extern "C" int is_default_dive_computer_device(const char *name) { auto dc = SettingsObjectWrapper::instance()->dive_computer_settings; - return dc->dc_device() == name; + return dc->device() == name; } extern "C" void set_dc_nickname(struct dive *dive) |