1 files changed, 1 insertions, 70 deletions
diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp
index 80b9df8ee..416c645b6 100644
--- a/core/subsurface-qt/SettingsObjectWrapper.cpp
+++ b/core/subsurface-qt/SettingsObjectWrapper.cpp
@@ -1913,75 +1913,6 @@ void GeneralSettingsObjectWrapper::setAutoRecalculateThumbnails(bool value)
 	emit autoRecalculateThumbnailsChanged(value);
 }
 
-DisplaySettingsObjectWrapper::DisplaySettingsObjectWrapper(QObject *parent) :
-	QObject(parent)
-{
-}
-
-QString DisplaySettingsObjectWrapper::divelistFont() const
-{
-	return prefs.divelist_font;
-}
-
-double DisplaySettingsObjectWrapper::fontSize() const
-{
-	return prefs.font_size;
-}
-
-bool DisplaySettingsObjectWrapper::displayInvalidDives() const
-{
-	return prefs.display_invalid_dives;
-}
-
-void DisplaySettingsObjectWrapper::setDivelistFont(const QString& value)
-{
-
-	QString newValue = value;
-	if (value.contains(","))
-		newValue = value.left(value.indexOf(","));
-
-	if (newValue == prefs.divelist_font)
-		return;
-
-	QSettings s;
-	s.beginGroup(group);
-	s.setValue("divelist_font", value);
-
-	if (!subsurface_ignore_font(qPrintable(newValue))) {
-		free((void *)prefs.divelist_font);
-		prefs.divelist_font = copy_qstring(newValue);
-		qApp->setFont(QFont(newValue));
-	}
-	emit divelistFontChanged(newValue);
-}
-
-void DisplaySettingsObjectWrapper::setFontSize(double value)
-{
-	if (value == prefs.font_size)
-		return;
-
-	QSettings s;
-	s.beginGroup(group);
-	s.setValue("font_size", value);
-	prefs.font_size = value;
-	QFont defaultFont = qApp->font();
-	defaultFont.setPointSizeF(prefs.font_size);
-	qApp->setFont(defaultFont);
-	emit fontSizeChanged(value);
-}
-
-void DisplaySettingsObjectWrapper::setDisplayInvalidDives(bool value)
-{
-	if (value == prefs.display_invalid_dives)
-		return;
-
-	QSettings s;
-	s.beginGroup(group);
-	s.setValue("displayinvalid", value);
-	prefs.display_invalid_dives = value;
-	emit displayInvalidDivesChanged(value);
-}
-
 LanguageSettingsObjectWrapper::LanguageSettingsObjectWrapper(QObject *parent) :
 	QObject(parent)
 {
@@ -2194,7 +2125,7 @@ QObject(parent),
 	planner_settings(new DivePlannerSettings(this)),
 	unit_settings(new UnitsSettings(this)),
 	general_settings(new GeneralSettingsObjectWrapper(this)),
-	display_settings(new DisplaySettingsObjectWrapper(this)),
+	display_settings(new qPrefDisplay(this)),
 	language_settings(new LanguageSettingsObjectWrapper(this)),
 	animation_settings(new AnimationsSettingsObjectWrapper(this)),
 	location_settings(new LocationServiceSettingsObjectWrapper(this)),