3 files changed, 1 insertions, 34 deletions
diff --git a/core/qt-init.cpp b/core/qt-init.cpp
index 5596b3f95..3543fb9bd 100644
--- a/core/qt-init.cpp
+++ b/core/qt-init.cpp
@@ -49,7 +49,7 @@ void init_qt_late()
 	QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton);
 #endif
 	// find plugins installed in the application directory (without this SVGs don't work on Windows)
-	SettingsObjectWrapper::instance()->load();
+	qPref::load();
 
 	QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath());
 	QLocale loc;
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);
 };