From 4b2071728dd450e8fa9b81d4ccd3a1d80d78a305 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Wed, 15 Aug 2018 11:54:37 +0200 Subject: core: remove SettingsObjectWrapper and update qPref calls remove use of SettingsObjectWrapper:: remove include of SettingsObjectWrapper.h use qPrefFoo:: for setters and getters replace prefs.foo with qPrefXYZ::foo() where feasible (this expands to the same code, but gives us more control over the variable). Signed-off-by: Jan Iversen --- core/divecomputer.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'core/divecomputer.cpp') diff --git a/core/divecomputer.cpp b/core/divecomputer.cpp index 978074e62..5e177e541 100644 --- a/core/divecomputer.cpp +++ b/core/divecomputer.cpp @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "divecomputer.h" #include "dive.h" -#include "subsurface-qt/SettingsObjectWrapper.h" +#include "core/settings/qPrefDiveComputer.h" #include "subsurface-string.h" DiveComputerList dcList; @@ -123,14 +123,12 @@ 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->vendor() == vendor && dc->product() == product; + return qPrefDiveComputer::vendor() == vendor && qPrefDiveComputer::product() == product; } extern "C" int is_default_dive_computer_device(const char *name) { - auto dc = SettingsObjectWrapper::instance()->dive_computer_settings; - return dc->device() == name; + return qPrefDiveComputer::device() == name; } extern "C" void set_dc_nickname(struct dive *dive) -- cgit v1.2.3-70-g09d2