3 files changed, 9 insertions, 66 deletions

diff --git a/src/settings/viewmodes/viewmodesettings.cpp b/src/settings/viewmodes/viewmodesettings.cpp
index 8c11bde5b..73a91a272 100644
--- a/src/settings/viewmodes/viewmodesettings.cpp
+++ b/src/settings/viewmodes/viewmodesettings.cpp
@@ -86,59 +86,17 @@ bool ViewModeSettings::useSystemFont() const
     }, m_viewModeSettingsVariant);
 }
 
-void ViewModeSettings::setFontFamily(const QString &fontFamily)
+void ViewModeSettings::setViewFont(const QFont &font)
 {
-    std::visit([&fontFamily](auto &&v) {
-        v->setFontFamily(fontFamily);
+    std::visit([&font](auto &&v) {
+        v->setViewFont(font);
     }, m_viewModeSettingsVariant);
 }
 
-QString ViewModeSettings::fontFamily() const
+QFont ViewModeSettings::viewFont() const
 {
     return std::visit([](auto &&v) {
-        return v->fontFamily();
-    }, m_viewModeSettingsVariant);
-}
-
-void ViewModeSettings::setFontSize(qreal fontSize)
-{
-    std::visit([fontSize](auto &&v) {
-        v->setFontSize(fontSize);
-    }, m_viewModeSettingsVariant);
-}
-
-qreal ViewModeSettings::fontSize() const
-{
-    return std::visit([](auto &&v) {
-        return v->fontSize();
-    }, m_viewModeSettingsVariant);
-}
-
-void ViewModeSettings::setItalicFont(bool italic)
-{
-    std::visit([italic](auto &&v) {
-        v->setItalicFont(italic);
-    }, m_viewModeSettingsVariant);
-}
-
-bool ViewModeSettings::italicFont() const
-{
-    return std::visit([](auto &&v) {
-        return v->italicFont();
-    }, m_viewModeSettingsVariant);
-}
-
-void ViewModeSettings::setFontWeight(int fontWeight)
-{
-    std::visit([fontWeight](auto &&v) {
-        v->setFontWeight(fontWeight);
-    }, m_viewModeSettingsVariant);
-}
-
-int ViewModeSettings::fontWeight() const
-{
-    return std::visit([](auto &&v) {
-        return v->fontWeight();
+        return v->viewFont();
     }, m_viewModeSettingsVariant);
 }
 
diff --git a/src/settings/viewmodes/viewmodesettings.h b/src/settings/viewmodes/viewmodesettings.h
index 5d2b6e0e2..6d8b3afb6 100644
--- a/src/settings/viewmodes/viewmodesettings.h
+++ b/src/settings/viewmodes/viewmodesettings.h
@@ -39,17 +39,8 @@ public:
     void setUseSystemFont(bool useSystemFont);
     bool useSystemFont() const;
 
-    void setFontFamily(const QString &fontFamily);
-    QString fontFamily() const;
-
-    void setFontSize(qreal fontSize);
-    qreal fontSize() const;
-
-    void setItalicFont(bool italic);
-    bool italicFont() const;
-
-    void setFontWeight(int fontWeight);
-    int fontWeight() const;
+    void setViewFont(const QFont &font);
+    QFont viewFont() const;
 
     void useDefaults(bool useDefaults);
 
diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index 1e109aab0..0448af7c0 100644
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -215,10 +215,7 @@ void ViewSettingsTab::applySettings()
     settings.setPreviewSize(previewSize);
 
     settings.setUseSystemFont(useSystemFont);
-    settings.setFontFamily(font.family());
-    settings.setFontSize(font.pointSizeF());
-    settings.setItalicFont(font.italic());
-    settings.setFontWeight(font.weight());
+    settings.setViewFont(font);
 
     settings.save();
 }
@@ -272,10 +269,7 @@ void ViewSettingsTab::loadSettings()
                              ? DolphinFontRequester::SystemFont
                              : DolphinFontRequester::CustomFont);
 
-    QFont font(settings.fontFamily(), qRound(settings.fontSize()));
-    font.setItalic(settings.italicFont());
-    font.setWeight(settings.fontWeight());
-    font.setPointSizeF(settings.fontSize());
+    QFont font(settings.viewFont());
     m_fontRequester->setCustomFont(font);
 }