summaryrefslogtreecommitdiffstats
path: root/core/subsurface-qt
diff options
context:
space:
mode:
authorGravatar jan Iversen <jani@apache.org>2018-08-14 10:07:22 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-08-15 16:11:39 -0700
commitf251faa5011ecd26ab000a94d1dd5545949493e5 (patch)
tree0bb1cb7f9bf223a4bd35a376414684a32c7a0626 /core/subsurface-qt
parentf2c302284b92354461a34f11475f69b6272caaa3 (diff)
downloadsubsurface-f251faa5011ecd26ab000a94d1dd5545949493e5.tar.gz
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 <jani@apache.org>
Diffstat (limited to 'core/subsurface-qt')
-rw-r--r--core/subsurface-qt/SettingsObjectWrapper.cpp31
-rw-r--r--core/subsurface-qt/SettingsObjectWrapper.h2
2 files changed, 0 insertions, 33 deletions
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);
};