kdelibs4support--

2 files changed, 8 insertions, 7 deletions

diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index 660aacdf9..278fb0933 100644
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -27,6 +27,7 @@
 #include <QEvent>
 #include <QHBoxLayout>
 #include <QPushButton>
+#include <QFontDatabase>
 
 DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
     QWidget(parent),
@@ -72,7 +73,7 @@ DolphinFontRequester::Mode DolphinFontRequester::mode() const
 
 QFont DolphinFontRequester::currentFont() const
 {
-    return (m_mode == CustomFont) ? m_customFont : KGlobalSettings::generalFont();
+    return (m_mode == CustomFont) ? m_customFont : QFontDatabase::systemFont(QFontDatabase::GeneralFont);
 }
 
 void DolphinFontRequester::setCustomFont(const QFont& font)
diff --git a/src/settings/viewmodes/viewmodesettings.cpp b/src/settings/viewmodes/viewmodesettings.cpp
index 5b9334c22..01601f711 100644
--- a/src/settings/viewmodes/viewmodesettings.cpp
+++ b/src/settings/viewmodes/viewmodesettings.cpp
@@ -125,9 +125,9 @@ int ViewModeSettings::fontWeight() const
 void ViewModeSettings::readConfig()
 {
     switch (m_mode) {
-    case ViewModeSettings::IconsMode:   IconsModeSettings::self()->readConfig(); break;
-    case ViewModeSettings::CompactMode: CompactModeSettings::self()->readConfig(); break;
-    case ViewModeSettings::DetailsMode: DetailsModeSettings::self()->readConfig(); break;
+    case ViewModeSettings::IconsMode:   IconsModeSettings::self()->load(); break;
+    case ViewModeSettings::CompactMode: CompactModeSettings::self()->load(); break;
+    case ViewModeSettings::DetailsMode: DetailsModeSettings::self()->load(); break;
     default: Q_ASSERT(false); break;
     }
 }
@@ -135,9 +135,9 @@ void ViewModeSettings::readConfig()
 void ViewModeSettings::writeConfig()
 {
     switch (m_mode) {
-    case ViewModeSettings::IconsMode:   IconsModeSettings::self()->writeConfig(); break;
-    case ViewModeSettings::CompactMode: CompactModeSettings::self()->writeConfig(); break;
-    case ViewModeSettings::DetailsMode: DetailsModeSettings::self()->writeConfig(); break;
+    case ViewModeSettings::IconsMode:   IconsModeSettings::self()->save(); break;
+    case ViewModeSettings::CompactMode: CompactModeSettings::self()->save(); break;
+    case ViewModeSettings::DetailsMode: DetailsModeSettings::self()->save(); break;
     default: Q_ASSERT(false); break;
     }
 }