1 files changed, 5 insertions, 43 deletions

diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h
index 64f0621b2..075227384 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.h
+++ b/core/subsurface-qt/SettingsObjectWrapper.h
@@ -6,6 +6,7 @@
 #include <QDate>
 
 #include "core/pref.h"
+#include "core/settings/qPref.h"
 
 /* Wrapper class for the Settings. This will allow
  * seamlessy integration of the settings with the QML
@@ -594,28 +595,6 @@ private:
 	const QString group = QStringLiteral("GeneralSettings");
 };
 
-class DisplaySettingsObjectWrapper : public QObject {
-	Q_OBJECT
-	Q_PROPERTY(QString divelist_font     READ divelistFont       WRITE setDivelistFont       NOTIFY divelistFontChanged)
-	Q_PROPERTY(double font_size          READ fontSize           WRITE setFontSize           NOTIFY fontSizeChanged)
-	Q_PROPERTY(bool display_invalid_dives  READ displayInvalidDives     WRITE setDisplayInvalidDives       NOTIFY displayInvalidDivesChanged)
-public:
-	DisplaySettingsObjectWrapper(QObject *parent);
-	QString divelistFont() const;
-	double fontSize() const;
-	bool displayInvalidDives() const;
-public slots:
-	void setDivelistFont(const QString& value);
-	void setFontSize(double value);
-	void setDisplayInvalidDives(bool value);
-signals:
-	void divelistFontChanged(const QString& value);
-	void fontSizeChanged(double value);
-	void displayInvalidDivesChanged(bool value);
-private:
-	const QString group = QStringLiteral("Display");
-};
-
 class LanguageSettingsObjectWrapper : public QObject {
 	Q_OBJECT
 	Q_PROPERTY(QString language          READ language           WRITE setLanguage           NOTIFY languageChanged)
@@ -661,23 +640,6 @@ private:
 	const QString group = QStringLiteral("Language");
 };
 
-class AnimationsSettingsObjectWrapper : public QObject {
-	Q_OBJECT
-	Q_PROPERTY(int animation_speed       READ animationSpeed     WRITE setAnimationSpeed       NOTIFY animationSpeedChanged)
-public:
-	AnimationsSettingsObjectWrapper(QObject *parent);
-	int animationSpeed() const;
-
-public slots:
-	void setAnimationSpeed(int value);
-
-signals:
-	void animationSpeedChanged(int value);
-
-private:
-	const QString group = QStringLiteral("Animations");
-};
-
 class LocationServiceSettingsObjectWrapper : public QObject {
 	Q_OBJECT
 	Q_PROPERTY(int time_threshold            READ timeThreshold         WRITE setTimeThreshold         NOTIFY timeThresholdChanged)
@@ -709,9 +671,9 @@ class SettingsObjectWrapper : public QObject {
 	Q_PROPERTY(UnitsSettings*              units            MEMBER unit_settings CONSTANT)
 
 	Q_PROPERTY(GeneralSettingsObjectWrapper*         general   MEMBER general_settings CONSTANT)
-	Q_PROPERTY(DisplaySettingsObjectWrapper*         display   MEMBER display_settings CONSTANT)
+	Q_PROPERTY(qPrefDisplay*         display   MEMBER display_settings CONSTANT)
 	Q_PROPERTY(LanguageSettingsObjectWrapper*        language  MEMBER language_settings CONSTANT)
-	Q_PROPERTY(AnimationsSettingsObjectWrapper*      animation MEMBER animation_settings CONSTANT)
+	Q_PROPERTY(qPrefAnimations*      animation MEMBER animation_settings CONSTANT)
 	Q_PROPERTY(LocationServiceSettingsObjectWrapper* Location  MEMBER location_settings CONSTANT)
 
 	Q_PROPERTY(UpdateManagerSettings* update MEMBER update_manager_settings CONSTANT)
@@ -728,9 +690,9 @@ public:
 	DivePlannerSettings *planner_settings;
 	UnitsSettings *unit_settings;
 	GeneralSettingsObjectWrapper *general_settings;
-	DisplaySettingsObjectWrapper *display_settings;
+	qPrefDisplay *display_settings;
 	LanguageSettingsObjectWrapper *language_settings;
-	AnimationsSettingsObjectWrapper *animation_settings;
+	qPrefAnimations *animation_settings;
 	LocationServiceSettingsObjectWrapper *location_settings;
 	UpdateManagerSettings *update_manager_settings;
 	DiveComputerSettings *dive_computer_settings;