X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/7a26fbc5c59596161b026b070e786767b94b4979..fdf854bd81d9e42df2d8672d49a0b7fcdb7443a5:/src/settings/viewmodes/dolphinfontrequester.cpp

diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index fe5184a56..609c368c0 100644
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -1,52 +1,36 @@
-/***************************************************************************
- *   Copyright (C) 2008 by Peter Penz <peter.penz19@gmail.com>             *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2008 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "dolphinfontrequester.h"
 
-#include <KFontDialog>
-#include <KGlobalSettings>
-#include <KLocale>
-#include <KComboBox>
+#include <KLocalizedString>
 
-#include <QEvent>
+#include <QComboBox>
+#include <QFontDatabase>
+#include <QFontDialog>
 #include <QHBoxLayout>
 #include <QPushButton>
 
-DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
-    QWidget(parent),
-    m_modeCombo(0),
-    m_chooseFontButton(0),
-    m_mode(SystemFont),
-    m_customFont()
+DolphinFontRequester::DolphinFontRequester(QWidget *parent)
+    : QWidget(parent)
+    , m_modeCombo(nullptr)
+    , m_chooseFontButton(nullptr)
+    , m_mode(SystemFont)
+    , m_customFont()
 {
-    QHBoxLayout* topLayout = new QHBoxLayout(this);
-    topLayout->setMargin(0);
+    QHBoxLayout *topLayout = new QHBoxLayout(this);
+    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),
-            this, &DolphinFontRequester::changeMode);
+    connect(m_modeCombo, &QComboBox::activated, this, &DolphinFontRequester::changeMode);
 
-    m_chooseFontButton = new QPushButton(i18nc("@action:button Choose font", "Choose..."), this);
-    connect(m_chooseFontButton, &QPushButton::clicked,
-            this, &DolphinFontRequester::openFontDialog);
+    m_chooseFontButton = new QPushButton(i18nc("@action:button Choose font", "Choose…"), this);
+    connect(m_chooseFontButton, &QPushButton::clicked, this, &DolphinFontRequester::openFontDialog);
 
     changeMode(m_modeCombo->currentIndex());
 
@@ -72,10 +56,10 @@ 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)
+void DolphinFontRequester::setCustomFont(const QFont &font)
 {
     m_customFont = font;
 }
@@ -87,21 +71,19 @@ 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();
+        Q_EMIT changed();
     }
 }
 
 void DolphinFontRequester::changeMode(int index)
 {
     setMode((index == CustomFont) ? CustomFont : SystemFont);
-    emit changed();
+    Q_EMIT changed();
 }
 
-#include "dolphinfontrequester.moc"
+#include "moc_dolphinfontrequester.cpp"