diff options
Diffstat (limited to 'src/settings/viewmodes/dolphinfontrequester.cpp')
| -rw-r--r-- | src/settings/viewmodes/dolphinfontrequester.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp index 6cb7b9929..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), @@ -41,12 +42,12 @@ DolphinFontRequester::DolphinFontRequester(QWidget* parent) : m_modeCombo = new KComboBox(this); m_modeCombo->addItem(i18nc("@item:inlistbox Font", "System Font")); m_modeCombo->addItem(i18nc("@item:inlistbox Font", "Custom Font")); - connect(m_modeCombo, SIGNAL(activated(int)), - this, SLOT(changeMode(int))); + connect(m_modeCombo, static_cast<void(KComboBox::*)(int)>(&KComboBox::activated), + this, &DolphinFontRequester::changeMode); m_chooseFontButton = new QPushButton(i18nc("@action:button Choose font", "Choose..."), this); - connect(m_chooseFontButton, SIGNAL(clicked()), - this, SLOT(openFontDialog())); + connect(m_chooseFontButton, &QPushButton::clicked, + this, &DolphinFontRequester::openFontDialog); changeMode(m_modeCombo->currentIndex()); @@ -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) @@ -104,4 +105,3 @@ void DolphinFontRequester::changeMode(int index) emit changed(); } -#include "dolphinfontrequester.moc" |