X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a06ee3399bece608790e419054f95807a017a020..85241a924:/src/settings/viewmodes/dolphinfontrequester.cpp

diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index 4d8b4813c..09aacc3df 100644
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -19,28 +19,28 @@
 
 #include "dolphinfontrequester.h"
 
-#include <KFontDialog>
 #include <KLocalizedString>
-#include <KComboBox>
 
+#include <QComboBox>
+#include <QFontDatabase>
+#include <QFontDialog>
 #include <QHBoxLayout>
 #include <QPushButton>
-#include <QFontDatabase>
 
 DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
     QWidget(parent),
-    m_modeCombo(0),
-    m_chooseFontButton(0),
+    m_modeCombo(nullptr),
+    m_chooseFontButton(nullptr),
     m_mode(SystemFont),
     m_customFont()
 {
     QHBoxLayout* topLayout = new QHBoxLayout(this);
-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(0, 0, 0, 0);
 
-    m_modeCombo = new KComboBox(this);
+    m_modeCombo = new QComboBox(this);
     m_modeCombo->addItem(i18nc("@item:inlistbox Font", "System Font"));
     m_modeCombo->addItem(i18nc("@item:inlistbox Font", "Custom Font"));
-    connect(m_modeCombo, static_cast<void(KComboBox::*)(int)>(&KComboBox::activated),
+    connect(m_modeCombo, QOverload<int>::of(&QComboBox::activated),
             this, &DolphinFontRequester::changeMode);
 
     m_chooseFontButton = new QPushButton(i18nc("@action:button Choose font", "Choose..."), this);
@@ -86,11 +86,9 @@ QFont DolphinFontRequester::customFont() const
 
 void DolphinFontRequester::openFontDialog()
 {
-    QFont font = m_customFont;
-    const int result = KFontDialog::getFont(font,
-                                            KFontChooser::NoDisplayFlags,
-                                            this);
-    if (result == KFontDialog::Accepted) {
+    bool ok = false;
+    const QFont font = QFontDialog::getFont(&ok, this);
+    if (ok) {
         m_customFont = font;
         m_modeCombo->setFont(m_customFont);
         emit changed();