SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / settings / viewmodes / dolphinfontrequester.cpp

diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index 70969a2a333e47f262244ac9eb9dc4db51e9baea..609c368c0681f290235b3a23aef93a1d7b43d735 100644 (file)
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -14,25 +14,23 @@
 #include <QHBoxLayout>
 #include <QPushButton>
 
-DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
-    QWidget(parent),
-    m_modeCombo(nullptr),
-    m_chooseFontButton(nullptr),
-    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);
+    QHBoxLayout *topLayout = new QHBoxLayout(this);
     topLayout->setContentsMargins(0, 0, 0, 0);
 
     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, QOverload<int>::of(&QComboBox::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());
 
@@ -61,7 +59,7 @@ QFont DolphinFontRequester::currentFont() const
     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;
 }
@@ -78,13 +76,14 @@ void DolphinFontRequester::openFontDialog()
     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 "moc_dolphinfontrequester.cpp"