From f251faa5011ecd26ab000a94d1dd5545949493e5 Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Tue, 14 Aug 2018 10:07:22 +0200 Subject: core: use qPref::load/sync use qPref instead of SettingsObjectWrapper for load/sync (seems sync is only used for testing) Signed-off-by: Jan Iversen --- core/subsurface-qt/SettingsObjectWrapper.cpp | 31 ---------------------------- core/subsurface-qt/SettingsObjectWrapper.h | 2 -- 2 files changed, 33 deletions(-) (limited to 'core/subsurface-qt') diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index 1f29e692a..72f2ba44d 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -29,37 +29,6 @@ QObject(parent), { } -void SettingsObjectWrapper::load() -{ - QSettings s; - QVariant v; - - uiLanguage(NULL); - - qPrefUnits::instance()->load(); - qPrefPartialPressureGas::instance()->load(); - qPrefGeneral::instance()->load(); - qPrefAnimations::instance()->load(); - qPrefCloudStorage::instance()->load(); - qPrefDisplay::instance()->load(); - qPrefProxy::instance()->load(); - qPrefGeocoding::instance()->load(); - - // GPS service time and distance thresholds - qPrefLocationService::instance()->load(); - - qPrefDivePlanner::instance()->load(); - qPrefDiveComputer::instance()->load(); - qPrefUpdateManager::instance()->load(); - - qPrefLanguage::instance()->load(); -} - -void SettingsObjectWrapper::sync() -{ - qPrefDisplay::instance()->sync(); -} - SettingsObjectWrapper* SettingsObjectWrapper::instance() { static SettingsObjectWrapper settings; diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h index 00f2b3626..6147f6a2e 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.h +++ b/core/subsurface-qt/SettingsObjectWrapper.h @@ -51,8 +51,6 @@ public: qPrefUpdateManager *update_manager_settings; qPrefDiveComputer *dive_computer_settings; - void sync(); - void load(); private: SettingsObjectWrapper(QObject *parent = NULL); }; -- cgit v1.2.3-70-g09d2